Mirrors/wiosna-dev_common-library
1
0
Fork 1
mirror of https://github.com/wiosna-dev/common-library.git synced 2026-03-12 09:31:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reflection > fix deprecations

Browse Source
This commit is contained in:
Meritoo
2019-04-13 17:27:06 +02:00
parent 2bbd0a4ef3
commit 6f90f5a249
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/Utilities/Reflection.php
View File

@@ -8,8 +8,8 @@
namespace Meritoo\Common\Utilities; namespace Meritoo\Common\Utilities;
use Doctrine\Common\Util\ClassUtils; use Doctrine\Common\Inflector\Inflector;
use Doctrine\Common\Util\Inflector; use Doctrine\Common\Persistence\Proxy;
use Meritoo\Common\Collection\Collection; use Meritoo\Common\Collection\Collection;
use Meritoo\Common\Exception\Reflection\CannotResolveClassNameException; use Meritoo\Common\Exception\Reflection\CannotResolveClassNameException;
use Meritoo\Common\Exception\Reflection\MissingChildClassesException; use Meritoo\Common\Exception\Reflection\MissingChildClassesException;
@@ -368,7 +368,7 @@ class Reflection
return $name; return $name;
} }
return ClassUtils::getRealClass($name); return static::getRealClass($name);
} }
/** /**
@@ -514,14 +514,14 @@ class Reflection
foreach ($allClasses as $oneClass) { foreach ($allClasses as $oneClass) {
if (self::isChildOfClass($oneClass, $className)) { if (self::isChildOfClass($oneClass, $className)) {
/* /*
* Attention. I have to use ClassUtils::getRealClass() method to avoid problem with the proxy / cache * Attention. I have to use static::getRealClass() method to avoid problem with the proxy / cache
* classes. Example: * classes. Example:
* - My\ExtraBundle\Entity\MyEntity * - My\ExtraBundle\Entity\MyEntity
* - Proxies\__CG__\My\ExtraBundle\Entity\MyEntity * - Proxies\__CG__\My\ExtraBundle\Entity\MyEntity
* *
* It's actually the same class, so I have to skip it. * It's actually the same class, so I have to skip it.
*/ */
$realClass = ClassUtils::getRealClass($oneClass); $realClass = static::getRealClass($oneClass);
if (in_array($realClass, $childClasses, true)) { if (in_array($realClass, $childClasses, true)) {
continue; continue;
@@ -704,4 +704,19 @@ class Reflection
static::setPropertyValue($object, $property, $value); static::setPropertyValue($object, $property, $value);
} }
} }
/**
* Returns the real class name of a class name that could be a proxy
*
* @param string $class Class to verify
* @return string
*/
private static function getRealClass($class): string
{
if (false === $pos = strrpos($class, '\\' . Proxy::MARKER . '\\')) {
return $class;
}
return substr($class, $pos + Proxy::MARKER_LENGTH + 2);
}
} }