Merge branch '3.1'

* 3.1:
  [VarDumper] Fix indentation trimming in ExceptionCaster
  [HttpKernel] Clarify deprecation of non-scalar values in surrogate renderer
  removed @SInCE
  [Security] fixed DebugAccessDecisionManager::setVoters()
  Remove and change unrelevant comments in Validator and Security components.
  [Validator] add missing interface use statement for phpdoc block return type.
  [Validator] UuidValidator must accept a Uuid constraint.
  [Validator] make UuidValidator class formatting consistent.

Conflicts:
	src/Symfony/Component/Validator/Tests/Constraints/AbstractConstraintValidatorTest.php

Author: nicolas-grekas

UPGRADE-3.1.md

@@ -95,9 +95,9 @@ FrameworkBundle
 HttpKernel
 ----------
 
- * Passing objects as URI attributes to the ESI and SSI renderers has been
+ * Passing non-scalar values as URI attributes to the ESI and SSI renderers has been
    deprecated and will be removed in Symfony 4.0. The inline fragment
-   renderer should be used with object attributes.
+   renderer should be used with non-scalar attributes.
 
  * The `ControllerResolver::getArguments()` method has been deprecated and will
    be removed in 4.0. If you have your own `ControllerResolverInterface`

UPGRADE-4.0.md

@@ -124,9 +124,9 @@ FrameworkBundle
 HttpKernel
 ----------
 
- * Possibility to pass objects as URI attributes to the ESI and SSI renderers
-   has been removed. The inline fragment renderer should be used with object
-   attributes.
+ * Possibility to pass non-scalar values as URI attributes to the ESI and SSI
+   renderers has been removed. The inline fragment renderer should be used with
+   non-scalar attributes.
 
  * The `ControllerResolver::getArguments()` method has been removed. If you
    have your own `ControllerResolverInterface` implementation, you should

src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php

@@ -117,8 +117,6 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
      * @param string               $registerAliasMethodName Name of Configuration class method to
      *                                                      register alias.
      * @param string[]             $aliasMap                Map of alias to namespace
-     *
-     * @since Support for bundle alias was added in Symfony 2.6
      */
     public function __construct($driver, array $namespaces, array $managerParameters, $driverPattern, $enabledParameter = false, $configurationPattern = '', $registerAliasMethodName = '', array $aliasMap = array())
     {

src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php

@@ -18,8 +18,6 @@
 /**
  * A utility for reading object IDs.
  *
- * @since  1.0
- *
  * @author Bernhard Schussek <bschussek@gmail.com>
  *
  * @internal This class is meant for internal use only.

src/Symfony/Component/Form/Extension/DataCollector/DataCollectorExtension.php

@@ -17,8 +17,6 @@
 /**
  * Extension for collecting data of the forms on a page.
  *
- * @since  2.4
- *
  * @author Robert Schönthal <robert.schoenthal@gmail.com>
  * @author Bernhard Schussek <bschussek@gmail.com>
  */

src/Symfony/Component/Form/Extension/DataCollector/EventListener/DataCollectorListener.php

@@ -20,8 +20,6 @@
  * Listener that invokes a data collector for the {@link FormEvents::POST_SET_DATA}
  * and {@link FormEvents::POST_SUBMIT} events.
  *
- * @since  2.4
- *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
 class DataCollectorListener implements EventSubscriberInterface

src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php

@@ -20,8 +20,6 @@
 /**
  * Data collector for {@link FormInterface} instances.
  *
- * @since  2.4
- *
  * @author Robert Schönthal <robert.schoenthal@gmail.com>
  * @author Bernhard Schussek <bschussek@gmail.com>
  */

src/Symfony/Component/Form/Extension/DataCollector/FormDataCollectorInterface.php

@@ -18,8 +18,6 @@
 /**
  * Collects and structures information about forms.
  *
- * @since  2.4
- *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
 interface FormDataCollectorInterface extends DataCollectorInterface

src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractor.php

@@ -19,8 +19,6 @@
 /**
  * Default implementation of {@link FormDataExtractorInterface}.
  *
- * @since  2.4
- *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
 class FormDataExtractor implements FormDataExtractorInterface

src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractorInterface.php

@@ -17,8 +17,6 @@
 /**
  * Extracts arrays of information out of forms.
  *
- * @since  2.4
- *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
 interface FormDataExtractorInterface