bug #29386 undeprecate the single-colon notation for controllers (fbourigault)

nicolas-grekas · nicolas-grekas · commit eef2a948b83f · 2018-12-01T09:17:10.000+01:00
This PR was merged into the 4.1 branch. Discussion ---------- undeprecate the single-colon notation for controllers | Q | A | ------------- | --- | Branch? | 4.1 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | N/A | License | MIT | Doc PR | N/A This is the same as #29218 but for `Symfony\Bundle\FrameworkBundle\Routing\DelegatingLoader`. Commits ------- 09371ad undeprecate the single-colon notation for controllers
diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php b/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php
@@ -95,7 +95,7 @@ public function load($resource, $type = null)
 
             if (1 === substr_count($controller, ':')) {
                 $nonDeprecatedNotation = str_replace(':', '::', $controller);
-                @trigger_error(sprintf('Referencing controllers with a single colon is deprecated since Symfony 4.1, use "%s" instead.', $nonDeprecatedNotation), E_USER_DEPRECATED);
+                // TODO deprecate this in 5.1
             }
 
             $route->setDefault('_controller', $controller);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/DelegatingLoaderTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/DelegatingLoaderTest.php
@@ -25,7 +25,6 @@ public function testConstructorApi()
     /**
      * @group legacy
      * @expectedDeprecation Referencing controllers with foo:bar:baz is deprecated since Symfony 4.1, use "some_parsed::controller" instead.
-     * @expectedDeprecation Referencing controllers with a single colon is deprecated since Symfony 4.1, use "foo::baz" instead.
      */
     public function testLoad()
     {

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public function load($resource, $type = null)`
`95`	`95`
`96`	`96`	`if (1 === substr_count($controller, ':')) {`
`97`	`97`	`$nonDeprecatedNotation = str_replace(':', '::', $controller);`
`98`		`- @trigger_error(sprintf('Referencing controllers with a single colon is deprecated since Symfony 4.1, use "%s" instead.', $nonDeprecatedNotation), E_USER_DEPRECATED);`
	`98`	`+ // TODO deprecate this in 5.1`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`$route->setDefault('_controller', $controller);`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ public function testConstructorApi()`
`25`	`25`	`/**`
`26`	`26`	`* @group legacy`
`27`	`27`	`* @expectedDeprecation Referencing controllers with foo:bar:baz is deprecated since Symfony 4.1, use "some_parsed::controller" instead.`
`28`		`- * @expectedDeprecation Referencing controllers with a single colon is deprecated since Symfony 4.1, use "foo::baz" instead.`
`29`	`28`	`*/`
`30`	`29`	`public function testLoad()`
`31`	`30`	`{`