Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 50ef4f0

Browse filesBrowse files
chalasrchalasr
committed
Remove remaining deprecated features
1 parent 9179a96 commit 50ef4f0
Copy full SHA for 50ef4f0

File tree

10 files changed

+6
-154
lines changed
Filter options

10 files changed

+6
-154
lines changed

‎src/Symfony/Bridge/Monolog/CHANGELOG.md

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Monolog/CHANGELOG.md
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ CHANGELOG
77
* The `$actionLevel` constructor argument of `NotFoundActivationStrategy` has been replaced by the `$inner` one which expects an `ActivationStrategyInterface` to decorate instead
88
* The `$actionLevel` constructor argument of `HttpCodeActivationStrategy` has been replaced by the `$inner` one which expects an `ActivationStrategyInterface` to decorate instead
99
* Remove `ResetLoggersWorkerSubscriber` in favor of "reset_on_message" option in messenger configuration
10+
* Remove `SwiftMailerHandler`, use `MailerHandler` instead
1011

1112
5.4
1213
---

‎src/Symfony/Bridge/Monolog/Handler/SwiftMailerHandler.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Monolog/Handler/SwiftMailerHandler.php
-97Lines changed: 0 additions & 97 deletions
This file was deleted.

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

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ CHANGELOG
2020
* Register workflow services as private
2121
* Remove support for passing a `RouteCollectionBuilder` to `MicroKernelTrait::configureRoutes()`, type-hint `RoutingConfigurator` instead
2222
* Remove the `cache.adapter.doctrine` service
23+
* Remove the `framework.translator.enabled_locales` config option, use `framework.enabled_locales` instead
2324

2425
5.4
2526
---

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

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
-6Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -785,7 +785,6 @@ private function addTranslatorSection(ArrayNodeDefinition $rootNode, callable $e
785785
->{$enableIfStandalone('symfony/translation', Translator::class)}()
786786
->fixXmlConfig('fallback')
787787
->fixXmlConfig('path')
788-
->fixXmlConfig('enabled_locale')
789788
->fixXmlConfig('provider')
790789
->children()
791790
->arrayNode('fallbacks')
@@ -804,11 +803,6 @@ private function addTranslatorSection(ArrayNodeDefinition $rootNode, callable $e
804803
->arrayNode('paths')
805804
->prototype('scalar')->end()
806805
->end()
807-
->arrayNode('enabled_locales')
808-
->setDeprecated('symfony/framework-bundle', '5.3', 'Option "%node%" at "%path%" is deprecated, set the "framework.enabled_locales" option instead.')
809-
->prototype('scalar')->end()
810-
->defaultValue([])
811-
->end()
812806
->arrayNode('pseudo_localization')
813807
->canBeEnabled()
814808
->fixXmlConfig('localizable_html_attribute')

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

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+3-10Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -426,9 +426,7 @@ public function load(array $configs, ContainerBuilder $container)
426426
$this->registerProfilerConfiguration($config['profiler'], $container, $loader);
427427
$this->registerWorkflowConfiguration($config['workflows'], $container, $loader);
428428
$this->registerDebugConfiguration($config['php_errors'], $container, $loader);
429-
// @deprecated since Symfony 5.4, in 6.0 change to:
430-
// $this->registerRouterConfiguration($config['router'], $container, $loader, $config['enabled_locales']);
431-
$this->registerRouterConfiguration($config['router'], $container, $loader, $config['translator']['enabled_locales'] ?: $config['enabled_locales']);
429+
$this->registerRouterConfiguration($config['router'], $container, $loader, $config['enabled_locales']);
432430
$this->registerAnnotationsConfiguration($config['annotations'], $container, $loader);
433431
$this->registerPropertyAccessConfiguration($config['property_access'], $container, $loader);
434432
$this->registerSecretsConfiguration($config['secrets'], $container, $loader);
@@ -1217,10 +1215,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
12171215
$defaultOptions = $translator->getArgument(4);
12181216
$defaultOptions['cache_dir'] = $config['cache_dir'];
12191217
$translator->setArgument(4, $defaultOptions);
1220-
1221-
// @deprecated since Symfony 5.4, in 6.0 change to:
1222-
// $translator->setArgument(5, $enabledLocales);
1223-
$translator->setArgument(5, $config['enabled_locales'] ?: $enabledLocales);
1218+
$translator->setArgument(5, $enabledLocales);
12241219

12251220
$container->setParameter('translator.logging', $config['logging']);
12261221
$container->setParameter('translator.default_path', $config['default_path']);
@@ -1353,9 +1348,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
13531348
return;
13541349
}
13551350

1356-
// @deprecated since Symfony 5.4, in 6.0 change to:
1357-
// $locales = $enabledLocales;
1358-
$locales = $config['enabled_locales'] ?: $enabledLocales;
1351+
$locales = $enabledLocales;
13591352

13601353
foreach ($config['providers'] as $provider) {
13611354
if ($provider['locales']) {

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@
180180
<xsd:sequence>
181181
<xsd:element name="fallback" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
182182
<xsd:element name="path" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
183-
<xsd:element name="enabled-locale" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
184183
<xsd:element name="pseudo-localization" type="pseudo_localization" minOccurs="0" maxOccurs="1" />
185184
<xsd:element name="provider" type="translation_provider" minOccurs="0" maxOccurs="unbounded" />
186185
</xsd:sequence>

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/legacy_translator_enabled_locales.yml

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/legacy_translator_enabled_locales.yml
-14Lines changed: 0 additions & 14 deletions
This file was deleted.

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
-16Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -544,22 +544,6 @@ public function testRouter()
544544
$this->assertSame(['_locale' => 'fr|en'], $container->getDefinition('routing.loader')->getArgument(2));
545545
}
546546

547-
/**
548-
* @group legacy
549-
*/
550-
public function testRouterWithLegacyTranslatorEnabledLocales()
551-
{
552-
$container = $this->createContainerFromFile('legacy_translator_enabled_locales');
553-
554-
$this->assertTrue($container->has('router'), '->registerRouterConfiguration() loads routing.xml');
555-
$arguments = $container->findDefinition('router')->getArguments();
556-
$this->assertEquals($container->getParameter('kernel.project_dir').'/config/routing.xml', $container->getParameter('router.resource'), '->registerRouterConfiguration() sets routing resource');
557-
$this->assertEquals('%router.resource%', $arguments[1], '->registerRouterConfiguration() sets routing resource');
558-
$this->assertEquals('xml', $arguments[2]['resource_type'], '->registerRouterConfiguration() sets routing resource type');
559-
560-
$this->assertSame(['_locale' => 'fr|en'], $container->getDefinition('routing.loader')->getArgument(2));
561-
}
562-
563547
public function testRouterRequiresResourceOption()
564548
{
565549
$this->expectException(InvalidConfigurationException::class);

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

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ CHANGELOG
1212
* Remove the `security.user_password_encoder.generic` service, the `security.password_encoder` and the `Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface` aliases,
1313
use `security.user_password_hasher`, `security.password_hasher` and `Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface` instead
1414
* Remove the `logout.success_handler` and `logout.handlers` config options, register a listener on the `LogoutEvent` event instead
15+
* Remove `FirewallConfig::getListeners()`, use `FirewallConfig::getAuthenticators()` instead
1516

1617
5.4
1718
---

‎src/Symfony/Bundle/SecurityBundle/Security/FirewallConfig.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/Security/FirewallConfig.php
-10Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -102,16 +102,6 @@ public function getAccessDeniedUrl(): ?string
102102
return $this->accessDeniedUrl;
103103
}
104104

105-
/**
106-
* @deprecated since Symfony 5.4, use {@see getListeners()} instead
107-
*/
108-
public function getListeners(): array
109-
{
110-
trigger_deprecation('symfony/security-bundle', '5.4', 'Method "%s()" is deprecated, use "%s::getAuthenticators()" instead.', __METHOD__, __CLASS__);
111-
112-
return $this->getAuthenticators();
113-
}
114-
115105
public function getAuthenticators(): array
116106
{
117107
return $this->authenticators;

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.