diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-22 17:29:52 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-22 17:29:52 +0100 |
| commit | 20711216c818e8a57cdb5d3bc1b2fc8bc34757c9 (patch) | |
| tree | eda128b755c8438f9f5ae3f7c5049a08f01386e1 /Core/Util | |
| parent | 4fb29cc3a28770e1045e400fd740fc6028ae6df3 (diff) | |
| parent | a542abcf38b95de8e8f01f42b6127e7fffc645a8 (diff) | |
| download | symfony-security-20711216c818e8a57cdb5d3bc1b2fc8bc34757c9.zip symfony-security-20711216c818e8a57cdb5d3bc1b2fc8bc34757c9.tar.gz symfony-security-20711216c818e8a57cdb5d3bc1b2fc8bc34757c9.tar.bz2 | |
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
Diffstat (limited to 'Core/Util')
| -rw-r--r-- | Core/Util/ClassUtils.php | 5 | ||||
| -rw-r--r-- | Core/Util/StringUtils.php | 2 |
2 files changed, 4 insertions, 3 deletions
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() { |