Merge branch '2.7' into 2.8

* 2.7:
  fixes CS

Author: fabpot

Core/Authentication/Token/Storage/TokenStorage.php

@@ -14,7 +14,7 @@
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
 /**
- * TokenStorage contains a TokenInterface
+ * TokenStorage contains a TokenInterface.
  *
  * It gives access to the token representing the current user authentication.
  *

Core/Authorization/Voter/AbstractVoter.php

@@ -15,7 +15,7 @@
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
 /**
- * Abstract Voter implementation that reduces boilerplate code required to create a custom Voter
+ * Abstract Voter implementation that reduces boilerplate code required to create a custom Voter.
  *
  * @author Roman Marintšenko <inoryy@gmail.com>
  */
@@ -44,7 +44,7 @@ public function supportsClass($class)
     }
 
     /**
-     * Iteratively check all given attributes by calling isGranted
+     * Iteratively check all given attributes by calling isGranted.
      *
      * This method terminates as soon as it is able to return ACCESS_GRANTED
      * If at least one attribute is supported, but access not granted, then ACCESS_DENIED is returned
@@ -83,14 +83,14 @@ public function vote(TokenInterface $token, $object, array $attributes)
     }
 
     /**
-     * Return an array of supported classes. This will be called by supportsClass
+     * Return an array of supported classes. This will be called by supportsClass.
      *
      * @return array an array of supported classes, i.e. array('Acme\DemoBundle\Model\Product')
      */
     abstract protected function getSupportedClasses();
 
     /**
-     * Return an array of supported attributes. This will be called by supportsAttribute
+     * Return an array of supported attributes. This will be called by supportsAttribute.
      *
      * @return array an array of supported attributes, i.e. array('CREATE', 'READ')
      */
@@ -101,7 +101,7 @@ abstract protected function getSupportedAttributes();
      * It is safe to assume that $attribute and $object's class pass supportsAttribute/supportsClass
      * $user can be one of the following:
      *   a UserInterface object (fully authenticated user)
-     *   a string               (anonymously authenticated user)
+     *   a string               (anonymously authenticated user).
      *
      * @param string               $attribute
      * @param object               $object

Core/Encoder/UserPasswordEncoder.php

@@ -14,7 +14,7 @@
 use Symfony\Component\Security\Core\User\UserInterface;
 
 /**
- * A generic password encoder
+ * A generic password encoder.
  *
  * @author Ariel Ferrandini <arielferrandini@gmail.com>
  */

Core/Encoder/UserPasswordEncoderInterface.php

@@ -21,7 +21,6 @@
 interface UserPasswordEncoderInterface
 {
     /**
-     *
      * Encodes the plain password.
      *
      * @param UserInterface $user          The user

Core/SecurityContext.php

@@ -28,6 +28,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
+ *
  * @deprecated since version 2.6, to be removed in 3.0.
  */
 class SecurityContext implements SecurityContextInterface
@@ -43,7 +44,7 @@ class SecurityContext implements SecurityContextInterface
     private $authorizationChecker;
 
     /**
-     * For backwards compatibility, the signature of sf <2.6 still works
+     * For backwards compatibility, the signature of sf <2.6 still works.
      *
      * @param TokenStorageInterface|AuthenticationManagerInterface         $tokenStorage
      * @param AuthorizationCheckerInterface|AccessDecisionManagerInterface $authorizationChecker

Core/SecurityContextInterface.php

@@ -20,6 +20,7 @@
  * The SecurityContextInterface.
  *
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
+ *
  * @deprecated since version 2.6, to be removed in 3.0.
  */
 interface SecurityContextInterface extends TokenStorageInterface, AuthorizationCheckerInterface

Core/Tests/LegacySecurityContextTest.php

@@ -81,7 +81,7 @@ public function isGrantedDelegationProvider()
     }
 
     /**
-     * Test dedicated to check if the backwards compatibility is still working
+     * Test dedicated to check if the backwards compatibility is still working.
      */
     public function testOldConstructorSignature()
     {

Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php

@@ -15,6 +15,7 @@
 
 /**
  * @since  2.5.4
+ *
  * @author Bernhard Schussek <bschussek@gmail.com>
  * @group  legacy
  */

Csrf/CsrfTokenManagerInterface.php

@@ -15,6 +15,7 @@
  * Manages CSRF tokens.
  *
  * @since  2.4
+ *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
 interface CsrfTokenManagerInterface

Csrf/Tests/TokenGenerator/UriSafeTokenGeneratorTest.php

@@ -21,7 +21,8 @@ class UriSafeTokenGeneratorTest extends \PHPUnit_Framework_TestCase
     const ENTROPY = 1000;
 
     /**
-     * A non alpha-numeric byte string
+     * A non alpha-numeric byte string.
+     *
      * @var string
      */
     private static $bytes;
@@ -57,7 +58,7 @@ public function testGenerateToken()
     {
         $this->random->expects($this->once())
             ->method('nextBytes')
-            ->with(self::ENTROPY/8)
+            ->with(self::ENTROPY / 8)
             ->will($this->returnValue(self::$bytes));
 
         $token = $this->generator->generateToken();