Skip to content

Commit e8540fb

Browse files
committed
[DI]: removed unnecessary checks on Definitions and Aliases
If it is "public", then for sure it is not "private". symfony/symfony#61505 (comment)
1 parent d653413 commit e8540fb

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

Console/Descriptor/JsonDescriptor.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ private function getContainerDefinitionData(Definition $definition, bool $omitTa
248248
{
249249
$data = [
250250
'class' => (string) $definition->getClass(),
251-
'public' => $definition->isPublic() && !$definition->isPrivate(),
251+
'public' => $definition->isPublic(),
252252
'synthetic' => $definition->isSynthetic(),
253253
'lazy' => $definition->isLazy(),
254254
'shared' => $definition->isShared(),
@@ -313,7 +313,7 @@ private function getContainerAliasData(Alias $alias): array
313313
{
314314
return [
315315
'service' => (string) $alias,
316-
'public' => $alias->isPublic() && !$alias->isPrivate(),
316+
'public' => $alias->isPublic(),
317317
];
318318
}
319319

Console/Descriptor/MarkdownDescriptor.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
214214
}
215215

216216
$output .= '- Class: `'.$definition->getClass().'`'
217-
."\n".'- Public: '.($definition->isPublic() && !$definition->isPrivate() ? 'yes' : 'no')
217+
."\n".'- Public: '.($definition->isPublic() ? 'yes' : 'no')
218218
."\n".'- Synthetic: '.($definition->isSynthetic() ? 'yes' : 'no')
219219
."\n".'- Lazy: '.($definition->isLazy() ? 'yes' : 'no')
220220
."\n".'- Shared: '.($definition->isShared() ? 'yes' : 'no')
@@ -276,7 +276,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
276276
protected function describeContainerAlias(Alias $alias, array $options = [], ?ContainerBuilder $container = null): void
277277
{
278278
$output = '- Service: `'.$alias.'`'
279-
."\n".'- Public: '.($alias->isPublic() && !$alias->isPrivate() ? 'yes' : 'no');
279+
."\n".'- Public: '.($alias->isPublic() ? 'yes' : 'no');
280280

281281
if (!isset($options['id'])) {
282282
$this->write($output);

Console/Descriptor/TextDescriptor.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
360360
$tableRows[] = ['Calls', implode(', ', $callInformation)];
361361
}
362362

363-
$tableRows[] = ['Public', $definition->isPublic() && !$definition->isPrivate() ? 'yes' : 'no'];
363+
$tableRows[] = ['Public', $definition->isPublic() ? 'yes' : 'no'];
364364
$tableRows[] = ['Synthetic', $definition->isSynthetic() ? 'yes' : 'no'];
365365
$tableRows[] = ['Lazy', $definition->isLazy() ? 'yes' : 'no'];
366366
$tableRows[] = ['Shared', $definition->isShared() ? 'yes' : 'no'];
@@ -455,7 +455,7 @@ protected function describeContainerDeprecations(ContainerBuilder $container, ar
455455

456456
protected function describeContainerAlias(Alias $alias, array $options = [], ?ContainerBuilder $container = null): void
457457
{
458-
if ($alias->isPublic() && !$alias->isPrivate()) {
458+
if ($alias->isPublic()) {
459459
$options['output']->comment(\sprintf('This service is a <info>public</info> alias for the service <info>%s</info>', (string) $alias));
460460
} else {
461461
$options['output']->comment(\sprintf('This service is a <comment>private</comment> alias for the service <info>%s</info>', (string) $alias));

Console/Descriptor/XmlDescriptor.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ private function getContainerDefinitionDocument(Definition $definition, ?string
354354
}
355355
}
356356

357-
$serviceXML->setAttribute('public', $definition->isPublic() && !$definition->isPrivate() ? 'true' : 'false');
357+
$serviceXML->setAttribute('public', $definition->isPublic() ? 'true' : 'false');
358358
$serviceXML->setAttribute('synthetic', $definition->isSynthetic() ? 'true' : 'false');
359359
$serviceXML->setAttribute('lazy', $definition->isLazy() ? 'true' : 'false');
360360
$serviceXML->setAttribute('shared', $definition->isShared() ? 'true' : 'false');
@@ -477,7 +477,7 @@ private function getContainerAliasDocument(Alias $alias, ?string $id = null): \D
477477
}
478478

479479
$aliasXML->setAttribute('service', (string) $alias);
480-
$aliasXML->setAttribute('public', $alias->isPublic() && !$alias->isPrivate() ? 'true' : 'false');
480+
$aliasXML->setAttribute('public', $alias->isPublic() ? 'true' : 'false');
481481

482482
return $dom;
483483
}

DependencyInjection/Compiler/TestServiceContainerWeakRefPass.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ public function process(ContainerBuilder $container): void
3131
$definitions = $container->getDefinitions();
3232

3333
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()) {
3535
$privateServices[$id] = new Reference($id, ContainerBuilder::IGNORE_ON_UNINITIALIZED_REFERENCE);
3636
}
3737
}
3838

3939
$aliases = $container->getAliases();
4040

4141
foreach ($aliases as $id => $alias) {
42-
if ($id && '.' !== $id[0] && (!$alias->isPublic() || $alias->isPrivate())) {
42+
if ($id && '.' !== $id[0] && $alias->isPrivate()) {
4343
while (isset($aliases[$target = (string) $alias])) {
4444
$alias = $aliases[$target];
4545
}

Tests/DependencyInjection/FrameworkExtensionTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1601,7 +1601,7 @@ public function testRegisterSerializerExtractor()
16011601
$serializerExtractorDefinition = $container->getDefinition('property_info.serializer_extractor');
16021602

16031603
$this->assertEquals('serializer.mapping.class_metadata_factory', $serializerExtractorDefinition->getArgument(0)->__toString());
1604-
$this->assertTrue(!$serializerExtractorDefinition->isPublic() || $serializerExtractorDefinition->isPrivate());
1604+
$this->assertTrue($serializerExtractorDefinition->isPrivate());
16051605
$tag = $serializerExtractorDefinition->getTag('property_info.list_extractor');
16061606
$this->assertEquals(['priority' => -999], $tag[0]);
16071607
}

0 commit comments

Comments
 (0)