diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-08-31 14:39:32 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-08-31 14:39:32 +0200 |
| commit | ece05f250cc6fb74eb56c031c76403b3273ad245 (patch) | |
| tree | 05e6299273582ee393bcd418f7c268c8455d3137 /Core/Util/ClassUtils.php | |
| parent | 22646d17807d51c97b732ea8a779bc1bd233ebeb (diff) | |
| parent | dddb2b44d3d3b93b244a39da490e54eea9f79672 (diff) | |
| download | symfony-security-ece05f250cc6fb74eb56c031c76403b3273ad245.zip symfony-security-ece05f250cc6fb74eb56c031c76403b3273ad245.tar.gz symfony-security-ece05f250cc6fb74eb56c031c76403b3273ad245.tar.bz2 | |
Merge branch '2.8'
* 2.8:
bumped minimal version in appveyor to 5.3.9
[VarDumper] Fix missing support for dumping PHP7 return type
Require security-acl 2.7 for BC
[travis] disable symfony_debug ext when deps!=no
Require actual version of ACL component until ACL/2.8 branch released
Do not normalize the kernel root directory path (see symfony/symfony#15474).
Don't trigger deprecation on interfaces
[Debug] Ignore silencing for deprecations
[ci] Run minimal versions on appveyor only
Deprecated Security ClassUtils in favor of Acl ClassUtils
Fix appveyor file
consistently use str_replace to unify directory separators (remaining)
Diffstat (limited to 'Core/Util/ClassUtils.php')
| -rw-r--r-- | Core/Util/ClassUtils.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Core/Util/ClassUtils.php b/Core/Util/ClassUtils.php index 6c87096..06186ef 100644 --- a/Core/Util/ClassUtils.php +++ b/Core/Util/ClassUtils.php @@ -11,13 +11,15 @@ namespace Symfony\Component\Security\Core\Util; -use Doctrine\Common\Util\ClassUtils as DoctrineClassUtils; +use Symfony\Component\Security\Acl\Util\ClassUtils as AclClassUtils; + +@trigger_error('The '.__NAMESPACE__.'\ClassUtils class is deprecated since version 2.8, to be removed in 3.0. Use Symfony\Component\Security\Acl\Util\ClassUtils instead.', E_USER_DEPRECATED); /** * Class related functionality for objects that * might or might not be proxy objects at the moment. * - * @see DoctrineClassUtils + * @deprecated ClassUtils is deprecated since version 2.8, to be removed in 3.0. Use Acl ClassUtils instead. * * @author Benjamin Eberlei <kontakt@beberlei.de> * @author Johannes Schmitt <schmittjoh@gmail.com> @@ -54,6 +56,11 @@ class ClassUtils */ public static function getRealClass($object) { + if (class_exists('Symfony\Component\Security\Acl\Util\ClassUtils')) { + return AclClassUtils::getRealClass($object); + } + + // fallback in case security-acl is not installed $class = is_object($object) ? get_class($object) : $object; if (false === $pos = strrpos($class, '\\'.self::MARKER.'\\')) { |