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

Update ClassInfo to return arrays where expected (#5563)

Browse Source 
These methods are expected to return an array instead of null (if $class doesnt exist);
- getValidSubClasses
- dataClassesFor
- subclassesFor
- ancestry

Fixes: #5562
Also see: https://github.com/silverstripe/silverstripe-framework/issues/5171
This commit is contained in:
Michael van Schaik 2016-05-19 13:28:35 +02:00 committed by Daniel Hensby
parent 574bc6038b
commit 3a277f3a5e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/ClassInfo.php
View File

@ -64,7 +64,7 @@ class ClassInfo {
* @return array List of subclasses
*/
public static function getValidSubClasses($class = 'SiteTree', $includeUnbacked = false) {
if(is_string($class) && !class_exists($class)) return null;
if(is_string($class) && !class_exists($class)) return array();
$class = self::class_name($class);
$classes = DB::get_schema()->enumValuesForField($class, 'ClassName');
@ -81,7 +81,7 @@ class ClassInfo {
* @return array
*/
public static function dataClassesFor($class) {
if(is_string($class) && !class_exists($class)) return null;
if(is_string($class) && !class_exists($class)) return array();
$result = array();
@ -143,7 +143,7 @@ class ClassInfo {
* @return array Names of all subclasses as an associative array.
*/
public static function subclassesFor($class) {
if(is_string($class) && !class_exists($class)) return null;
if(is_string($class) && !class_exists($class)) return array();
//normalise class case
$className = self::class_name($class);
@ -191,7 +191,7 @@ class ClassInfo {
* @return array
*/
public static function ancestry($class, $tablesOnly = false) {
if(is_string($class) && !class_exists($class)) return null;
if(is_string($class) && !class_exists($class)) return array();
$class = self::class_name($class);