Merge branch '5.1' into 5.2

* 5.1:
  fix merge

src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php

@@ -726,7 +726,7 @@ class CheckTypeDeclarationsPassTest extends TestCase
         $container = new ContainerBuilder();
         $container
             ->register('foobar', Deprecated::class)
-            ->setDeprecated(true)
+            ->setDeprecated('foo/bar', '1.2.3', '')
         ;
 
         (new CheckTypeDeclarationsPass(true))->process($container);