bug #26275 Set controller without __invoke method from invokable class (Tobion)

fabpot · fabpot · commit 52af59fd48dc · 2018-02-26T05:28:34.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- Set controller without __invoke method from invokable class | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | BC breaks? | no  | Deprecations? | no  | Tests pass? | yes  | Fixed tickets | | License | MIT | Doc PR | Fixes one part of #25103 Commits ------- cc68c50 Set controller without __invoke method from invokable class
diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/AnnotatedRouteControllerLoader.php b/src/Symfony/Bundle/FrameworkBundle/Routing/AnnotatedRouteControllerLoader.php
@@ -29,7 +29,11 @@ class AnnotatedRouteControllerLoader extends AnnotationClassLoader
      */
     protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, $annot)
     {
-        $route->setDefault('_controller', $class->getName().'::'.$method->getName());
+        if ('__invoke' === $method->getName()) {
+            $route->setDefault('_controller', $class->getName());
+        } else {
+            $route->setDefault('_controller', $class->getName().'::'.$method->getName());
+        }
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,11 @@ class AnnotatedRouteControllerLoader extends AnnotationClassLoader`
`29`	`29`	`*/`
`30`	`30`	`protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, $annot)`
`31`	`31`	`{`
`32`		`- $route->setDefault('_controller', $class->getName().'::'.$method->getName());`
	`32`	`+ if ('__invoke' === $method->getName()) {`
	`33`	`+ $route->setDefault('_controller', $class->getName());`
	`34`	`+ } else {`
	`35`	`+ $route->setDefault('_controller', $class->getName().'::'.$method->getName());`
	`36`	`+ }`
`33`	`37`	`}`
`34`	`38`
`35`	`39`	`/**`