Merge branch '4.4' into 5.1

* 4.4:
  CS fix
  [travis] use PHP 8.0 to patch return types and run deps=low
  Update sl_SI translations
  Don't trigger deprecation for deprecated aliases pointing to deprecated definitions
  [HttpFoundation] use atomic writes in MockFileSessionStorage
  [DI] fix param annotation
  [Config] Add \Symfony\Component\Config\Loader::load() return type
  Simplify PHP CS Fixer config
  Rename normalize param

Author: nicolas-grekas

Compiler/ResolveReferencesToAliasesPass.php

@@ -62,8 +62,11 @@ private function getDefinitionId(string $id, ContainerBuilder $container): strin
         $alias = $container->getAlias($id);
 
         if ($alias->isDeprecated()) {
-            $deprecation = $alias->getDeprecation($id);
-            trigger_deprecation($deprecation['package'], $deprecation['version'], rtrim($deprecation['message'], '. ').'. It is being referenced by the "%s" '.($container->hasDefinition($this->currentId) ? 'service.' : 'alias.'), $this->currentId);
+            $referencingDefinition = $container->hasDefinition($this->currentId) ? $container->getDefinition($this->currentId) : $container->getAlias($this->currentId);
+            if (!$referencingDefinition->isDeprecated()) {
+                $deprecation = $alias->getDeprecation($id);
+                trigger_deprecation($deprecation['package'], $deprecation['version'], rtrim($deprecation['message'], '. ').'. It is being referenced by the "%s" '.($container->hasDefinition($this->currentId) ? 'service.' : 'alias.'), $this->currentId);
+            }
         }
 
         $seen = [];

Loader/YamlFileLoader.php

@@ -316,7 +316,7 @@ private function isUsingShortSyntax(array $service): bool
     /**
      * Parses a definition.
      *
-     * @param array|string $service
+     * @param array|string|null $service
      *
      * @throws InvalidArgumentException When tags are invalid
      */

Tests/Compiler/ResolveReferencesToAliasesPassTest.php

@@ -126,6 +126,44 @@ public function testDeprecationNoticeWhenReferencedByDefinition()
         $this->process($container);
     }
 
+    public function testNoDeprecationNoticeWhenReferencedByDeprecatedAlias()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('foo', 'stdClass');
+
+        $aliasDeprecated = new Alias('foo');
+        $aliasDeprecated->setDeprecated(true);
+        $container->setAlias('deprecated_foo_alias', $aliasDeprecated);
+
+        $alias = new Alias('deprecated_foo_alias');
+        $alias->setDeprecated(true);
+        $container->setAlias('alias', $alias);
+
+        $this->process($container);
+        $this->addToAssertionCount(1);
+    }
+
+    public function testNoDeprecationNoticeWhenReferencedByDeprecatedDefinition()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('foo', 'stdClass');
+
+        $aliasDeprecated = new Alias('foo');
+        $aliasDeprecated->setDeprecated(true);
+        $container->setAlias('foo_aliased', $aliasDeprecated);
+
+        $container
+            ->register('definition')
+            ->setDeprecated(true)
+            ->setArguments([new Reference('foo_aliased')])
+        ;
+
+        $this->process($container);
+        $this->addToAssertionCount(1);
+    }
+
     protected function process(ContainerBuilder $container)
     {
         $pass = new ResolveReferencesToAliasesPass();

Tests/Loader/GlobFileLoaderTest.php

@@ -40,5 +40,6 @@ class GlobFileLoaderWithoutImport extends GlobFileLoader
 {
     public function import($resource, $type = null, $ignoreErrors = false, $sourceResource = null, $exclude = null)
     {
+        return null;
     }
 }