Skip to content

Commit 59caa62

Browse files
Merge branch '4.1' into 4.2
* 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
2 parents ad24c1b + cf3a389 commit 59caa62

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

Routing/DelegatingLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public function load($resource, $type = null)
100100

101101
if (1 === substr_count($controller, ':')) {
102102
$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
104104
}
105105

106106
$route->setDefault('_controller', $controller);

Tests/Routing/DelegatingLoaderTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ public function testLoadDefaultOptions()
6868
/**
6969
* @group legacy
7070
* @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.
7271
*/
7372
public function testLoad()
7473
{

0 commit comments

Comments
 (0)