diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-01-03 09:01:59 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-01-03 09:01:59 +0100 |
| commit | 6c39103b6f13e2bcde7c3543a8e28e0dd3c1f571 (patch) | |
| tree | d46500c4f856715d9c3b823dd4568edb41d28cdc /Core/Util | |
| parent | 66b3190f2c91508e73f4181fe4b718d19587346b (diff) | |
| parent | 21a953b1896d6c3e886f1dd3819793be207d09b6 (diff) | |
| download | symfony-security-6c39103b6f13e2bcde7c3543a8e28e0dd3c1f571.zip symfony-security-6c39103b6f13e2bcde7c3543a8e28e0dd3c1f571.tar.gz symfony-security-6c39103b6f13e2bcde7c3543a8e28e0dd3c1f571.tar.bz2 | |
Merge branch '2.5' into 2.6
* 2.5:
Use PHPUnit ini_set wrapper in tests
[Process] Added a test skip check for Windows
[Process] Removed unused variable assignment
Fixes various phpdoc and coding standards.
Fixes Issue #13184 - incremental output getters now return empty strings
Updated copyright to 2015
Updated copyright to 2015
Clarify a comment.
Conflicts:
src/Symfony/Component/HttpKernel/Fragment/EsiFragmentRenderer.php
Diffstat (limited to 'Core/Util')
| -rw-r--r-- | Core/Util/ClassUtils.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Core/Util/ClassUtils.php b/Core/Util/ClassUtils.php index 0585204..6107c40 100644 --- a/Core/Util/ClassUtils.php +++ b/Core/Util/ClassUtils.php @@ -11,11 +11,13 @@ namespace Symfony\Component\Security\Core\Util; +use Doctrine\Common\Util\ClassUtils as DoctrineClassUtils; + /** * Class related functionality for objects that * might or might not be proxy objects at the moment. * - * @see Doctrine\Common\Util\ClassUtils + * @see DoctrineClassUtils * * @author Benjamin Eberlei <kontakt@beberlei.de> * @author Johannes Schmitt <schmittjoh@gmail.com> |