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

FIX: Fixed regression from ClassInfo case-sensitivity fix.

Browse Source 
This fixes a bug introduced by ffbeac6b7d3ed1a6e02a150573ee4b2f9251cf9c.
ClassInfo::subclassesFor() didn't previously throw an Exception if passed
an invalid class; it just returned no values. This will annoy minor-release
upgrades, and so I've made it return null instead in these situation.
This commit is contained in:
Sam Minnee 2015-08-07 14:20:01 +12:00
parent 102892e247
commit 1f0602d42f
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/ClassInfo.php
View File

@ -61,6 +61,8 @@ class ClassInfo {
* @return array List of subclasses * @return array List of subclasses
*/ */
public static function getValidSubClasses($class = 'SiteTree', $includeUnbacked = false) { public static function getValidSubClasses($class = 'SiteTree', $includeUnbacked = false) {
if(is_string($class) && !class_exists($class)) return null;
$class = self::class_name($class); $class = self::class_name($class);
$classes = DB::get_schema()->enumValuesForField($class, 'ClassName'); $classes = DB::get_schema()->enumValuesForField($class, 'ClassName');
if (!$includeUnbacked) $classes = array_filter($classes, array('ClassInfo', 'exists')); if (!$includeUnbacked) $classes = array_filter($classes, array('ClassInfo', 'exists'));
@ -76,6 +78,8 @@ class ClassInfo {
* @return array * @return array
*/ */
public static function dataClassesFor($class) { public static function dataClassesFor($class) {
if(is_string($class) && !class_exists($class)) return null;
$result = array(); $result = array();
$class = self::class_name($class); $class = self::class_name($class);
@ -100,6 +104,8 @@ class ClassInfo {
* @return string * @return string
*/ */
public static function baseDataClass($class) { public static function baseDataClass($class) {
if(is_string($class) && !class_exists($class)) return null;
$class = self::class_name($class); $class = self::class_name($class);
if (!is_subclass_of($class, 'DataObject')) { if (!is_subclass_of($class, 'DataObject')) {
@ -134,6 +140,8 @@ class ClassInfo {
* @return array Names of all subclasses as an associative array. * @return array Names of all subclasses as an associative array.
*/ */
public static function subclassesFor($class) { public static function subclassesFor($class) {
if(is_string($class) && !class_exists($class)) return null;
//normalise class case //normalise class case
$className = self::class_name($class); $className = self::class_name($class);
$descendants = SS_ClassLoader::instance()->getManifest()->getDescendantsOf($class); $descendants = SS_ClassLoader::instance()->getManifest()->getDescendantsOf($class);
@ -159,6 +167,7 @@ class ClassInfo {
if (is_object($nameOrObject)) { if (is_object($nameOrObject)) {
return get_class($nameOrObject); return get_class($nameOrObject);
} }
$reflection = new ReflectionClass($nameOrObject); $reflection = new ReflectionClass($nameOrObject);
return $reflection->getName(); return $reflection->getName();
} }
@ -172,6 +181,8 @@ class ClassInfo {
* @return array * @return array
*/ */
public static function ancestry($class, $tablesOnly = false) { public static function ancestry($class, $tablesOnly = false) {
if(is_string($class) && !class_exists($class)) return null;
$class = self::class_name($class); $class = self::class_name($class);
$lClass = strtolower($class); $lClass = strtolower($class);

2
model/DataQuery.php
View File

@ -232,10 +232,12 @@ class DataQuery {
foreach($collisions as $collision) { foreach($collisions as $collision) {
if(preg_match('/^"([^"]+)"/', $collision, $matches)) { if(preg_match('/^"([^"]+)"/', $collision, $matches)) {
$collisionBase = $matches[1]; $collisionBase = $matches[1];
if(class_exists($collisionBase)) {
$collisionClasses = ClassInfo::subclassesFor($collisionBase); $collisionClasses = ClassInfo::subclassesFor($collisionBase);
$collisionClasses = Convert::raw2sql($collisionClasses, true); $collisionClasses = Convert::raw2sql($collisionClasses, true);
$caseClauses[] = "WHEN \"$baseClass\".\"ClassName\" IN (" $caseClauses[] = "WHEN \"$baseClass\".\"ClassName\" IN ("
. implode(", ", $collisionClasses) . ") THEN $collision"; . implode(", ", $collisionClasses) . ") THEN $collision";
}
} else { } else {
user_error("Bad collision item '$collision'", E_USER_WARNING); user_error("Bad collision item '$collision'", E_USER_WARNING);
} }