Merge branch '2.7' into 2.8

* 2.7:
  fixes CS

8 files changed, 12 insertions, 10 deletions

diff --git a/Core/Authentication/Token/Storage/TokenStorage.php b/Core/Authentication/Token/Storage/TokenStorage.php
index 4b6c11f..b493081 100644
--- a/Core/Authentication/Token/Storage/TokenStorage.php
+++ b/Core/Authentication/Token/Storage/TokenStorage.php
@@ -14,7 +14,7 @@ namespace Symfony\Component\Security\Core\Authentication\Token\Storage;
 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.
  *
diff --git a/Core/Authorization/Voter/AbstractVoter.php b/Core/Authorization/Voter/AbstractVoter.php
index 43ca558..efa1562 100644
--- a/Core/Authorization/Voter/AbstractVoter.php
+++ b/Core/Authorization/Voter/AbstractVoter.php
@@ -15,7 +15,7 @@ use Symfony\Component\Security\Core\User\UserInterface;
 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 @@ abstract class AbstractVoter implements VoterInterface
     }
 
     /**
-     * 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 @@ abstract class AbstractVoter implements VoterInterface
     }
 
     /**
-     * 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 class AbstractVoter implements VoterInterface
      * 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
diff --git a/Core/Encoder/UserPasswordEncoder.php b/Core/Encoder/UserPasswordEncoder.php
index 13ee835..b096049 100644
--- a/Core/Encoder/UserPasswordEncoder.php
+++ b/Core/Encoder/UserPasswordEncoder.php
@@ -14,7 +14,7 @@ namespace Symfony\Component\Security\Core\Encoder;
 use Symfony\Component\Security\Core\User\UserInterface;
 
 /**
- * A generic password encoder
+ * A generic password encoder.
  *
  * @author Ariel Ferrandini <arielferrandini@gmail.com>
  */
diff --git a/Core/Encoder/UserPasswordEncoderInterface.php b/Core/Encoder/UserPasswordEncoderInterface.php
index 39e906a..7861caa 100644
--- a/Core/Encoder/UserPasswordEncoderInterface.php
+++ b/Core/Encoder/UserPasswordEncoderInterface.php
@@ -21,7 +21,6 @@ use Symfony\Component\Security\Core\User\UserInterface;
 interface UserPasswordEncoderInterface
 {
     /**
-     *
      * Encodes the plain password.
      *
      * @param UserInterface $user          The user
diff --git a/Core/SecurityContext.php b/Core/SecurityContext.php
index 8bcbfee..027ff49 100644
--- a/Core/SecurityContext.php
+++ b/Core/SecurityContext.php
@@ -28,6 +28,7 @@ use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
  *
  * @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
diff --git a/Core/SecurityContextInterface.php b/Core/SecurityContextInterface.php
index 61cdf4f..a759feb 100644
--- a/Core/SecurityContextInterface.php
+++ b/Core/SecurityContextInterface.php
@@ -20,6 +20,7 @@ use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
  * 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
diff --git a/Core/Tests/LegacySecurityContextTest.php b/Core/Tests/LegacySecurityContextTest.php
index c5da22d..92d7c16 100644
--- a/Core/Tests/LegacySecurityContextTest.php
+++ b/Core/Tests/LegacySecurityContextTest.php
@@ -81,7 +81,7 @@ class LegacySecurityContextTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * 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()
     {
diff --git a/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php b/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php
index 72e08c0..8053732 100644
--- a/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php
+++ b/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php
@@ -15,6 +15,7 @@ use Symfony\Component\Validator\Validation;
 
 /**
  * @since  2.5.4
+ *
  * @author Bernhard Schussek <bschussek@gmail.com>
  * @group  legacy
  */