Merge branch '2.3' into 2.5

* 2.3:
  [2.3] CS And DocBlock Fixes
  [2.3] CS Fixes

Conflicts:
	src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php
	src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
	src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
	src/Symfony/Bundle/FrameworkBundle/EventListener/TestSessionListener.php
	src/Symfony/Component/Config/Definition/ReferenceDumper.php
	src/Symfony/Component/Console/Application.php
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
	src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php
	src/Symfony/Component/Form/FormError.php
	src/Symfony/Component/HttpFoundation/Request.php
	src/Symfony/Component/HttpFoundation/Response.php
	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
	src/Symfony/Component/Process/ProcessUtils.php
	src/Symfony/Component/PropertyAccess/PropertyAccessor.php
	src/Symfony/Component/PropertyAccess/PropertyAccessorInterface.php
	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
	src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php
	src/Symfony/Component/Validator/Constraints/GroupSequence.php
	src/Symfony/Component/Validator/Mapping/ClassMetadata.php
	src/Symfony/Component/Validator/Mapping/ClassMetadataFactory.php
	src/Symfony/Component/Validator/Mapping/MemberMetadata.php
	src/Symfony/Component/Validator/Tests/Fixtures/StubGlobalExecutionContext.php

11 files changed, 19 insertions, 17 deletions

diff --git a/Core/Authentication/AuthenticationTrustResolver.php b/Core/Authentication/AuthenticationTrustResolver.php
index d030459..c66661a 100644
--- a/Core/Authentication/AuthenticationTrustResolver.php
+++ b/Core/Authentication/AuthenticationTrustResolver.php
@@ -24,7 +24,7 @@ class AuthenticationTrustResolver implements AuthenticationTrustResolverInterfac
     private $rememberMeClass;
 
     /**
-     * Constructor
+     * Constructor.
      *
      * @param string $anonymousClass
      * @param string $rememberMeClass
diff --git a/Core/Authentication/RememberMe/PersistentToken.php b/Core/Authentication/RememberMe/PersistentToken.php
index 5df71ec..92fcb4f 100644
--- a/Core/Authentication/RememberMe/PersistentToken.php
+++ b/Core/Authentication/RememberMe/PersistentToken.php
@@ -25,7 +25,7 @@ final class PersistentToken implements PersistentTokenInterface
     private $lastUsed;
 
     /**
-     * Constructor
+     * Constructor.
      *
      * @param string    $class
      * @param string    $username
diff --git a/Core/Authentication/RememberMe/PersistentTokenInterface.php b/Core/Authentication/RememberMe/PersistentTokenInterface.php
index ad52753..ba31ffa 100644
--- a/Core/Authentication/RememberMe/PersistentTokenInterface.php
+++ b/Core/Authentication/RememberMe/PersistentTokenInterface.php
@@ -13,7 +13,7 @@ namespace Symfony\Component\Security\Core\Authentication\RememberMe;
 
 /**
  * Interface to be implemented by persistent token classes (such as
- * Doctrine entities representing a remember-me token)
+ * Doctrine entities representing a remember-me token).
  *
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  */
diff --git a/Core/Authentication/RememberMe/TokenProviderInterface.php b/Core/Authentication/RememberMe/TokenProviderInterface.php
index 67d0bdd..c2d860e 100644
--- a/Core/Authentication/RememberMe/TokenProviderInterface.php
+++ b/Core/Authentication/RememberMe/TokenProviderInterface.php
@@ -14,7 +14,7 @@ namespace Symfony\Component\Security\Core\Authentication\RememberMe;
 use Symfony\Component\Security\Core\Exception\TokenNotFoundException;
 
 /**
- * Interface for TokenProviders
+ * Interface for TokenProviders.
  *
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  */
diff --git a/Core/Encoder/BCryptPasswordEncoder.php b/Core/Encoder/BCryptPasswordEncoder.php
index f62e8f5..d2b0319 100644
--- a/Core/Encoder/BCryptPasswordEncoder.php
+++ b/Core/Encoder/BCryptPasswordEncoder.php
@@ -52,6 +52,7 @@ class BCryptPasswordEncoder extends BasePasswordEncoder
      * It doesn't work with PHP versions lower than 5.3.7, since
      * the password compat library uses CRYPT_BLOWFISH hash type with
      * the "$2y$" salt prefix (which is not available in the early PHP versions).
+     *
      * @see https://github.com/ircmaxell/password_compat/issues/10#issuecomment-11203833
      *
      * It is almost best to **not** pass a salt and let PHP generate one for you.
diff --git a/Core/Encoder/EncoderFactory.php b/Core/Encoder/EncoderFactory.php
index 77021ec..0568d41 100644
--- a/Core/Encoder/EncoderFactory.php
+++ b/Core/Encoder/EncoderFactory.php
@@ -12,7 +12,7 @@
 namespace Symfony\Component\Security\Core\Encoder;
 
 /**
- * A generic encoder factory implementation
+ * A generic encoder factory implementation.
  *
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  */
@@ -59,7 +59,7 @@ class EncoderFactory implements EncoderFactoryInterface
     }
 
     /**
-     * Creates the actual encoder instance
+     * Creates the actual encoder instance.
      *
      * @param array $config
      *
diff --git a/Core/Tests/Util/SecureRandomTest.php b/Core/Tests/Util/SecureRandomTest.php
index e3fde69..6e12ef2 100644
--- a/Core/Tests/Util/SecureRandomTest.php
+++ b/Core/Tests/Util/SecureRandomTest.php
@@ -16,7 +16,7 @@ use Symfony\Component\Security\Core\Util\SecureRandom;
 class SecureRandomTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * T1: Monobit test
+     * T1: Monobit test.
      *
      * @dataProvider getSecureRandoms
      */
@@ -27,7 +27,7 @@ class SecureRandomTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * T2: Chi-square test with 15 degrees of freedom (chi-Quadrat-Anpassungstest)
+     * T2: Chi-square test with 15 degrees of freedom (chi-Quadrat-Anpassungstest).
      *
      * @dataProvider getSecureRandoms
      */
@@ -55,7 +55,7 @@ class SecureRandomTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * Run test
+     * Run test.
      *
      * @dataProvider getSecureRandoms
      */
@@ -103,7 +103,7 @@ class SecureRandomTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * Long-run test
+     * Long-run test.
      *
      * @dataProvider getSecureRandoms
      */
@@ -132,7 +132,7 @@ class SecureRandomTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * Serial Correlation (Autokorrelationstest)
+     * Serial Correlation (Autokorrelationstest).
      *
      * @dataProvider getSecureRandoms
      */
diff --git a/Core/Tests/Util/StringUtilsTest.php b/Core/Tests/Util/StringUtilsTest.php
index e0366a5..faeaf25 100644
--- a/Core/Tests/Util/StringUtilsTest.php
+++ b/Core/Tests/Util/StringUtilsTest.php
@@ -14,7 +14,7 @@ namespace Symfony\Component\Security\Core\Tests\Util;
 use Symfony\Component\Security\Core\Util\StringUtils;
 
 /**
- * Data from PHP.net's hash_equals tests
+ * Data from PHP.net's hash_equals tests.
  */
 class StringUtilsTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/Core/User/UserProviderInterface.php b/Core/User/UserProviderInterface.php
index 6b7895c..d17e3b7 100644
--- a/Core/User/UserProviderInterface.php
+++ b/Core/User/UserProviderInterface.php
@@ -46,7 +46,6 @@ interface UserProviderInterface
      * @see UsernameNotFoundException
      *
      * @throws UsernameNotFoundException if the user is not found
-     *
      */
     public function loadUserByUsername($username);
 
@@ -57,6 +56,7 @@ interface UserProviderInterface
      * totally reloaded (e.g. from the database), or if the UserInterface
      * object can just be merged into some internal array of users / identity
      * map.
+     *
      * @param UserInterface $user
      *
      * @return UserInterface
@@ -66,7 +66,7 @@ interface UserProviderInterface
     public function refreshUser(UserInterface $user);
 
     /**
-     * Whether this provider supports the given user class
+     * Whether this provider supports the given user class.
      *
      * @param string $class
      *
diff --git a/Core/Util/ClassUtils.php b/Core/Util/ClassUtils.php
index 1d40c8d..0585204 100644
--- a/Core/Util/ClassUtils.php
+++ b/Core/Util/ClassUtils.php
@@ -30,14 +30,14 @@ class ClassUtils
     const MARKER = '__CG__';
 
     /**
-     * Length of the proxy marker
+     * Length of the proxy marker.
      *
      * @var int
      */
     const MARKER_LENGTH = 6;
 
     /**
-     * This class should not be instantiated
+     * This class should not be instantiated.
      */
     private function __construct()
     {
@@ -47,6 +47,7 @@ class ClassUtils
      * Gets the real class name of a class name that could be a proxy.
      *
      * @param string|object
+     *
      * @return string
      */
     public static function getRealClass($object)
diff --git a/Core/Util/StringUtils.php b/Core/Util/StringUtils.php
index f326fe0..e8f3e3b 100644
--- a/Core/Util/StringUtils.php
+++ b/Core/Util/StringUtils.php
@@ -19,7 +19,7 @@ namespace Symfony\Component\Security\Core\Util;
 class StringUtils
 {
     /**
-     * This class should not be instantiated
+     * This class should not be instantiated.
      */
     private function __construct()
     {