minor symfony#26225 Make deprecation notices less verbose (fabpot)

This PR was merged into the 4.1-dev branch.

Discussion
----------

Make deprecation notices less verbose

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

I think there is no need to say that deprecated features will be removed in the next major version. That makes messages more verbose for no real reasons.

Commits
-------

0c6ec3f made deprecation notices less verbose

Author: fabpot

UPGRADE-4.1.md

@@ -5,48 +5,46 @@ Config
 ------
 
  * Implementing `ParentNodeDefinitionInterface` without the `getChildNodeDefinitions()` method
-   is deprecated and will be unsupported in 5.0.
+   is deprecated.
 
 EventDispatcher
 ---------------
 
- * The `TraceableEventDispatcherInterface` has been deprecated and will be removed in 5.0.
+ * The `TraceableEventDispatcherInterface` has been deprecated.
 
 FrameworkBundle
 ---------------
 
- * A `RouterInterface` that does not implement the `WarmableInterface` is deprecated and will not be supported in Symfony 5.0.
- * The `RequestDataCollector` class has been deprecated and will be removed in Symfony 5.0. Use the `Symfony\Component\HttpKernel\DataCollector\RequestDataCollector` class instead.
+ * A `RouterInterface` that does not implement the `WarmableInterface` is deprecated.
+ * The `RequestDataCollector` class has been deprecated. Use the `Symfony\Component\HttpKernel\DataCollector\RequestDataCollector` class instead.
 
 HttpFoundation
 --------------
 
- * Passing the file size to the constructor of the `UploadedFile` class is deprecated and won't be
-   supported anymore in 5.0.
+ * Passing the file size to the constructor of the `UploadedFile` class is deprecated.
 
  * The `getClientSize()` method of the `UploadedFile` class is deprecated. Use `getSize()` instead.
 
 Security
 --------
 
- * The `ContextListener::setLogoutOnUserChange()` method is deprecated and will be removed in 5.0.
+ * The `ContextListener::setLogoutOnUserChange()` method is deprecated.
  * Using the `AdvancedUserInterface` is now deprecated. To use the existing
    functionality, create a custom user-checker based on the
-   `Symfony\Component\Security\Core\User\UserChecker`. This functionality will
-   be removed in Symfony 5.0.
+   `Symfony\Component\Security\Core\User\UserChecker`.
 
 SecurityBundle
 --------------
 
- * The `logout_on_user_change` firewall option is deprecated and will be removed in 5.0.
- * The `SecurityUserValueResolver` class is deprecated and will be removed in 5.0, use
+ * The `logout_on_user_change` firewall option is deprecated.
+ * The `SecurityUserValueResolver` class is deprecated, use
    `Symfony\Component\Security\Http\Controller\UserValueResolver` instead.
 
 Translation
 -----------
 
- * The `FileDumper::setBackup()` method is deprecated and will be removed in 5.0.
- * The `TranslationWriter::disableBackup()` method is deprecated and will be removed in 5.0.
+ * The `FileDumper::setBackup()` method is deprecated.
+ * The `TranslationWriter::disableBackup()` method is deprecated.
 
 TwigBundle
 ----------
@@ -56,9 +54,9 @@ TwigBundle
 Validator
 --------
 
- * The `Email::__construct()` 'strict' property is deprecated and will be removed in 5.0. Use 'mode'=>"strict" instead.
- * Calling `EmailValidator::__construct()` method with a boolean parameter is deprecated and will be removed in 5.0, use `EmailValidator("strict")` instead.
- * Deprecated the `checkDNS` and `dnsMessage` options of the `Url` constraint. They will be removed in 5.0.
+ * The `Email::__construct()` 'strict' property is deprecated. Use 'mode'=>"strict" instead.
+ * Calling `EmailValidator::__construct()` method with a boolean parameter is deprecated, use `EmailValidator("strict")` instead.
+ * Deprecated the `checkDNS` and `dnsMessage` options of the `Url` constraint.
 
 Workflow
 --------

src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md

@@ -8,8 +8,8 @@ CHANGELOG
  * Added a new `parameter_bag` service with related autowiring aliases to access parameters as-a-service
  * Allowed the `Router` to work with any PSR-11 container
  * Added option in workflow dump command to label graph with a custom label
- * Using a `RouterInterface` that does not implement the `WarmableInterface` is deprecated and will not be supported in Symfony 5.0.
- * The `RequestDataCollector` class has been deprecated and will be removed in Symfony 5.0. Use the `Symfony\Component\HttpKernel\DataCollector\RequestDataCollector` class instead.
+ * Using a `RouterInterface` that does not implement the `WarmableInterface` is deprecated.
+ * The `RequestDataCollector` class has been deprecated. Use the `Symfony\Component\HttpKernel\DataCollector\RequestDataCollector` class instead.
  * The `RedirectController` class allows for 307/308 HTTP status codes
 
 4.0.0

src/Symfony/Bundle/FrameworkBundle/DataCollector/RequestDataCollector.php

@@ -13,14 +13,14 @@
 
 use Symfony\Component\HttpKernel\DataCollector\RequestDataCollector as BaseRequestDataCollector;
 
-@trigger_error(sprintf('The "%s" class is deprecated since version 4.1 and will be removed in Symfony 5.0. Use %s instead.', RequestDataCollector::class, BaseRequestDataCollector::class), E_USER_DEPRECATED);
+@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.1. Use %s instead.', RequestDataCollector::class, BaseRequestDataCollector::class), E_USER_DEPRECATED);
 
 /**
  * RequestDataCollector.
  *
  * @author Jules Pietri <[email protected]>
  *
- * @deprecated since version 4.1, to be removed in Symfony 5.0
+ * @deprecated since Symfony 4.1
  */
 class RequestDataCollector extends BaseRequestDataCollector
 {

src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml

@@ -70,7 +70,7 @@
         </service>
 
         <service id="session.save_listener" class="Symfony\Component\HttpKernel\EventListener\SaveSessionListener">
-            <deprecated>The "%service_id%" service is deprecated since Symfony 4.1 and will be removed in 5.0. Use the "session_listener" service instead.</deprecated>
+            <deprecated>The "%service_id%" service is deprecated since Symfony 4.1. Use the "session_listener" service instead.</deprecated>
         </service>
 
         <!-- for BC -->

src/Symfony/Bundle/SecurityBundle/CHANGELOG.md

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

src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php

@@ -200,7 +200,7 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
             ->booleanNode('logout_on_user_change')
                 ->defaultTrue()
                 ->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.')
-                ->setDeprecated('The "%path%.%node%" configuration key has been deprecated in Symfony 4.1 and will be removed in 5.0.')
+                ->setDeprecated('The "%path%.%node%" configuration key has been deprecated in Symfony 4.1.')
             ->end()
             ->arrayNode('logout')
                 ->treatTrueLike(array())

src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml

@@ -165,7 +165,7 @@
         <!-- Provisioning -->
         <service id="security.user.provider.in_memory" class="Symfony\Component\Security\Core\User\InMemoryUserProvider" abstract="true" />
         <service id="security.user.provider.in_memory.user" class="Symfony\Component\Security\Core\User\User" abstract="true">
-            <deprecated>The "%service_id%" service is deprecated since Symfony 4.1 and will be removed in 5.0.</deprecated>
+            <deprecated>The "%service_id%" service is deprecated since Symfony 4.1.</deprecated>
         </service>
 
         <service id="security.user.provider.ldap" class="Symfony\Component\Security\Core\User\LdapUserProvider" abstract="true">

src/Symfony/Bundle/SecurityBundle/SecurityUserValueResolver.php

@@ -19,14 +19,14 @@
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Http\Controller\UserValueResolver;
 
-@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);
+@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.1, use "%s" instead.', SecurityUserValueResolver::class, UserValueResolver::class), E_USER_DEPRECATED);
 
 /**
  * Supports the argument type of {@see UserInterface}.
  *
  * @author Iltar van der Berg <[email protected]>
  *
- * @deprecated since Symfony 4.1, to be removed in 5.0. Use {@link UserValueResolver} instead
+ * @deprecated since Symfony 4.1, use {@link UserValueResolver} instead
  */
 final class SecurityUserValueResolver implements ArgumentValueResolverInterface
 {

src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php

@@ -364,7 +364,7 @@ public function setPathSeparator(string $separator)
                     $child->setPathSeparator($separator);
                 }
             } else {
-                @trigger_error('Passing a ParentNodeDefinitionInterface without getChildNodeDefinitions() is deprecated since version 4.1 and will be removed in 5.0.', E_USER_DEPRECATED);
+                @trigger_error('Passing a ParentNodeDefinitionInterface without getChildNodeDefinitions() is deprecated since Symfony 4.1.', E_USER_DEPRECATED);
             }
         }
 

src/Symfony/Component/EventDispatcher/CHANGELOG.md

@@ -6,7 +6,7 @@ CHANGELOG
 
  * added support for invokable event listeners tagged with `kernel.event_listener` by default 
  * The `TraceableEventDispatcher::getOrphanedEvents()` method has been added.
- * The `TraceableEventDispatcherInterface` has been deprecated and will be removed in 5.0.
+ * The `TraceableEventDispatcherInterface` has been deprecated.
 
 4.0.0
 -----