Skip to content

Commit 7612947

Browse files
committed
minor #51308 Remove unneeded calls to setPublic(false) (nicolas-grekas)
This PR was merged into the 6.4 branch. Discussion ---------- Remove unneeded calls to setPublic(false) | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - It's already the default since a few years. Commits ------- ca8d441894 Remove unneeded calls to setPublic(false)
2 parents b2721fe + 5379c2f commit 7612947

File tree

3 files changed

+0
-14
lines changed

3 files changed

+0
-14
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -957,15 +957,13 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
957957
foreach ($workflow['transitions'] as $transition) {
958958
if ('workflow' === $type) {
959959
$transitionDefinition = new Definition(Workflow\Transition::class, [$transition['name'], $transition['from'], $transition['to']]);
960-
$transitionDefinition->setPublic(false);
961960
$transitionId = sprintf('.%s.transition.%s', $workflowId, $transitionCounter++);
962961
$container->setDefinition($transitionId, $transitionDefinition);
963962
$transitions[] = new Reference($transitionId);
964963
if (isset($transition['guard'])) {
965964
$configuration = new Definition(Workflow\EventListener\GuardExpression::class);
966965
$configuration->addArgument(new Reference($transitionId));
967966
$configuration->addArgument($transition['guard']);
968-
$configuration->setPublic(false);
969967
$eventName = sprintf('workflow.%s.guard.%s', $name, $transition['name']);
970968
$guardsConfiguration[$eventName][] = $configuration;
971969
}
@@ -979,15 +977,13 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
979977
foreach ($transition['from'] as $from) {
980978
foreach ($transition['to'] as $to) {
981979
$transitionDefinition = new Definition(Workflow\Transition::class, [$transition['name'], $from, $to]);
982-
$transitionDefinition->setPublic(false);
983980
$transitionId = sprintf('.%s.transition.%s', $workflowId, $transitionCounter++);
984981
$container->setDefinition($transitionId, $transitionDefinition);
985982
$transitions[] = new Reference($transitionId);
986983
if (isset($transition['guard'])) {
987984
$configuration = new Definition(Workflow\EventListener\GuardExpression::class);
988985
$configuration->addArgument(new Reference($transitionId));
989986
$configuration->addArgument($transition['guard']);
990-
$configuration->setPublic(false);
991987
$eventName = sprintf('workflow.%s.guard.%s', $name, $transition['name']);
992988
$guardsConfiguration[$eventName][] = $configuration;
993989
}
@@ -1010,7 +1006,6 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
10101006

10111007
// Create a Definition
10121008
$definitionDefinition = new Definition(Workflow\Definition::class);
1013-
$definitionDefinition->setPublic(false);
10141009
$definitionDefinition->addArgument($places);
10151010
$definitionDefinition->addArgument($transitions);
10161011
$definitionDefinition->addArgument($initialMarking);
@@ -1063,7 +1058,6 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
10631058
if ($workflow['supports']) {
10641059
foreach ($workflow['supports'] as $supportedClassName) {
10651060
$strategyDefinition = new Definition(Workflow\SupportStrategy\InstanceOfSupportStrategy::class, [$supportedClassName]);
1066-
$strategyDefinition->setPublic(false);
10671061
$registryDefinition->addMethodCall('addWorkflow', [new Reference($workflowId), $strategyDefinition]);
10681062
}
10691063
} elseif (isset($workflow['support_strategy'])) {
@@ -1170,7 +1164,6 @@ private function registerDebugConfiguration(array $config, ContainerBuilder $con
11701164

11711165
if ($debug && class_exists(DebugProcessor::class)) {
11721166
$definition = new Definition(DebugProcessor::class);
1173-
$definition->setPublic(false);
11741167
$definition->addArgument(new Reference('request_stack'));
11751168
$definition->addTag('kernel.reset', ['method' => 'reset']);
11761169
$container->setDefinition('debug.log_processor', $definition);
@@ -1403,7 +1396,6 @@ private function createPackageDefinition(?string $basePath, array $baseUrls, Ref
14031396

14041397
$package = new ChildDefinition($baseUrls ? 'assets.url_package' : 'assets.path_package');
14051398
$package
1406-
->setPublic(false)
14071399
->replaceArgument(0, $baseUrls ?: $basePath)
14081400
->replaceArgument(1, $version)
14091401
;
@@ -1947,14 +1939,12 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
19471939
AnnotationLoader::class,
19481940
[new Reference('annotation_reader', ContainerInterface::NULL_ON_INVALID_REFERENCE)]
19491941
);
1950-
$annotationLoader->setPublic(false);
19511942

19521943
$serializerLoaders[] = $annotationLoader;
19531944
}
19541945

19551946
$fileRecorder = function ($extension, $path) use (&$serializerLoaders) {
19561947
$definition = new Definition(\in_array($extension, ['yaml', 'yml']) ? YamlFileLoader::class : XmlFileLoader::class, [$path]);
1957-
$definition->setPublic(false);
19581948
$serializerLoaders[] = $definition;
19591949
};
19601950

@@ -2103,7 +2093,6 @@ private function registerSemaphoreConfiguration(array $config, ContainerBuilder
21032093

21042094
// Generate services for semaphore instances
21052095
$semaphoreDefinition = new Definition(Semaphore::class);
2106-
$semaphoreDefinition->setPublic(false);
21072096
$semaphoreDefinition->setFactory([new Reference('semaphore.'.$resourceName.'.factory'), 'createSemaphore']);
21082097
$semaphoreDefinition->setArguments([$resourceName]);
21092098

@@ -2482,7 +2471,6 @@ private function registerCacheConfiguration(array $config, ContainerBuilder $con
24822471

24832472
if (method_exists(PropertyAccessor::class, 'createCache')) {
24842473
$propertyAccessDefinition = $container->register('cache.property_access', AdapterInterface::class);
2485-
$propertyAccessDefinition->setPublic(false);
24862474

24872475
if (!$container->getParameter('kernel.debug')) {
24882476
$propertyAccessDefinition->setFactory([PropertyAccessor::class, 'createCache']);

Tests/DependencyInjection/Compiler/DataCollectorTranslatorPassTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ protected function setUp(): void
3434
$this->container->setParameter('translator_not_implementing_bag', 'Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler\TranslatorWithTranslatorBag');
3535

3636
$this->container->register('translator.data_collector', DataCollectorTranslator::class)
37-
->setPublic(false)
3837
->setDecoratedService('translator')
3938
->setArguments([new Reference('translator.data_collector.inner')])
4039
;

Tests/DependencyInjection/FrameworkExtensionTestCase.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1640,7 +1640,6 @@ public function testSerializerMapping()
16401640
if (is_file($arg = $definition->getArgument(0))) {
16411641
$definition->replaceArgument(0, strtr($arg, '/', \DIRECTORY_SEPARATOR));
16421642
}
1643-
$definition->setPublic(false);
16441643
}
16451644

16461645
$loaders = $container->getDefinition('serializer.mapping.chain_loader')->getArgument(0);

0 commit comments

Comments
 (0)