symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php
+6Lines changed: 6 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php
+6Lines changed: 6 additions & 0 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/EventListener/ResolveControllerNameSubscriber.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/EventListener/ResolveControllerNameSubscriber.php
+2Lines changed: 2 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/EventListener/ResolveControllerNameSubscriber.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/EventListener/ResolveControllerNameSubscriber.php
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php
+27-5Lines changed: 27 additions & 5 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php
+27-5Lines changed: 27 additions & 5 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerNameParserTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerNameParserTest.php
+3Lines changed: 3 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerNameParserTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerNameParserTest.php
+3Lines changed: 3 additions & 0 deletions
@@ -19,6 +19,8 @@
  * (Bundle\BlogBundle\Controller\PostController::indexAction).
  *
  * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @deprecated since version 4.1, will be removed in 5.0.
  */
 class ControllerNameParser
 {
@@ -41,6 +43,8 @@ public function __construct(KernelInterface $kernel)
      */
     public function parse($controller)
     {
+        @trigger_error(sprintf('The %s class is deprecated since version 4.1 and will be removed in 5.0.', __CLASS__), E_USER_DEPRECATED);
+
         $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));
@@ -86,6 +90,8 @@ public function parse($controller)
      */
     public function build($controller)
     {
+        @trigger_error(sprintf('The %s class is deprecated since version 4.1 and will be removed in 5.0.', __CLASS__), E_USER_DEPRECATED);
+
         if (0 === preg_match('#^(.*?\\\\Controller\\\\(.+)Controller)::(.+)Action$#', $controller, $match)) {
             throw new \InvalidArgumentException(sprintf('The "%s" controller is not a valid "class::method" string.', $controller));
         }
 
@@ -20,6 +20,8 @@
  * Guarantees that the _controller key is parsed into its final format.
  *
  * @author Ryan Weaver <ryan@knpuniversity.com>
+ *
+ * @deprecated since version 4.1, will be removed in 5.0.
  */
 class ResolveControllerNameSubscriber implements EventSubscriberInterface
 {
 
@@ -73,14 +73,36 @@ public function load($resource, $type = null)
         }
 
         foreach ($collection->all() as $route) {
-            if (!is_string($controller = $route->getDefault('_controller')) || !$controller) {
+            if (!is_string($controller = $route->getDefault('_controller'))) {
                 continue;
             }
 
-            try {
-                $controller = $this->parser->parse($controller);
-            } catch (\InvalidArgumentException $e) {
-                // unable to optimize unknown notation
+            if (false !== strpos($controller, '::')) {
+                continue;
+            }
+
+            if (2 === substr_count($controller, ':')) {
+                $deprecatedNotation = $controller;
+
+                try {
+                    $controller = $this->parser->parse($controller);
+
+                    @trigger_error(sprintf(
+                        'Referencing controllers with %s is deprecated since version 4.1 and will be removed in 5.0. Use %s instead.',
+                        $deprecatedNotation,
+                        $controller
+                    ), E_USER_DEPRECATED);
+                } catch (\InvalidArgumentException $e) {
+                    // unable to optimize unknown notation
+                }
+            }
+
+            if (1 === substr_count($controller, ':')) {
+                $controller = str_replace(':', '::', $controller);
+                @trigger_error(sprintf(
+                    'Referencing controllers with a single colon is deprecated since version 4.1 and will be removed in 5.0. Use %s instead.',
+                    $controller
+                ), E_USER_DEPRECATED);
             }
 
             $route->setDefault('_controller', $controller);
 
@@ -16,6 +16,9 @@
 use Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser;
 use Symfony\Component\HttpKernel\Kernel;
 
+/**
+ * @group legacy
+ */
 class ControllerNameParserTest extends TestCase
 {
     protected $loader;
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,8 @@`
`19`	`19`	`* (Bundle\BlogBundle\Controller\PostController::indexAction).`
`20`	`20`	`*`
`21`	`21`	`* @author Fabien Potencier <fabien@symfony.com>`
	`22`	`+ *`
	`23`	`+ * @deprecated since version 4.1, will be removed in 5.0.`
`22`	`24`	`*/`
`23`	`25`	`class ControllerNameParser`
`24`	`26`	`{`
`@@ -41,6 +43,8 @@ public function __construct(KernelInterface $kernel)`
`41`	`43`	`*/`
`42`	`44`	`public function parse($controller)`
`43`	`45`	`{`
	`46`	`+ @trigger_error(sprintf('The %s class is deprecated since version 4.1 and will be removed in 5.0.', __CLASS__), E_USER_DEPRECATED);`
	`47`	`+`
`44`	`48`	`$parts = explode(':', $controller);`
`45`	`49`	`if (3 !== count($parts) \|\| in_array('', $parts, true)) {`
`46`	`50`	`throw new \InvalidArgumentException(sprintf('The "%s" controller is not a valid "a:b:c" controller string.', $controller));`
`@@ -86,6 +90,8 @@ public function parse($controller)`
`86`	`90`	`*/`
`87`	`91`	`public function build($controller)`
`88`	`92`	`{`
	`93`	`+ @trigger_error(sprintf('The %s class is deprecated since version 4.1 and will be removed in 5.0.', __CLASS__), E_USER_DEPRECATED);`
	`94`	`+`
`89`	`95`	`if (0 === preg_match('#^(.*?\\\\Controller\\\\(.+)Controller)::(.+)Action$#', $controller, $match)) {`
`90`	`96`	`throw new \InvalidArgumentException(sprintf('The "%s" controller is not a valid "class::method" string.', $controller));`
`91`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@`
`20`	`20`	`* Guarantees that the _controller key is parsed into its final format.`
`21`	`21`	`*`
`22`	`22`	`* @author Ryan Weaver <ryan@knpuniversity.com>`
	`23`	`+ *`
	`24`	`+ * @deprecated since version 4.1, will be removed in 5.0.`
`23`	`25`	`*/`
`24`	`26`	`class ResolveControllerNameSubscriber implements EventSubscriberInterface`
`25`	`27`	`{`