Apply suggestions from code review

Co-authored-by: Dmitri Perunov <diimpp@gmail.com>

Author: loic425

src/Component/src/Symfony/Routing/Factory/Resource/ResourceRouteCollectionFactory.php

@@ -62,7 +62,10 @@ private function createRoutesForResource(RouteCollection $routeCollection, Resou
 
     private function addRouteForOperation(RouteCollection $routeCollection, ResourceMetadata $resource, HttpOperation $operation): void
     {
-        $metadata = $this->resourceRegistry->get($resource->getAlias() ?? '');
+        $alias = $resource->getAlias();
+        Assert::notNull($alias);
+
+        $metadata = $this->resourceRegistry->get($alias);
         $routeName = $operation->getRouteName();
 
         Assert::notNull($routeName, sprintf('Operation %s has no route name. Please define one.', $operation::class));

src/Component/src/Symfony/Routing/Factory/Resource/ResourceRouteCollectionFactoryInterface.php

@@ -20,6 +20,6 @@
  */
 interface ResourceRouteCollectionFactoryInterface
 {
-    /** @psalm-param class-string $className */
+    /** @param class-string $className */
     public function createRouteCollectionForClass(string $className): RouteCollection;
 }

src/Component/src/Symfony/Routing/Loader/ResourceLoader.php

@@ -24,22 +24,21 @@
 final class ResourceLoader implements RouteLoaderInterface
 {
     public function __construct(
-        private readonly ResourceClassListFactoryInterface $resourceClassListCollectionFactory,
+        private readonly ResourceClassListFactoryInterface $resourceClassListFactory,
         private readonly ResourceRouteCollectionFactoryInterface $resourceRouteCollectionFactory,
     ) {
     }
 
     public function __invoke(): RouteCollection
     {
         $routeCollection = new RouteCollection();
-
-        $resourceClasses = $this->resourceClassListCollectionFactory->create();
+        $resourceClasses = $this->resourceClassListFactory->create();
 
         /**
-         * @var class-string $classes
+         * @var class-string $class
          */
-        foreach ($resourceClasses as $classes) {
-            $routeCollection->addCollection($this->resourceRouteCollectionFactory->createRouteCollectionForClass($classes));
+        foreach ($resourceClasses as $class) {
+            $routeCollection->addCollection($this->resourceRouteCollectionFactory->createRouteCollectionForClass($class));
         }
 
         return $routeCollection;

src/Component/tests/Metadata/Resource/Factory/AttributesResourceClassListFactoryTest.php

@@ -20,15 +20,15 @@
 
 final class AttributesResourceClassListFactoryTest extends TestCase
 {
-    public function testCreateWithInstanceOfApiResource(): void
+    public function testCreateAResourceClassListForResourcesWithAsResourceAttribute(): void
     {
-        $attributesResourceNameCollectionFactory = new AttributesResourceClassListFactory(
+        $attributesResourceClassListFactory = new AttributesResourceClassListFactory(
             mapping: ['paths' => [dirname(__DIR__, 3) . '/Dummy']],
         );
 
-        $collection = $attributesResourceNameCollectionFactory->create();
+        $list = $attributesResourceClassListFactory->create();
 
-        $this->assertContains(DummyResource::class, $collection->getIterator());
-        $this->assertNotContains(PullRequest::class, $collection->getIterator());
+        $this->assertContains(DummyResource::class, $list->getIterator());
+        $this->assertNotContains(PullRequest::class, $list->getIterator());
     }
 }

src/Component/tests/Symfony/Routing/Loader/ResourceLoaderTest.php

@@ -52,9 +52,9 @@ public function testItGeneratesRoutesFromResource(): void
         $routeCollection->add('first_route', new Route('/first-route'));
         $routeCollection->add('second_route', new Route('/second-route'));
 
-        $resourceNameCollection = new ResourceClassList(['\DummyClass']);
+        $resourceClassList = new ResourceClassList(['\DummyClass']);
 
-        $this->resourceClassListFactory->method('create')->willReturn($resourceNameCollection);
+        $this->resourceClassListFactory->method('create')->willReturn($resourceClassList);
         $this->resourceRouteCollectionFactory->method('createRouteCollectionForClass')->with('\DummyClass')->willReturn($routeCollection);
 
         $this->assertEquals($routeCollection, ($this->loader)());