Merge branch '5.2' into 5.x

chalasr · chalasr · commit d093475ce546 · 2021-01-17T12:18:08.000+01:00
* 5.2:
  fix merge
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php
@@ -726,7 +726,7 @@ public function testProcessSkipsDeprecatedDefinitions()
         $container = new ContainerBuilder();
         $container
             ->register('foobar', Deprecated::class)
-            ->setDeprecated(true)
+            ->setDeprecated('foo/bar', '1.2.3', '')
         ;
 
         (new CheckTypeDeclarationsPass(true))->process($container);

Original file line number	Diff line number	Diff line change
`@@ -726,7 +726,7 @@ public function testProcessSkipsDeprecatedDefinitions()`
`726`	`726`	`$container = new ContainerBuilder();`
`727`	`727`	`$container`
`728`	`728`	`->register('foobar', Deprecated::class)`
`729`		`- ->setDeprecated(true)`
	`729`	`+ ->setDeprecated('foo/bar', '1.2.3', '')`
`730`	`730`	`;`
`731`	`731`
`732`	`732`	`(new CheckTypeDeclarationsPass(true))->process($container);`