Merge branch '4.1' into 4.2

nicolas-grekas · nicolas-grekas · commit 59caa625e8d5 · 2018-12-01T09:52:38.000+01:00
* 4.1:
  fix cs
  [Validator] Allow `ConstraintViolation::__toString()` to expose codes that are not null or emtpy strings
  fix type for $value in DocBlock
  [WebProfilerBundle] Fix title case
  Fix wrapped loop of event listener
  [DI] fix edge case in InlineServiceDefinitionsPass
  undeprecate the single-colon notation for controllers
  Update HttpKernel.php
diff --git a/Routing/DelegatingLoader.php b/Routing/DelegatingLoader.php
@@ -100,7 +100,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/Tests/Routing/DelegatingLoaderTest.php b/Tests/Routing/DelegatingLoaderTest.php
@@ -68,7 +68,6 @@ public function testLoadDefaultOptions()
     /**
      * @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
`@@ -100,7 +100,7 @@ public function load($resource, $type = null)`
`100`	`100`
`101`	`101`	`if (1 === substr_count($controller, ':')) {`
`102`	`102`	`$nonDeprecatedNotation = str_replace(':', '::', $controller);`
`103`		`- @trigger_error(sprintf('Referencing controllers with a single colon is deprecated since Symfony 4.1, use "%s" instead.', $nonDeprecatedNotation), E_USER_DEPRECATED);`
	`103`	`+ // TODO deprecate this in 5.1`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`$route->setDefault('_controller', $controller);`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,6 @@ public function testLoadDefaultOptions()`
`68`	`68`	`/**`
`69`	`69`	`* @group legacy`
`70`	`70`	`* @expectedDeprecation Referencing controllers with foo:bar:baz is deprecated since Symfony 4.1, use "some_parsed::controller" instead.`
`71`		`- * @expectedDeprecation Referencing controllers with a single colon is deprecated since Symfony 4.1, use "foo::baz" instead.`
`72`	`71`	`*/`
`73`	`72`	`public function testLoad()`
`74`	`73`	`{`