8000 [FrameworkBundle][SecurityBundle][TwigBundle] Turn deprecated public services to private by fancyweb · Pull Request #41351 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[FrameworkBundle][SecurityBundle][TwigBundle] Turn deprecated public services to private #41351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub&rdqu 8000 o;, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 23, 2021
Merged

[FrameworkBundle][SecurityBundle][TwigBundle] Turn deprecated public services to private #41351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
View file
Open in desktop
Original file line number Diff 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

5.4
---
Expand Down
4 changes: 0 additions & 4 deletions src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View file
Open in desktop
10000
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 0 additions & 4 deletions src/Symfony/Bundle/FrameworkBundle/Resources/config/form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down Expand Up @@ -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()])
Expand Down
2 changes: 0 additions & 2 deletions src/Symfony/Bundle/FrameworkBundle/Resources/config/identity_translator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions src/Symfony/Bundle/FrameworkBundle/Resources/config/security_csrf.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
2 changes: 0 additions & 2 deletions src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
4 changes: 0 additions & 4 deletions src/Symfony/Bundle/FrameworkBundle/Resources/config/services.php
View file
Open in desktop
Original file lin 6D4E e number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 0 additions & 4 deletions src/Symfony/Bundle/FrameworkBundle/Resources/config/workflow.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand All @@ -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)
Expand Down
5 changes: 5 additions & 0 deletions src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
CHANGELOG
=========

6.0
---

* The `security.authorization_checker` and `security.token_storage` services are now private

5.3
---

Expand Down
4 changes: 0 additions & 4 deletions src/Symfony/Bundle/SecurityBundle/Resources/config/security.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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([
Expand All @@ -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)
Expand Down
5 changes: 5 additions & 0 deletions src/Symfony/Bundle/TwigBundle/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
CHANGELOG
=========

6.0
---

* The `twig` service is now private

5.3
---

Expand Down
2 changes: 0 additions & 2 deletions src/Symfony/Bundle/TwigBundle/Resources/config/twig.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')])
Expand All @@ -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')
Expand Down
0