Merge branch '2.8' into 3.0

nicolas-grekas · nicolas-grekas · commit 3c4c0a836f5d · 2016-07-05T13:09:15.000+02:00
* 2.8: [VarDumper] Fix indentation trimming in ExceptionCaster removed @SInCE Remove and change unrelevant comments in Validator and Security components. [Validator] UuidValidator must accept a Uuid constraint. [Validator] make UuidValidator class formatting consistent. Conflicts: src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/LegacyUniqueEntityValidatorLegacyApiTest.php src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/CsrfProviderAdapter.php src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/CsrfTokenManagerAdapter.php src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/LegacyFormValidatorLegacyApiTest.php src/Symfony/Component/Security/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php src/Symfony/Component/Validator/Constraints/UuidValidator.php src/Symfony/Component/Validator/Context/LegacyExecutionContext.php src/Symfony/Component/Validator/Context/LegacyExecutionContextFactory.php src/Symfony/Component/Validator/Tests/Fixtures/StubGlobalExecutionContext.php src/Symfony/Component/Validator/Tests/Validator/AbstractLegacyApiTest.php src/Symfony/Component/Validator/Tests/Validator/AbstractTest.php src/Symfony/Component/Validator/Validator/LegacyValidator.php
diff --git a/DependencyInjection/CompilerPass/RegisterMappingsPass.php b/DependencyInjection/CompilerPass/RegisterMappingsPass.php
@@ -118,8 +118,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())
     {
diff --git a/Form/ChoiceList/IdReader.php b/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.

Original file line number	Diff line number	Diff line change
`@@ -118,8 +118,6 @@ abstract class RegisterMappingsPass implements CompilerPassInterface`
`118`	`118`	`* @param string $registerAliasMethodName Name of Configuration class method to`
`119`	`119`	`* register alias.`
`120`	`120`	`* @param string[] $aliasMap Map of alias to namespace`
`121`		`- *`
`122`		`- * @since Support for bundle alias was added in Symfony 2.6`
`123`	`121`	`*/`
`124`	`122`	`public function __construct($driver, array $namespaces, array $managerParameters, $driverPattern, $enabledParameter = false, $configurationPattern = '', $registerAliasMethodName = '', array $aliasMap = array())`
`125`	`123`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,6 @@`
`18`	`18`	`/**`
`19`	`19`	`* A utility for reading object IDs.`
`20`	`20`	`*`
`21`		`- * @since 1.0`
`22`		`- *`
`23`	`21`	`* @author Bernhard Schussek <[email protected]>`
`24`	`22`	`*`
`25`	`23`	`* @internal This class is meant for internal use only.`