[DI]: removed unnecessary checks on Definitions Aliases

MacDada · MacDada · commit f1f4dce499d0 · 2025-08-27T15:05:58.000+02:00
If it is "public", then for sure it is not "private". #61505 (comment)
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
@@ -248,7 +248,7 @@ private function getContainerDefinitionData(Definition $definition, bool $omitTa
     {
         $data = [
             'class' => (string) $definition->getClass(),
-            'public' => $definition->isPublic() && !$definition->isPrivate(),
+            'public' => $definition->isPublic(),
             'synthetic' => $definition->isSynthetic(),
             'lazy' => $definition->isLazy(),
             'shared' => $definition->isShared(),
@@ -313,7 +313,7 @@ private function getContainerAliasData(Alias $alias): array
     {
         return [
             'service' => (string) $alias,
-            'public' => $alias->isPublic() && !$alias->isPrivate(),
+            'public' => $alias->isPublic(),
         ];
     }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
@@ -214,7 +214,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
         }
 
         $output .= '- Class: `'.$definition->getClass().'`'
-            ."\n".'- Public: '.($definition->isPublic() && !$definition->isPrivate() ? 'yes' : 'no')
+            ."\n".'- Public: '.($definition->isPublic() ? 'yes' : 'no')
             ."\n".'- Synthetic: '.($definition->isSynthetic() ? 'yes' : 'no')
             ."\n".'- Lazy: '.($definition->isLazy() ? 'yes' : 'no')
             ."\n".'- Shared: '.($definition->isShared() ? 'yes' : 'no')
@@ -276,7 +276,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
     protected function describeContainerAlias(Alias $alias, array $options = [], ?ContainerBuilder $container = null): void
     {
         $output = '- Service: `'.$alias.'`'
-            ."\n".'- Public: '.($alias->isPublic() && !$alias->isPrivate() ? 'yes' : 'no');
+            ."\n".'- Public: '.($alias->isPublic() ? 'yes' : 'no');
 
         if (!isset($options['id'])) {
             $this->write($output);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
@@ -360,7 +360,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
             $tableRows[] = ['Calls', implode(', ', $callInformation)];
         }
 
-        $tableRows[] = ['Public', $definition->isPublic() && !$definition->isPrivate() ? 'yes' : 'no'];
+        $tableRows[] = ['Public', $definition->isPublic() ? 'yes' : 'no'];
         $tableRows[] = ['Synthetic', $definition->isSynthetic() ? 'yes' : 'no'];
         $tableRows[] = ['Lazy', $definition->isLazy() ? 'yes' : 'no'];
         $tableRows[] = ['Shared', $definition->isShared() ? 'yes' : 'no'];
@@ -455,7 +455,7 @@ protected function describeContainerDeprecations(ContainerBuilder $container, ar
 
     protected function describeContainerAlias(Alias $alias, array $options = [], ?ContainerBuilder $container = null): void
     {
-        if ($alias->isPublic() && !$alias->isPrivate()) {
+        if ($alias->isPublic()) {
             $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));
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
@@ -354,7 +354,7 @@ private function getContainerDefinitionDocument(Definition $definition, ?string
             }
         }
 
-        $serviceXML->setAttribute('public', $definition->isPublic() && !$definition->isPrivate() ? 'true' : 'false');
+        $serviceXML->setAttribute('public', $definition->isPublic() ? 'true' : 'false');
         $serviceXML->setAttribute('synthetic', $definition->isSynthetic() ? 'true' : 'false');
         $serviceXML->setAttribute('lazy', $definition->isLazy() ? 'true' : 'false');
         $serviceXML->setAttribute('shared', $definition->isShared() ? 'true' : 'false');
@@ -477,7 +477,7 @@ private function getContainerAliasDocument(Alias $alias, ?string $id = null): \D
         }
 
         $aliasXML->setAttribute('service', (string) $alias);
-        $aliasXML->setAttribute('public', $alias->isPublic() && !$alias->isPrivate() ? 'true' : 'false');
+        $aliasXML->setAttribute('public', $alias->isPublic() ? 'true' : 'false');
 
         return $dom;
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerWeakRefPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerWeakRefPass.php
@@ -31,15 +31,15 @@ public function process(ContainerBuilder $container): void
         $definitions = $container->getDefinitions();
 
         foreach ($definitions as $id => $definition) {
-            if ($id && '.' !== $id[0] && (!$definition->isPublic() || $definition->isPrivate() || $definition->hasTag('container.private')) && !$definition->hasErrors() && !$definition->isAbstract()) {
+            if ($id && '.' !== $id[0] && ($definition->isPrivate() || $definition->hasTag('container.private')) && !$definition->hasErrors() && !$definition->isAbstract()) {
                 $privateServices[$id] = new Reference($id, ContainerBuilder::IGNORE_ON_UNINITIALIZED_REFERENCE);
             }
         }
 
         $aliases = $container->getAliases();
 
         foreach ($aliases as $id => $alias) {
-            if ($id && '.' !== $id[0] && (!$alias->isPublic() || $alias->isPrivate())) {
+            if ($id && '.' !== $id[0] && $alias->isPrivate()) {
                 while (isset($aliases[$target = (string) $alias])) {
                     $alias = $aliases[$target];
                 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
@@ -1601,7 +1601,7 @@ public function testRegisterSerializerExtractor()
         $serializerExtractorDefinition = $container->getDefinition('property_info.serializer_extractor');
 
         $this->assertEquals('serializer.mapping.class_metadata_factory', $serializerExtractorDefinition->getArgument(0)->__toString());
-        $this->assertTrue(!$serializerExtractorDefinition->isPublic() || $serializerExtractorDefinition->isPrivate());
+        $this->assertTrue($serializerExtractorDefinition->isPrivate());
         $tag = $serializerExtractorDefinition->getTag('property_info.list_extractor');
         $this->assertEquals(['priority' => -999], $tag[0]);
     }
diff --git a/src/Symfony/Component/Cache/DependencyInjection/CacheCollectorPass.php b/src/Symfony/Component/Cache/DependencyInjection/CacheCollectorPass.php
@@ -49,9 +49,7 @@ private function addToCollector(string $id, string $name, ContainerBuilder $cont
         $collectorDefinition = $container->getDefinition('data_collector.cache');
         $recorder = new Definition(is_subclass_of($definition->getClass(), TagAwareAdapterInterface::class) ? TraceableTagAwareAdapter::class : TraceableAdapter::class);
         $recorder->setTags($definition->getTags());
-        if (!$definition->isPublic() || !$definition->isPrivate()) {
-            $recorder->setPublic($definition->isPublic());
-        }
+        $recorder->setPublic($definition->isPublic());
         $recorder->setArguments([new Reference($innerId = $id.'.recorder_inner'), new Reference('profiler.is_disabled_state_checker', ContainerBuilder::IGNORE_ON_INVALID_REFERENCE)]);
 
         foreach ($definition->getMethodCalls() as [$method, $args]) {
diff --git a/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php b/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php
@@ -79,7 +79,7 @@ public function process(ContainerBuilder $container): void
             }
 
             if (null === $commandName) {
-                if (!$definition->isPublic() || $definition->isPrivate() || $definition->hasTag('container.private')) {
+                if ($definition->isPrivate() || $definition->hasTag('container.private')) {
                     $commandId = 'console.command.public_alias.'.$id;
                     $container->setAlias($commandId, $id)->setPublic(true);
                     $id = $commandId;
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AliasDeprecatedPublicServicesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/AliasDeprecatedPublicServicesPass.php
@@ -33,7 +33,7 @@ public function process(ContainerBuilder $container): void
             }
 
             $definition = $container->getDefinition($id);
-            if (!$definition->isPublic() || $definition->isPrivate()) {
+            if ($definition->isPrivate()) {
                 continue;
             }
 
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php
@@ -66,7 +66,7 @@ public function process(ContainerBuilder $container): void
                 }
             }
 
-            if ($definition->isPublic() && !$definition->isPrivate()) {
+            if ($definition->isPublic()) {
                 $resolvedId = $container->resolveEnvPlaceholders($id, null, $usedEnvs);
                 if (null !== $usedEnvs) {
                     throw new EnvParameterException([$resolvedId], null, 'A service name ("%s") cannot contain dynamic values.');
@@ -75,7 +75,7 @@ public function process(ContainerBuilder $container): void
         }
 
         foreach ($container->getAliases() as $id => $alias) {
-            if ($alias->isPublic() && !$alias->isPrivate()) {
+            if ($alias->isPublic()) {
                 $resolvedId = $container->resolveEnvPlaceholders($id, null, $usedEnvs);
                 if (null !== $usedEnvs) {
                     throw new EnvParameterException([$resolvedId], null, 'An alias name ("%s") cannot contain dynamic values.');
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveNoPreloadPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveNoPreloadPass.php
@@ -34,14 +34,14 @@ public function process(ContainerBuilder $container): void
 
         try {
             foreach ($container->getDefinitions() as $id => $definition) {
-                if ($definition->isPublic() && !$definition->isPrivate() && !isset($this->resolvedIds[$id])) {
+                if ($definition->isPublic() && !isset($this->resolvedIds[$id])) {
                     $this->resolvedIds[$id] = true;
                     $this->processValue($definition, true);
                 }
             }
 
             foreach ($container->getAliases() as $alias) {
-                if ($alias->isPublic() && !$alias->isPrivate() && !isset($this->resolvedIds[$id = (string) $alias]) && $container->hasDefinition($id)) {
+                if ($alias->isPublic() && !isset($this->resolvedIds[$id = (string) $alias]) && $container->hasDefinition($id)) {
                     $this->resolvedIds[$id] = true;
                     $this->processValue($container->getDefinition($id), true);
                 }
@@ -65,7 +65,7 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
         if ($value instanceof Reference && ContainerBuilder::IGNORE_ON_UNINITIALIZED_REFERENCE !== $value->getInvalidBehavior() && $this->container->hasDefinition($id = (string) $value)) {
             $definition = $this->container->getDefinition($id);
 
-            if (!isset($this->resolvedIds[$id]) && (!$definition->isPublic() || $definition->isPrivate())) {
+            if (!isset($this->resolvedIds[$id]) && $definition->isPrivate()) {
                 $this->resolvedIds[$id] = true;
                 $this->processValue($definition, true);
             }
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -835,7 +835,7 @@ public function compile(bool $resolveEnvPlaceholders = false): void
             if ('.' === ($id[0] ?? '-')) {
                 continue;
             }
-            if (!$definition->isPublic() || $definition->isPrivate()) {
+            if ($definition->isPrivate()) {
                 $this->removedIds[$id] = true;
             }
         }
diff --git a/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/LazyServiceDumper.php b/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/LazyServiceDumper.php
@@ -81,7 +81,7 @@ public function getProxyFactoryCode(Definition $definition, string $id, string $
         $instantiation = 'return';
 
         if ($definition->isShared()) {
-            $instantiation .= \sprintf(' $container->%s[%s] =', $definition->isPublic() && !$definition->isPrivate() ? 'services' : 'privates', var_export($id, true));
+            $instantiation .= \sprintf(' $container->%s[%s] =', $definition->isPublic() ? 'services' : 'privates', var_export($id, true));
         }
 
         $asGhostObject = str_contains($factoryCode, '$proxy');
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/PrototypeConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/PrototypeConfigurator.php
@@ -50,9 +50,7 @@ public function __construct(
         private ?string $path = null,
     ) {
         $definition = new Definition();
-        if (!$defaults->isPublic() || !$defaults->isPrivate()) {
-            $definition->setPublic($defaults->isPublic());
-        }
+        $definition->setPublic($defaults->isPublic());
         $definition->setAutowired($defaults->isAutowired());
         $definition->setAutoconfigured($defaults->isAutoconfigured());
         // deep clone, to avoid multiple process of the same instance in the passes
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServicesConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServicesConfigurator.php
@@ -80,8 +80,8 @@ final public function set(?string $id, ?string $class = null): ServiceConfigurat
             }
 
             $id = \sprintf('.%d_%s', ++$this->anonymousCount, preg_replace('/^.*\\\\/', '', $class).'~'.$this->anonymousHash);
-        } elseif (!$defaults->isPublic() || !$defaults->isPrivate()) {
-            $definition->setPublic($defaults->isPublic() && !$defaults->isPrivate());
+        } else {
+            $definition->setPublic($defaults->isPublic());
         }
 
         $definition->setAutowired($defaults->isAutowired());
@@ -115,9 +115,7 @@ final public function alias(string $id, string $referencedId): AliasConfigurator
     {
         $ref = static::processValue($referencedId, true);
         $alias = new Alias((string) $ref);
-        if (!$this->defaults->isPublic() || !$this->defaults->isPrivate()) {
-            $alias->setPublic($this->defaults->isPublic());
-        }
+        $alias->setPublic($this->defaults->isPublic());
         $this->container->setAlias($id, $alias);
 
         return new AliasConfigurator($this, $alias);
diff --git a/src/Symfony/Component/Form/Tests/DependencyInjection/FormPassTest.php b/src/Symfony/Component/Form/Tests/DependencyInjection/FormPassTest.php
@@ -61,7 +61,7 @@ public function testAddTaggedTypes()
         $extDefinition = $container->getDefinition('form.extension');
 
         $locator = $extDefinition->getArgument(0);
-        $this->assertTrue(!$locator->isPublic() || $locator->isPrivate());
+        $this->assertTrue($locator->isPrivate());
         $this->assertEquals(
             (new Definition(ServiceLocator::class, [[
                 __CLASS__.'_Type1' => new ServiceClosureArgument(new Reference('my.type1')),
diff --git a/src/Symfony/Component/Validator/Tests/DependencyInjection/AddConstraintValidatorsPassTest.php b/src/Symfony/Component/Validator/Tests/DependencyInjection/AddConstraintValidatorsPassTest.php
@@ -36,7 +36,7 @@ public function testThatConstraintValidatorServicesAreProcessed()
         $addConstraintValidatorsPass->process($container);
 
         $locator = $container->getDefinition((string) $validatorFactory->getArgument(0));
-        $this->assertTrue(!$locator->isPublic() || $locator->isPrivate());
+        $this->assertTrue($locator->isPrivate());
         $expected = (new Definition(ServiceLocator::class, [[
             Validator1::class => new ServiceClosureArgument(new Reference('my_constraint_validator_service1')),
             'my_constraint_validator_alias1' => new ServiceClosureArgument(new Reference('my_constraint_validator_service1')),

Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ private function getContainerDefinitionData(Definition $definition, bool $omitTa`
`248`	`248`	`{`
`249`	`249`	`$data = [`
`250`	`250`	`'class' => (string) $definition->getClass(),`
`251`		`- 'public' => $definition->isPublic() && !$definition->isPrivate(),`
	`251`	`+ 'public' => $definition->isPublic(),`
`252`	`252`	`'synthetic' => $definition->isSynthetic(),`
`253`	`253`	`'lazy' => $definition->isLazy(),`
`254`	`254`	`'shared' => $definition->isShared(),`
`@@ -313,7 +313,7 @@ private function getContainerAliasData(Alias $alias): array`
`313`	`313`	`{`
`314`	`314`	`return [`
`315`	`315`	`'service' => (string) $alias,`
`316`		`- 'public' => $alias->isPublic() && !$alias->isPrivate(),`
	`316`	`+ 'public' => $alias->isPublic(),`
`317`	`317`	`];`
`318`	`318`	`}`
`319`	`319`
Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,7 @@ private function getContainerDefinitionDocument(Definition $definition, ?string`
`354`	`354`	`}`
`355`	`355`	`}`
`356`	`356`
`357`		`- $serviceXML->setAttribute('public', $definition->isPublic() && !$definition->isPrivate() ? 'true' : 'false');`
	`357`	`+ $serviceXML->setAttribute('public', $definition->isPublic() ? 'true' : 'false');`
`358`	`358`	`$serviceXML->setAttribute('synthetic', $definition->isSynthetic() ? 'true' : 'false');`
`359`	`359`	`$serviceXML->setAttribute('lazy', $definition->isLazy() ? 'true' : 'false');`
`360`	`360`	`$serviceXML->setAttribute('shared', $definition->isShared() ? 'true' : 'false');`
`@@ -477,7 +477,7 @@ private function getContainerAliasDocument(Alias $alias, ?string $id = null): \D`
`477`	`477`	`}`
`478`	`478`
`479`	`479`	`$aliasXML->setAttribute('service', (string) $alias);`
`480`		`- $aliasXML->setAttribute('public', $alias->isPublic() && !$alias->isPrivate() ? 'true' : 'false');`
	`480`	`+ $aliasXML->setAttribute('public', $alias->isPublic() ? 'true' : 'false');`
`481`	`481`
`482`	`482`	`return $dom;`
`483`	`483`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,15 +31,15 @@ public function process(ContainerBuilder $container): void`
`31`	`31`	`$definitions = $container->getDefinitions();`
`32`	`32`
`33`	`33`	`foreach ($definitions as $id => $definition) {`
`34`		`- if ($id && '.' !== $id[0] && (!$definition->isPublic() \|\| $definition->isPrivate() \|\| $definition->hasTag('container.private')) && !$definition->hasErrors() && !$definition->isAbstract()) {`
	`34`	`+ if ($id && '.' !== $id[0] && ($definition->isPrivate() \|\| $definition->hasTag('container.private')) && !$definition->hasErrors() && !$definition->isAbstract()) {`
`35`	`35`	`$privateServices[$id] = new Reference($id, ContainerBuilder::IGNORE_ON_UNINITIALIZED_REFERENCE);`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`$aliases = $container->getAliases();`
`40`	`40`
`41`	`41`	`foreach ($aliases as $id => $alias) {`
`42`		`- if ($id && '.' !== $id[0] && (!$alias->isPublic() \|\| $alias->isPrivate())) {`
	`42`	`+ if ($id && '.' !== $id[0] && $alias->isPrivate()) {`
`43`	`43`	`while (isset($aliases[$target = (string) $alias])) {`
`44`	`44`	`$alias = $aliases[$target];`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1601,7 +1601,7 @@ public function testRegisterSerializerExtractor()`
`1601`	`1601`	`$serializerExtractorDefinition = $container->getDefinition('property_info.serializer_extractor');`
`1602`	`1602`
`1603`	`1603`	`$this->assertEquals('serializer.mapping.class_metadata_factory', $serializerExtractorDefinition->getArgument(0)->__toString());`
`1604`		`- $this->assertTrue(!$serializerExtractorDefinition->isPublic() \|\| $serializerExtractorDefinition->isPrivate());`
	`1604`	`+ $this->assertTrue($serializerExtractorDefinition->isPrivate());`
`1605`	`1605`	`$tag = $serializerExtractorDefinition->getTag('property_info.list_extractor');`
`1606`	`1606`	`$this->assertEquals(['priority' => -999], $tag[0]);`
`1607`	`1607`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public function process(ContainerBuilder $container): void`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`if (null === $commandName) {`
`82`		`- if (!$definition->isPublic() \|\| $definition->isPrivate() \|\| $definition->hasTag('container.private')) {`
	`82`	`+ if ($definition->isPrivate() \|\| $definition->hasTag('container.private')) {`
`83`	`83`	`$commandId = 'console.command.public_alias.'.$id;`
`84`	`84`	`$container->setAlias($commandId, $id)->setPublic(true);`
`85`	`85`	`$id = $commandId;`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function process(ContainerBuilder $container): void`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`$definition = $container->getDefinition($id);`
`36`		`- if (!$definition->isPublic() \|\| $definition->isPrivate()) {`
	`36`	`+ if ($definition->isPrivate()) {`
`37`	`37`	`continue;`
`38`	`38`	`}`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public function process(ContainerBuilder $container): void`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`
`69`		`- if ($definition->isPublic() && !$definition->isPrivate()) {`
	`69`	`+ if ($definition->isPublic()) {`
`70`	`70`	`$resolvedId = $container->resolveEnvPlaceholders($id, null, $usedEnvs);`
`71`	`71`	`if (null !== $usedEnvs) {`
`72`	`72`	`throw new EnvParameterException([$resolvedId], null, 'A service name ("%s") cannot contain dynamic values.');`
`@@ -75,7 +75,7 @@ public function process(ContainerBuilder $container): void`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`foreach ($container->getAliases() as $id => $alias) {`
`78`		`- if ($alias->isPublic() && !$alias->isPrivate()) {`
	`78`	`+ if ($alias->isPublic()) {`
`79`	`79`	`$resolvedId = $container->resolveEnvPlaceholders($id, null, $usedEnvs);`
`80`	`80`	`if (null !== $usedEnvs) {`
`81`	`81`	`throw new EnvParameterException([$resolvedId], null, 'An alias name ("%s") cannot contain dynamic values.');`