Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit 6f110581df92 · 2019-11-20T14:27:43.000+01:00
* 4.3:
  [DependencyInjection] Fix dumping multiple deprecated aliases
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -1298,7 +1298,7 @@ private function addDeprecatedAliases(): string
             $methodNameAlias = $this->generateMethodName($alias);
             $idExported = $this->export($id);
             $messageExported = $this->export($definition->getDeprecationMessage($alias));
-            $code = <<<EOF
+            $code .= <<<EOF
 
     /*{$this->docStar}
      * Gets the $public '$alias' alias.
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -1339,6 +1339,30 @@ public function testWither()
         $wither = $container->get('wither');
         $this->assertInstanceOf(Foo::class, $wither->foo);
     }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation The "deprecated1" service alias is deprecated. You should stop using it, as it will be removed in the future.
+     * @expectedDeprecation The "deprecated2" service alias is deprecated. You should stop using it, as it will be removed in the future.
+     */
+    public function testMultipleDeprecatedAliasesWorking()
+    {
+        $container = new ContainerBuilder();
+        $container->setDefinition('bar', new Definition('stdClass'))->setPublic(true);
+        $container->setAlias('deprecated1', 'bar')->setPublic(true)->setDeprecated('%alias_id% is deprecated');
+        $container->setAlias('deprecated2', 'bar')->setPublic(true)->setDeprecated('%alias_id% is deprecated');
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+        $dump = $dumper->dump(['class' => $class = __FUNCTION__]);
+
+        eval('?>'.$dump);
+        $container = new $class();
+
+        $this->assertInstanceOf(\stdClass::class, $container->get('bar'));
+        $this->assertInstanceOf(\stdClass::class, $container->get('deprecated1'));
+        $this->assertInstanceOf(\stdClass::class, $container->get('deprecated2'));
+    }
 }
 
 class Rot13EnvVarProcessor implements EnvVarProcessorInterface
