Merge branch '5.0'

nicolas-grekas · nicolas-grekas · commit e02d1835787a · 2020-04-13T12:14:44.000+02:00
* 5.0:
  [DI] fix loading defaults when using the PHP-DSL
  RepeatedType should always have inner types mapped
diff --git a/Console/Descriptor/TextDescriptor.php b/Console/Descriptor/TextDescriptor.php
@@ -386,7 +386,7 @@ protected function describeContainerDeprecations(ContainerBuilder $builder, arra
 
     protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $builder = null)
     {
-        if ($alias->isPublic()) {
+        if ($alias->isPublic() && !$alias->isPrivate()) {
             $options['output']->comment(sprintf('This service is a <info>public</info> alias for the service <info>%s</info>', (string) $alias));
         } else {
             $options['output']->comment(sprintf('This service is a <comment>private</comment> alias for the service <info>%s</info>', (string) $alias));

Original file line number	Diff line number	Diff line change
`@@ -386,7 +386,7 @@ protected function describeContainerDeprecations(ContainerBuilder $builder, arra`
`386`	`386`
`387`	`387`	`protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $builder = null)`
`388`	`388`	`{`
`389`		`- if ($alias->isPublic()) {`
	`389`	`+ if ($alias->isPublic() && !$alias->isPrivate()) {`
`390`	`390`	`$options['output']->comment(sprintf('This service is a <info>public</info> alias for the service <info>%s</info>', (string) $alias));`
`391`	`391`	`} else {`
`392`	`392`	`$options['output']->comment(sprintf('This service is a <comment>private</comment> alias for the service <info>%s</info>', (string) $alias));`