8000 [FrameworkBundle][TwigBundle][SecurityBundle] Turn deprecated public … · symfony/symfony@decf0ff · GitHub
[go: up one dir, main page]
Skip to content

Commit decf0ff

Browse files
fancywebfancyweb
committed
[FrameworkBundle][TwigBundle][SecurityBundle] Turn deprecated public services to private
1 parent b494790 commit decf0ff

File tree

13 files changed

+16
-30
lines changed

13 files changed

+16
-30
lines changed

‎src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
CHANGELOG
22
=========
33

4+
6.0
5+
---
6+
7+
* The `form.factory`, `form.type.file`, `translator`, `security.csrf.token_manager`, `serializer`,
8+
`cache_clearer`, `filesystem` and `validator` services are now private
9+
410
5.3
511
---
612

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

-4
Original file line numberDiff line numberDiff line change
@@ -850,10 +850,6 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
850850
$workflowDefinition->replaceArgument(1, $markingStoreDefinition ?? null);
851851
$workflowDefinition->replaceArgument(3, $name);
852852
$workflowDefinition->replaceArgument(4, $workflow['events_to_dispatch']);
853-
$workflowDefinition->addTag('container.private', [
854-
'package' => 'symfony/framework-bundle',
855-
'version' => '5.3',
856-
]);
857853

858854
// Store to container
859855
$container->setDefinition($workflowId, $workflowDefinition);

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/form.php

-4
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,7 @@
5959
->alias(FormRegistryInterface::class, 'form.registry')
6060

6161
->set('form.factory', FormFactory::class)
62-
->public()
6362
->args([service('form.registry')])
64-
->tag('container.private', ['package' => 'symfony/framework-bundle', 'version' => '5.2'])
6563

6664
->alias(FormFactoryInterface::class, 'form.factory')
6765

@@ -104,10 +102,8 @@
104102
->tag('form.type')
105103

106104
->set('form.type.file', FileType::class)
107-
->public()
108105
->args([service('translator')->ignoreOnInvalid()])
109106
->tag('form.type')
110-
->tag('container.private', ['package' => 'symfony/framework-bundle', 'version' => '5.2'])
111107

112108
->set('form.type.color', ColorType::class)
113109
->args([service('translator')->ignoreOnInvalid()])

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/identity_translator.php

-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
return static function (ContainerConfigurator $container) {
1818
$container->services()
1919
->set('translator', IdentityTranslator::class)
20-
->public()
21-
->tag('container.private', ['package' => 'symfony/framework-bundle', 'version' => '5.2'])
2220
->alias(TranslatorInterface::class, 'translator')
2321

2422
->set('identity_translator', IdentityTranslator::class)

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/security_csrf.php

-2
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,11 @@
3232
->alias(TokenStorageInterface::class, 'security.csrf.token_storage')
3333

3434
->set('security.csrf.token_manager', CsrfTokenManager::class)
35-
->public()
3635
->args([
3736
service('security.csrf.token_generator'),
3837
service('security.csrf.token_storage'),
3938
service('request_stack')->ignoreOnInvalid(),
4039
])
41-
->tag('container.private', ['package' => 'symfony/framework-bundle', 'version' => '5.2'])
4240

4341
->alias(CsrfTokenManagerInterface::class, 'security.csrf.token_manager')
4442

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.php

-2
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,7 @@
5757

5858
$container->services()
5959
->set('serializer', Serializer::class)
60-
->public()
6160
->args([[], []])
62-
->tag('container.private', ['package' => 'symfony/framework-bundle', 'version' => '5.2'])
6361

6462
->alias(SerializerInterface::class, 'serializer')
6563
->alias(NormalizerInterface::class, 'serializer')

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/services.php

-4
Original file line numberDiff line numberDiff line change
@@ -122,20 +122,16 @@ class_exists(WorkflowEvents::class) ? WorkflowEvents::ALIASES : []
122122
->tag('container.no_preload')
123123

124124
->set('cache_clearer', ChainCacheClearer::class)
125-
->public()
126125
->args([
127126
tagged_iterator('kernel.cache_clearer'),
128127
])
129-
->tag('container.private', ['package' => 'symfony/framework-bundle', 'version' => '5.2'])
130128

131129
->set('kernel')
132130
->synthetic()
133131
->public()
134132
->alias(KernelInterface::class, 'kernel')
135133

136134
->set('filesystem', Filesystem::class)
137-
->public()
138-
->tag('container.private', ['package' => 'symfony/framework-bundle', 'version' => '5.2'])
139135
->alias(Filesystem::class, 'filesystem')
140136

141137
->set('file_locator', FileLocator::class)

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.php

-2
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@
2929

3030
$container->services()
3131
->set('validator', ValidatorInterface::class)
32-
->public()
3332
->factory([service('validator.builder'), 'getValidator'])
34-
->tag('container.private', ['package' => 'symfony/framework-bundle', 'version' => '5.2'])
3533
->alias(ValidatorInterface::class, 'validator')
3634

3735
->set('validator.builder', ValidatorBuilder::class)

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/workflow.php

-4
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
abstract_arg('events to dispatch'),
2929
])
3030
->abstract()
31-
->public()
32-
->tag('container.private', ['package' => 'symfony/framework-bundle', 'version' => '5.3'])
3331
->set('state_machine.abstract', StateMachine::class)
3432
->args([
3533
abstract_arg('workflow definition'),
@@ -39,8 +37,6 @@
3937
abstract_arg('events to dispatch'),
4038
])
4139
->abstract()
42-
->public()
43-
->tag('container.private', ['package' => 'symfony/framework-bundle', 'version' => '5.3'])
4440
->set('workflow.marking_store.method', MethodMarkingStore::class)
4541
->abstract()
4642
->set('workflow.registry', Registry::class)

‎src/Symfony/Bundle/SecurityBundle/CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
CHANGELOG
22
=========
33

4+
6.0
5+
---
6+
7+
* The `security.authorization_checker` and `security.token_storage` services are now private
8+
49
5.3
510
---
611

‎src/Symfony/Bundle/SecurityBundle/Resources/config/security.php

-4
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,15 @@
6161

6262
$container->services()
6363
->set('security.authorization_checker', AuthorizationChecker::class)
64-
->public()
6564
->args([
6665
service('security.token_storage'),
6766
service('security.authentication.manager'),
6867
service('security.access.decision_manager'),
6968
param('security.access.always_authenticate_before_granting'),
7069
])
71-
->tag('container.private', ['package' => 'symfony/security-bundle', 'version' => '5.3'])
7270
->alias(AuthorizationCheckerInterface::class, 'security.authorization_checker')
7371

7472
->set('security.token_storage', UsageTrackingTokenStorage::class)
75-
->public()
7673
->args([
7774
service('security.untracked_token_storage'),
7875
service_locator([
@@ -81,7 +78,6 @@
8178
])
8279
->tag('kernel.reset', ['method' => 'disableUsageTracking'])
8380
->tag('kernel.reset', ['method' => 'setToken'])
84-
->tag('container.private', ['package' => 'symfony/security-bundle', 'version' => '5.3'])
8581
->alias(TokenStorageInterface::class, 'security.token_storage')
8682

8783
->set('security.untracked_token_storage', TokenStorage::class)

‎src/Symfony/Bundle/TwigBundle/CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
CHANGELOG
22
=========
33

4+
6.0
5+
---
6+
7+
* The `twig` service is now private
8+
49
5.3
510
---
611

‎src/Symfony/Bundle/TwigBundle/Resources/config/twig.php

-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
return static function (ContainerConfigurator $container) {
5353
$container->services()
5454
->set('twig', Environment::class)
55-
->public()
5655
->args([service('twig.loader'), abstract_arg('Twig options')])
5756
->call('addGlobal', ['app', service('twig.app_variable')])
5857
->call('addRuntimeLoader', [service('twig.runtime_loader')])
@@ -65,7 +64,6 @@
6564
->tag('container.preload', ['class' => ExtensionSet::class])
6665
->tag('container.preload', ['class' => Template::class])
6766
->tag('container.preload', ['class' => TemplateWrapper::class])
68-
->tag('container.private', ['package' => 'symfony/twig-bundle', 'version' => '5.2'])
6967

7068
->alias('Twig_Environment', 'twig')
7169
->alias(Environment::class, 'twig')

0 commit comments

Comments
 (0)
0