bug #38226 [FrameworkBundle] loadRoutes shoud receive RoutingPhpFileLoader (grachevko)

fabpot · fabpot · commit 2384f0812f69 · 2020-09-18T12:02:31.000+02:00
This PR was merged into the 5.1 branch. Discussion ---------- [FrameworkBundle] loadRoutes shoud receive RoutingPhpFileLoader | Q | A | ------------- | --- | Branch? | 5.1 | Bug fix? | yes | New feature? | no | Deprecations? | no | License | MIT  In case when `sensio_framework_extra.router.annotations` options is set to `true` or not defined will throw this error > In RoutingConfigurator.php line 28: > > Argument 2 passed to Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator::__construct() must be an instance of Symfony\Component\Routing\Loader\PhpFileLoader, instance of Symfony\Component\Routing\Loader\AnnotationFileLoader given, called in /opt/app/vendor/symfony/framework-bundle/Kernel/MicroKernelTrait.php on line 176 Commits ------- 25a1131 loadRoutes shoud receive RoutingPhpFileLoader
diff --git a/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php b/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php
@@ -152,7 +152,7 @@ public function loadRoutes(LoaderInterface $loader)
     {
         $file = (new \ReflectionObject($this))->getFileName();
         /* @var RoutingPhpFileLoader $kernelLoader */
-        $kernelLoader = $loader->getResolver()->resolve($file);
+        $kernelLoader = $loader->getResolver()->resolve($file, 'php');
         $kernelLoader->setCurrentDir(\dirname($file));
         $collection = new RouteCollection();
 

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ public function loadRoutes(LoaderInterface $loader)`
`152`	`152`	`{`
`153`	`153`	`$file = (new \ReflectionObject($this))->getFileName();`
`154`	`154`	`/* @var RoutingPhpFileLoader $kernelLoader */`
`155`		`- $kernelLoader = $loader->getResolver()->resolve($file);`
	`155`	`+ $kernelLoader = $loader->getResolver()->resolve($file, 'php');`
`156`	`156`	`$kernelLoader->setCurrentDir(\dirname($file));`
`157`	`157`	`$collection = new RouteCollection();`
`158`	`158`