Skip to content

Commit 6640451

Browse files
committed
made deprecation notices less verbose
1 parent 81f82bf commit 6640451

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ CHANGELOG
44
4.1.0
55
-----
66

7-
* The `logout_on_user_change` firewall option is deprecated and will be removed in 5.0.
7+
* The `logout_on_user_change` firewall option is deprecated.
88
* deprecated `SecurityUserValueResolver`, use
99
`Symfony\Component\Security\Http\Controller\UserValueResolver` instead.
1010

DependencyInjection/MainConfiguration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
200200
->booleanNode('logout_on_user_change')
201201
->defaultTrue()
202202
->info('When true, it will trigger a logout for the user if something has changed. Note: No-Op option since 4.0. Will always be true.')
203-
->setDeprecated('The "%path%.%node%" configuration key has been deprecated in Symfony 4.1 and will be removed in 5.0.')
203+
->setDeprecated('The "%path%.%node%" configuration key has been deprecated in Symfony 4.1.')
204204
->end()
205205
->arrayNode('logout')
206206
->treatTrueLike(array())

Resources/config/security.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
<!-- Provisioning -->
166166
<service id="security.user.provider.in_memory" class="Symfony\Component\Security\Core\User\InMemoryUserProvider" abstract="true" />
167167
<service id="security.user.provider.in_memory.user" class="Symfony\Component\Security\Core\User\User" abstract="true">
168-
<deprecated>The "%service_id%" service is deprecated since Symfony 4.1 and will be removed in 5.0.</deprecated>
168+
<deprecated>The "%service_id%" service is deprecated since Symfony 4.1.</deprecated>
169169
</service>
170170

171171
<service id="security.user.provider.ldap" class="Symfony\Component\Security\Core\User\LdapUserProvider" abstract="true">

SecurityUserValueResolver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
use Symfony\Component\Security\Core\User\UserInterface;
2020
use Symfony\Component\Security\Http\Controller\UserValueResolver;
2121

22-
@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.1 and will be removed in 5.0, use "%s" instead.', SecurityUserValueResolver::class, UserValueResolver::class), E_USER_DEPRECATED);
22+
@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.1, use "%s" instead.', SecurityUserValueResolver::class, UserValueResolver::class), E_USER_DEPRECATED);
2323

2424
/**
2525
* Supports the argument type of {@see UserInterface}.
2626
*
2727
* @author Iltar van der Berg <[email protected]>
2828
*
29-
* @deprecated since Symfony 4.1, to be removed in 5.0. Use {@link UserValueResolver} instead
29+
* @deprecated since Symfony 4.1, use {@link UserValueResolver} instead
3030
*/
3131
final class SecurityUserValueResolver implements ArgumentValueResolverInterface
3232
{

0 commit comments

Comments
 (0)