tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

ENHANCEMENT: Improved performance of Object::uninherited_static()

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@84159 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2009-08-11 06:44:47 +00:00
parent 70dc433d38
commit 81eeef25e8
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/Object.php
View File

@ -270,24 +270,18 @@ abstract class Object {
}
if(!isset(self::$cached_uninherited_statics[$class][$name]) || $uncached) {
$classRef = new ReflectionClass($class);
$classProps = $classRef->getStaticProperties();
$classRef = new ReflectionClass($class);
$classProp = $classRef->getStaticPropertyValue($name, null);
$parentClass = get_parent_class($class);
if($parentClass) {
$parentRef = new ReflectionClass($parentClass);
$parentProps = $parentRef->getStaticProperties();
$uninheritedBuiltIn = isset($classProps[$name])
&& (!isset($parentProps[$name])
|| $classProps[$name] != $parentProps[$name]) ? $classProps[$name] : null;
} else {
$uninheritedBuiltIn = isset($classProps[$name]) ? $classProps[$name] : null;
$parentRef = new ReflectionClass($parentClass);
$parentProp = $parentRef->getStaticPropertyValue($name, null);
if($parentProp == $classProp) $classProp = null;
}
self::$cached_uninherited_statics[$class][$name] = true;
self::$uninherited_statics[$class][$name] = $uninheritedBuiltIn;
self::$uninherited_statics[$class][$name] = $classProp;
}
return self::$uninherited_statics[$class][$name];