[FrameworkBundle] Improve performance of ControllerNameParser

enumag · enumag · commit cf333f32c567 · 2016-11-25T12:34:09.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php
@@ -46,11 +46,12 @@ public function __construct(KernelInterface $kernel)
      */
     public function parse($controller)
     {
-        $originalController = $controller;
-        if (3 !== count($parts = explode(':', $controller))) {
+        $parts = explode(':', $controller);
+        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));
         }
 
+        $originalController = $controller;
         list($bundle, $controller, $action) = $parts;
         $controller = str_replace('/', '\\', $controller);
         $bundles = array();
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,15 +85,18 @@ public function load($resource, $type = null)
         $this->loading = false;
 
         foreach ($collection->all() as $route) {
-            if ($controller = $route->getDefault('_controller')) {
-                try {
-                    $controller = $this->parser->parse($controller);
-                } catch (\InvalidArgumentException $e) {
-                    // unable to optimize unknown notation
-                }
+            $controller = $route->getDefault('_controller');
+            if (!$controller) {
+                continue;
+            }
 
-                $route->setDefault('_controller', $controller);
+            try {
+                $controller = $this->parser->parse($controller);
+            } catch (\InvalidArgumentException $e) {
+                // unable to optimize unknown notation
             }
+
+            $route->setDefault('_controller', $controller);
         }
 
         return $collection;

Original file line number	Diff line number	Diff line change
`@@ -46,11 +46,12 @@ public function __construct(KernelInterface $kernel)`
`46`	`46`	`*/`
`47`	`47`	`public function parse($controller)`
`48`	`48`	`{`
`49`		`- $originalController = $controller;`
`50`		`- if (3 !== count($parts = explode(':', $controller))) {`
	`49`	`+ $parts = explode(':', $controller);`
	`50`	`+ if (3 !== count($parts) \|\| in_array('', $parts, true)) {`
`51`	`51`	`throw new \InvalidArgumentException(sprintf('The "%s" controller is not a valid "a:b:c" controller string.', $controller));`
`52`	`52`	`}`
`53`	`53`
	`54`	`+ $originalController = $controller;`
`54`	`55`	`list($bundle, $controller, $action) = $parts;`
`55`	`56`	`$controller = str_replace('/', '\\', $controller);`
`56`	`57`	`$bundles = array();`