Merge branch '4.4' into 5.0

* 4.4:
  Relax tests to unlock change on master
  [DI] fix dumping deprecated private aliases
  [DI] fix typo in Preloader

Author: nicolas-grekas

Dumper/Preloader.php

@@ -85,7 +85,7 @@ private static function doPreload(string $class, array &$preloaded): void
                     self::preloadType($p->getType(), $preloaded);
                 }
 
-                self::preloadType($p->getReturnType(), $preloaded);
+                self::preloadType($m->getReturnType(), $preloaded);
             }
         } catch (\ReflectionException $e) {
             // ignore missing classes

Dumper/YamlDumper.php

@@ -163,8 +163,8 @@ private function addServiceAlias(string $alias, Alias $id): string
     {
         $deprecated = $id->isDeprecated() ? sprintf("        deprecated: %s\n", $id->getDeprecationMessage('%alias_id%')) : '';
 
-        if ($id->isPrivate()) {
-            return sprintf("    %s: '@%s'\n%s", $alias, $id, $deprecated);
+        if (!$id->isDeprecated() && $id->isPrivate()) {
+            return sprintf("    %s: '@%s'\n", $alias, $id);
         }
 
         return sprintf("    %s:\n        alias: %s\n        public: %s\n%s", $alias, $id, $id->isPublic() ? 'true' : 'false', $deprecated);