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

Merge pull request #4482 from kinglozzer/classinfo-nonexistant-class

Browse Source 
Ensure ClassInfo is backwards compatible with non-existant classes
This commit is contained in:
Sam Minnée 2015-08-10 15:45:32 +12:00
commit 5c3bf3d0a2
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/ClassInfo.php
View File

@ -159,6 +159,13 @@ class ClassInfo {
public static function class_name($nameOrObject) { public static function class_name($nameOrObject) {
if (is_object($nameOrObject)) { if (is_object($nameOrObject)) {
return get_class($nameOrObject); return get_class($nameOrObject);
} elseif (!self::exists($nameOrObject)) {
Deprecation::notice(
'4.0',
"ClassInfo::class_name() passed a class that doesn't exist. Support for this will be removed in 4.0",
Deprecation::SCOPE_GLOBAL
);
return $nameOrObject;
} }
$reflection = new ReflectionClass($nameOrObject); $reflection = new ReflectionClass($nameOrObject);
return $reflection->getName(); return $reflection->getName();

9
tests/core/ClassInfoTest.php
View File

@ -42,6 +42,15 @@ class ClassInfoTest extends SapphireTest {
); );
} }
public function testClassName() {
$this->assertEquals('ClassInfoTest', ClassInfo::class_name($this));
$this->assertEquals('ClassInfoTest', ClassInfo::class_name('ClassInfoTest'));
$this->assertEquals('ClassInfoTest', ClassInfo::class_name('CLaSsInfOTEsT'));
// This is for backwards compatiblity and will be removed in 4.0
$this->assertEquals('IAmAClassThatDoesNotExist', ClassInfo::class_name('IAmAClassThatDoesNotExist'));
}
public function testClassesForFolder() { public function testClassesForFolder() {
//$baseFolder = Director::baseFolder() . '/' . FRAMEWORK_DIR . '/tests/_ClassInfoTest'; //$baseFolder = Director::baseFolder() . '/' . FRAMEWORK_DIR . '/tests/_ClassInfoTest';
//$manifestInfo = ManifestBuilder::get_manifest_info($baseFolder); //$manifestInfo = ManifestBuilder::get_manifest_info($baseFolder);