symfony · nicolas-grekas · May 23, 2021 · May 21, 2021
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -5,6 +5,8 @@ CHANGELOG
 ---
 
  * Remove the `lock.RESOURCE_NAME` and `lock.RESOURCE_NAME.store` services and the `lock`, `LockInterface`, `lock.store` and `PersistingStoreInterface` aliases, use `lock.RESOURCE_NAME.factory`, `lock.factory` or `LockFactory` instead
+ * The `form.factory`, `form.type.file`, `translator`, `security.csrf.token_manager`, `serializer`,
+   `cache_clearer`, `filesystem` and `validator` services are now private
 
 5.4
 ---

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -849,10 +849,6 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
             $workflowDefinition->replaceArgument(1, $markingStoreDefinition ?? null);
             $workflowDefinition->replaceArgument(3, $name);
             $workflowDefinition->replaceArgument(4, $workflow['events_to_dispatch']);
-            $workflowDefinition->addTag('container.private', [
-                'package' => 'symfony/framework-bundle',
-                'version' => '5.3',
-            ]);
 
             // Store to container
             $container->setDefinition($workflowId, $workflowDefinition);

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.php
@@ -59,9 +59,7 @@
         ->alias(FormRegistryInterface::class, 'form.registry')
 
         ->set('form.factory', FormFactory::class)
-            ->public()
             ->args([service('form.registry')])
-            ->tag('container.private', ['package' => 'symfony/framework-bundle', 'version' => '5.2'])
 
         ->alias(FormFactoryInterface::class, 'form.factory')
 
@@ -104,10 +102,8 @@
             ->tag('form.type')
 
         ->set('form.type.file', FileType::class)
-            ->public()
             ->args([service('translator')->ignoreOnInvalid()])
             ->tag('form.type')
-            ->tag('container.private', ['package' => 'symfony/framework-bundle', 'version' => '5.2'])
 
         ->set('form.type.color', ColorType::class)
             ->args([service('translator')->ignoreOnInvalid()])

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/identity_translator.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/identity_translator.php
@@ -17,8 +17,6 @@
 return static function (ContainerConfigurator $container) {
     $container->services()
         ->set('translator', IdentityTranslator::class)
-            ->public()
-            ->tag('container.private', ['package' => 'symfony/framework-bundle', 'version' => '5.2'])
         ->alias(TranslatorInterface::class, 'translator')
 
         ->set('identity_translator', IdentityTranslator::class)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/security_csrf.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/security_csrf.php
@@ -32,13 +32,11 @@
         ->alias(TokenStorageInterface::class, 'security.csrf.token_storage')
 
         ->set('security.csrf.token_manager', CsrfTokenManager::class)
-            ->public()
             ->args([
                 service('security.csrf.token_generator'),
                 service('security.csrf.token_storage'),
                 service('request_stack')->ignoreOnInvalid(),
             ])
-            ->tag('container.private', ['package' => 'symfony/framework-bundle', 'version' => '5.2'])
 
         ->alias(CsrfTokenManagerInterface::class, 'security.csrf.token_manager')
 

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.php
@@ -57,9 +57,7 @@
 
     $container->services()
         ->set('serializer', Serializer::class)
-            ->public()
             ->args([[], []])
-            ->tag('container.private', ['package' => 'symfony/framework-bundle', 'version' => '5.2'])
 
         ->alias(SerializerInterface::class, 'serializer')
         ->alias(NormalizerInterface::class, 'serializer')

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.php
@@ -124,20 +124,16 @@ class_exists(WorkflowEvents::class) ? WorkflowEvents::ALIASES : []
             ->tag('container.no_preload')
 
         ->set('cache_clearer', ChainCacheClearer::class)
-            ->public()
             ->args([
                 tagged_iterator('kernel.cache_clearer'),
             ])
-            ->tag('container.private', ['package' => 'symfony/framework-bundle', 'version' => '5.2'])
 
         ->set('kernel')
             ->synthetic()
             ->public()
         ->alias(KernelInterface::class, 'kernel')
 
         ->set('filesystem', Filesystem::class)
-            ->public()
-            ->tag('container.private', ['package' => 'symfony/framework-bundle', 'version' => '5.2'])
         ->alias(Filesystem::class, 'filesystem')
 
         ->set('file_locator', FileLocator::class)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.php
@@ -29,9 +29,7 @@
 
     $container->services()
         ->set('validator', ValidatorInterface::class)
-            ->public()
             ->factory([service('validator.builder'), 'getValidator'])
-            ->tag('container.private', ['package' => 'symfony/framework-bundle', 'version' => '5.2'])
         ->alias(ValidatorInterface::class, 'validator')
 
         ->set('validator.builder', ValidatorBuilder::class)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/workflow.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/workflow.php
@@ -28,8 +28,6 @@
                 abstract_arg('events to dispatch'),
             ])
             ->abstract()
-            ->public()
-            ->tag('container.private', ['package' => 'symfony/framework-bundle', 'version' => '5.3'])
         ->set('state_machine.abstract', StateMachine::class)
             ->args([
                 abstract_arg('workflow definition'),
@@ -39,8 +37,6 @@
                 abstract_arg('events to dispatch'),
             ])
             ->abstract()
-            ->public()
-            ->tag('container.private', ['package' => 'symfony/framework-bundle', 'version' => '5.3'])
         ->set('workflow.marking_store.method', MethodMarkingStore::class)
             ->abstract()
         ->set('workflow.registry', Registry::class)

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.0
+---
+
+ * The `security.authorization_checker` and `security.token_storage` services are now private
+
 5.3
 ---
 

@@ -61,18 +61,15 @@
 
     $container->services()
         ->set('security.authorization_checker', AuthorizationChecker::class)
-            ->public()
             ->args([
                 service('security.token_storage'),
                 service('security.authentication.manager'),
                 service('security.access.decision_manager'),
                 param('security.access.always_authenticate_before_granting'),
             ])
-            ->tag('container.private', ['package' => 'symfony/security-bundle', 'version' => '5.3'])
         ->alias(AuthorizationCheckerInterface::class, 'security.authorization_checker')
 
         ->set('security.token_storage', UsageTrackingTokenStorage::class)
-            ->public()
             ->args([
                 service('security.untracked_token_storage'),
                 service_locator([
@@ -81,7 +78,6 @@
             ])
             ->tag('kernel.reset', ['method' => 'disableUsageTracking'])
             ->tag('kernel.reset', ['method' => 'setToken'])
-            ->tag('container.private', ['package' => 'symfony/security-bundle', 'version' => '5.3'])
         ->alias(TokenStorageInterface::class, 'security.token_storage')
 
         ->set('security.untracked_token_storage', TokenStorage::class)

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.0
+---
+
+ * The `twig` service is now private
+
 5.3
 ---
 

@@ -52,7 +52,6 @@
 return static function (ContainerConfigurator $container) {
     $container->services()
         ->set('twig', Environment::class)
-            ->public()
             ->args([service('twig.loader'), abstract_arg('Twig options')])
             ->call('addGlobal', ['app', service('twig.app_variable')])
             ->call('addRuntimeLoader', [service('twig.runtime_loader')])
@@ -65,7 +64,6 @@
             ->tag('container.preload', ['class' => ExtensionSet::class])
             ->tag('container.preload', ['class' => Template::class])
             ->tag('container.preload', ['class' => TemplateWrapper::class])
-            ->tag('container.private', ['package' => 'symfony/twig-bundle', 'version' => '5.2'])
 
         ->alias('Twig_Environment', 'twig')
         ->alias(Environment::class, 'twig')
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,8 @@ CHANGELOG @@
     ---
      * Remove the `lock.RESOURCE_NAME` and `lock.RESOURCE_NAME.store` services and the `lock`, `LockInterface`, `lock.store` and `PersistingStoreInterface` aliases, use `lock.RESOURCE_NAME.factory`, `lock.factory` or `LockFactory` instead
+     * The `form.factory`, `form.type.file`, `translator`, `security.csrf.token_manager`, `serializer`,
+       `cache_clearer`, `filesystem` and `validator` services are now private
 .4
     ---
@@ Expand Down @@