10000 feature #41351 [FrameworkBundle][SecurityBundle][TwigBundle] Turn dep… · symfony/symfony@5013785 · GitHub
[go: up one dir, main page]
Skip to content

Commit 5013785

Browse files
nicolas-grekasnicolas-grekas
committed
feature #41351 [FrameworkBundle][SecurityBundle][TwigBundle] Turn deprecated public services to private (fancyweb)
This PR was merged into the 6.0 branch. Discussion ---------- [FrameworkBundle][SecurityBundle][TwigBundle] Turn deprecated public services to private | Q | A | ------------- | --- | Branch? | 6.0 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Commits ------- 9360d20 [FrameworkBundle][TwigBundle][SecurityBundle] Turn deprecated public services to private
2 parents 8d9feff + 9360d20 commit 5013785

File tree

13 files changed

+12
-30
lines changed

13 files changed

+12
-30
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ CHANGELOG
55
---
66

77
* 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
8+
* The `form.factory`, `form.type.file`, `translator`, `security.csrf.token_manager`, `serializer`,
9+
`cache_clearer`, `filesystem` and `validator` services are now private
810

911
5.4
1012
---

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -849,10 +849,6 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
849849
$workflowDefinition->replaceArgument(1, $markingStoreDefinition ?? null);
850850
$workflowDefinition->replaceArgument(3, $name);
851851
$workflowDefinition->replaceArgument(4, $workflow['events_to_dispatch']);
852-
$workflowDefinition->addTag('container.private', [
853-
'package' => 'symfony/framework-bundle',
854-
'version' => '5.3',
855-
]);
856852

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

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

Lines changed: 0 additions & 4 deletions
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

Lines changed: 0 additions & 2 deletions
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

Lines changed: 0 additions & 2 deletions
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

Lines changed: 0 additions & 2 deletions
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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,20 +124,16 @@ class_exists(WorkflowEvents::class) ? WorkflowEvents::ALIASES : []
124124
->tag('container.no_preload')
125125

126126
->set('cache_clearer', ChainCacheClearer::class)
127-
->public()
128127
->args([
129128
tagged_iterator('kernel.cache_clearer'),
130129
])
131-
->tag('container.private', ['package' => 'symfony/framework-bundle', 'version' => '5.2'])
132130

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

138136
->set('filesystem', Filesystem::class)
139-
->public()
140-
->tag('container.private', ['package' => 'symfony/framework-bundle', 'version' => '5.2'])
141137
->alias(Filesystem::class, 'filesystem')
142138

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

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

Lines changed: 0 additions & 2 deletions
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

Lines changed: 0 additions & 4 deletions
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

Lines changed: 5 additions & 0 deletions
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

0 commit comments

Comments
 (0)
0