Import passing the correct type

MatTheCat · MatTheCat · commit e2abd655f89c · 2022-11-09T11:01:13.000+01:00
diff --git a/src/Symfony/Component/Routing/Loader/Psr4DirectoryLoader.php b/src/Symfony/Component/Routing/Loader/Psr4DirectoryLoader.php
@@ -43,7 +43,7 @@ public function load(mixed $resource, string $type = null): ?RouteCollection
             return new RouteCollection();
         }
 
-        return $this->loadFromDirectory($path, trim($resource['namespace'], '\\'));
+        return $this->loadFromDirectory($path, trim($resource['namespace'], '\\'), $type);
     }
 
     public function supports(mixed $resource, string $type = null): bool
@@ -59,7 +59,7 @@ public function forDirectory(string $currentDirectory): static
         return $loader;
     }
 
-    private function loadFromDirectory(string $directory, string $psr4Prefix): RouteCollection
+    private function loadFromDirectory(string $directory, string $psr4Prefix, string $type): RouteCollection
     {
         $collection = new RouteCollection();
         $collection->addResource(new DirectoryResource($directory, '/\.php$/'));
@@ -92,7 +92,7 @@ function (\SplFileInfo $current) {
                 continue;
             }
 
-            $collection->addCollection($this->import($class, 'attribute'));
+            $collection->addCollection($this->import($class, $type));
         }
 
         return $collection;

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function load(mixed $resource, string $type = null): ?RouteCollection`
`43`	`43`	`return new RouteCollection();`
`44`	`44`	`}`
`45`	`45`
`46`		`- return $this->loadFromDirectory($path, trim($resource['namespace'], '\\'));`
	`46`	`+ return $this->loadFromDirectory($path, trim($resource['namespace'], '\\'), $type);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`public function supports(mixed $resource, string $type = null): bool`
`@@ -59,7 +59,7 @@ public function forDirectory(string $currentDirectory): static`
`59`	`59`	`return $loader;`
`60`	`60`	`}`
`61`	`61`
`62`		`- private function loadFromDirectory(string $directory, string $psr4Prefix): RouteCollection`
	`62`	`+ private function loadFromDirectory(string $directory, string $psr4Prefix, string $type): RouteCollection`
`63`	`63`	`{`
`64`	`64`	`$collection = new RouteCollection();`
`65`	`65`	`$collection->addResource(new DirectoryResource($directory, '/\.php$/'));`
`@@ -92,7 +92,7 @@ function (\SplFileInfo $current) {`
`92`	`92`	`continue;`
`93`	`93`	`}`
`94`	`94`
`95`		`- $collection->addCollection($this->import($class, 'attribute'));`
	`95`	`+ $collection->addCollection($this->import($class, $type));`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`return $collection;`