Skip to content

Commit a321f3c

Browse files
Merge branch '5.0' into 5.1
* 5.0: Relax tests to unlock change on master [DI] fix dumping deprecated private aliases [DI] fix typo in Preloader
2 parents 7e736ed + 65f040d commit a321f3c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Dumper/Preloader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ private static function doPreload(string $class, array &$preloaded): void
104104
self::preloadType($p->getType(), $preloaded);
105105
}
106106

107-
self::preloadType($p->getReturnType(), $preloaded);
107+
self::preloadType($m->getReturnType(), $preloaded);
108108
}
109109
} catch (\ReflectionException $e) {
110110
// ignore missing classes

Dumper/YamlDumper.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,8 @@ private function addServiceAlias(string $alias, Alias $id): string
179179
}
180180
}
181181

182-
if ($id->isPrivate()) {
183-
return sprintf(" %s: '@%s'\n%s", $alias, $id, $deprecated);
182+
if (!$id->isDeprecated() && $id->isPrivate()) {
183+
return sprintf(" %s: '@%s'\n", $alias, $id);
184184
}
185185

186186
return sprintf(" %s:\n alias: %s\n public: %s\n%s", $alias, $id, $id->isPublic() ? 'true' : 'false', $deprecated);

0 commit comments

Comments
 (0)