Merge branch '3.1'

nicolas-grekas · nicolas-grekas · commit e19b443bf25d · 2016-07-05T13:11:18.000+02:00
* 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
diff --git a/Core/Authorization/DebugAccessDecisionManager.php b/Core/Authorization/DebugAccessDecisionManager.php
@@ -62,7 +62,7 @@ public function decide(TokenInterface $token, array $attributes, $object = null)
      */
     public function setVoters(array $voters)
     {
-        if (!$this->manager instanceof AccessDecisionManager) {
+        if (!method_exists($this->manager, 'setVoters')) {
             return;
         }
 
diff --git a/Csrf/CsrfTokenManagerInterface.php b/Csrf/CsrfTokenManagerInterface.php
@@ -14,8 +14,6 @@
 /**
  * Manages CSRF tokens.
  *
- * @since  2.4
- *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
 interface CsrfTokenManagerInterface
diff --git a/Csrf/TokenGenerator/TokenGeneratorInterface.php b/Csrf/TokenGenerator/TokenGeneratorInterface.php
@@ -14,8 +14,6 @@
 /**
  * Generates CSRF tokens.
  *
- * @since  2.4
- *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
 interface TokenGeneratorInterface
diff --git a/Csrf/TokenGenerator/UriSafeTokenGenerator.php b/Csrf/TokenGenerator/UriSafeTokenGenerator.php
@@ -14,8 +14,6 @@
 /**
  * Generates CSRF tokens.
  *
- * @since  2.4
- *
  * @author Bernhard Schussek <bernhard.schussek@symfony.com>
  */
 class UriSafeTokenGenerator implements TokenGeneratorInterface
diff --git a/Csrf/TokenStorage/NativeSessionTokenStorage.php b/Csrf/TokenStorage/NativeSessionTokenStorage.php
@@ -16,8 +16,6 @@
 /**
  * Token storage that uses PHP's native session handling.
  *
- * @since  2.4
- *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
 class NativeSessionTokenStorage implements TokenStorageInterface
diff --git a/Csrf/TokenStorage/SessionTokenStorage.php b/Csrf/TokenStorage/SessionTokenStorage.php
@@ -15,9 +15,7 @@
 use Symfony\Component\Security\Csrf\Exception\TokenNotFoundException;
 
 /**
- * Token storage that uses a Symfony2 Session object.
- *
- * @since  2.4
+ * Token storage that uses a Symfony Session object.
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
diff --git a/Csrf/TokenStorage/TokenStorageInterface.php b/Csrf/TokenStorage/TokenStorageInterface.php
@@ -14,8 +14,6 @@
 /**
  * Stores CSRF tokens.
  *
- * @since  2.4
- *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
 interface TokenStorageInterface

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function decide(TokenInterface $token, array $attributes, $object = null)`
`62`	`62`	`*/`
`63`	`63`	`public function setVoters(array $voters)`
`64`	`64`	`{`
`65`		`- if (!$this->manager instanceof AccessDecisionManager) {`
	`65`	`+ if (!method_exists($this->manager, 'setVoters')) {`
`66`	`66`	`return;`
`67`	`67`	`}`
`68`	`68`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,6 @@`
`14`	`14`	`/**`
`15`	`15`	`* Manages CSRF tokens.`
`16`	`16`	`*`
`17`		`- * @since 2.4`
`18`		`- *`
`19`	`17`	`* @author Bernhard Schussek <bschussek@gmail.com>`
`20`	`18`	`*/`
`21`	`19`	`interface CsrfTokenManagerInterface`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,6 @@`
`16`	`16`	`/**`
`17`	`17`	`* Token storage that uses PHP's native session handling.`
`18`	`18`	`*`
`19`		`- * @since 2.4`
`20`		`- *`
`21`	`19`	`* @author Bernhard Schussek <bschussek@gmail.com>`
`22`	`20`	`*/`
`23`	`21`	`class NativeSessionTokenStorage implements TokenStorageInterface`