Merge branch '5.4' into 6.0

* 5.4:
  [FrameworkBundle] fix session-related BC layer triggering deprecation
  [DependencyInjection] Make auto-aliases private by default

Author: nicolas-grekas

CHANGELOG.md

@@ -15,6 +15,7 @@ CHANGELOG
 
  * Add `service_closure()` to the PHP-DSL
  * Add support for autoconfigurable attributes on methods, properties and parameters
+ * Make auto-aliases private by default
 
 5.3
 ---

Compiler/AutoAliasServicePass.php

@@ -33,7 +33,8 @@ public function process(ContainerBuilder $container)
 
                 $aliasId = $container->getParameterBag()->resolveValue($tag['format']);
                 if ($container->hasDefinition($aliasId) || $container->hasAlias($aliasId)) {
-                    $container->setAlias($serviceId, new Alias($aliasId, true));
+                    $alias = new Alias($aliasId, $container->getDefinition($serviceId)->isPublic());
+                    $container->setAlias($serviceId, $alias);
                 }
             }
         }

Compiler/ReplaceAliasByActualDefinitionPass.php

@@ -36,15 +36,20 @@ public function process(ContainerBuilder $container)
         // First collect all alias targets that need to be replaced
         $seenAliasTargets = [];
         $replacements = [];
+
         foreach ($container->getAliases() as $definitionId => $target) {
             $targetId = (string) $target;
             // Special case: leave this target alone
             if ('service_container' === $targetId) {
                 continue;
             }
-            // Check if target needs to be replaces
+            // Check if target needs to be replaced
             if (isset($replacements[$targetId])) {
                 $container->setAlias($definitionId, $replacements[$targetId])->setPublic($target->isPublic());
+
+                if ($target->isDeprecated()) {
+                    $container->getAlias($definitionId)->setDeprecated(...array_values($target->getDeprecation('%alias_id%')));
+                }
             }
             // No need to process the same target twice
             if (isset($seenAliasTargets[$targetId])) {
@@ -69,6 +74,10 @@ public function process(ContainerBuilder $container)
             $container->setDefinition($definitionId, $definition);
             $container->removeDefinition($targetId);
             $replacements[$targetId] = $definitionId;
+
+            if ($target->isPublic() && $target->isDeprecated()) {
+                $definition->addTag('container.private', $target->getDeprecation('%service_id%'));
+            }
         }
         $this->replacements = $replacements;
 

Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php

@@ -31,20 +31,22 @@ public function testProcess()
         $bDefinition = new Definition('\stdClass');
         $container->setDefinition('b', $bDefinition);
 
-        $container->setAlias('a_alias', 'a')->setPublic(true);
-        $container->setAlias('b_alias', 'b')->setPublic(true);
+        $container->setAlias('a_alias', 'a')->setPublic(true)->setDeprecated('foo/bar', '1.2', '%alias_id%');
+        $container->setAlias('b_alias', 'b')->setPublic(true)->setDeprecated('foo/bar', '1.2', '%alias_id%');
 
         $container->setAlias('container', 'service_container');
 
         $this->process($container);
 
         $this->assertTrue($container->has('a'), '->process() does nothing to public definitions.');
         $this->assertTrue($container->hasAlias('a_alias'));
+        $this->assertTrue($container->getAlias('a_alias')->isDeprecated());
         $this->assertFalse($container->has('b'), '->process() removes non-public definitions.');
         $this->assertTrue(
             $container->has('b_alias') && !$container->hasAlias('b_alias'),
             '->process() replaces alias to actual.'
         );
+        $this->assertTrue($container->getDefinition('b_alias')->hasTag('container.private'));
 
         $this->assertTrue($container->has('container'));