[FrameworkBundle] Improve performance of ControllerNameParser

enumag · enumag · commit ac284c3f228f · 2016-11-05T09:43:06.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php
@@ -47,7 +47,12 @@ public function __construct(KernelInterface $kernel)
     public function parse($controller)
     {
         $originalController = $controller;
-        if (3 !== count($parts = explode(':', $controller))) {
+        $parts = explode(':', $controller);
+
+        // The second condition is for cases when this method is called with the
+        // class::method string instead of a:b:c. It's important to fail early in this
+        // case because calling findAlternative needlessly is bad for performance.
+        if (3 !== count($parts) || in_array('', $parts, true)) {
             throw new \InvalidArgumentException(sprintf('The "%s" controller is not a valid "a:b:c" controller string.', $controller));
         }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php b/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php
@@ -21,7 +21,7 @@
  * DelegatingLoader delegates route loading to other loaders using a loader resolver.
  *
  * This implementation resolves the _controller attribute from the short notation
- * to the fully-qualified form (from a:b:c to class:method).
+ * to the fully-qualified form (from a:b:c to class::method).
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
@@ -85,7 +85,8 @@ public function load($resource, $type = null)
         $this->loading = false;
 
         foreach ($collection->all() as $route) {
-            if ($controller = $route->getDefault('_controller')) {
+            $controller = $route->getDefault('_controller');
+            if ($controller && false === strpos($controller, '::')) {
                 try {
                     $controller = $this->parser->parse($controller);
                 } catch (\InvalidArgumentException $e) {

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,12 @@ public function __construct(KernelInterface $kernel)`
`47`	`47`	`public function parse($controller)`
`48`	`48`	`{`
`49`	`49`	`$originalController = $controller;`
`50`		`- if (3 !== count($parts = explode(':', $controller))) {`
	`50`	`+ $parts = explode(':', $controller);`
	`51`	`+`
	`52`	`+ // The second condition is for cases when this method is called with the`
	`53`	`+ // class::method string instead of a:b:c. It's important to fail early in this`
	`54`	`+ // case because calling findAlternative needlessly is bad for performance.`
	`55`	`+ if (3 !== count($parts) \|\| in_array('', $parts, true)) {`
`51`	`56`	`throw new \InvalidArgumentException(sprintf('The "%s" controller is not a valid "a:b:c" controller string.', $controller));`
`52`	`57`	`}`
`53`	`58`