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 #3484 from dnadesign/object_has_extension_fix

Browse Source 
fixed and tested object has_extension
This commit is contained in:
Damian Mooyman 2014-10-24 17:20:00 +13:00
commit 0a04e2e77b
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/Object.php
View File

@ -475,9 +475,10 @@ abstract class Object {
* and new format ($object->has_extension($class, $requiredExtension))
* @param string $classOrExtension if 1 argument supplied, the class name of the extension to
* check for; if 2 supplied, the class name to test
* @param string $requiredExtension used only if 2 arguments supplied
* @param string $requiredExtension used only if 2 arguments supplied
* @param boolean $strict if the extension has to match the required extension and not be a subclass
*/
public static function has_extension($classOrExtension, $requiredExtension = null) {
public static function has_extension($classOrExtension, $requiredExtension = null, $strict = false) {
//BC support
if(func_num_args() > 1){
$class = $classOrExtension;
@ -495,6 +496,7 @@ abstract class Object {
$left = strtolower(Extension::get_classname_without_arguments($extension));
$right = strtolower(Extension::get_classname_without_arguments($requiredExtension));
if($left == $right) return true;
if (!$strict && is_subclass_of($left, $right)) return true;
}
return false;

27
tests/core/ObjectTest.php
View File

@ -233,6 +233,25 @@ class ObjectTest extends SapphireTest {
ObjectTest_ExtensionTest::has_extension('ObjectTest_ExtendTest3'),
"Extensions are detected with static has_extension() when added through add_extension()"
);
// ObjectTest_ExtendTest4 is added manually
ObjectTest_ExtensionTest3::add_extension('ObjectTest_ExtendTest4("Param")');
// test against ObjectTest_ExtendTest3, not ObjectTest_ExtendTest3
$this->assertTrue(
ObjectTest_ExtensionTest3::has_extension('ObjectTest_ExtendTest4'),
"Extensions are detected with static has_extension() when added through add_extension()"
);
// test against ObjectTest_ExtendTest3, not ObjectTest_ExtendTest4 to test if it picks up
// the sub classes of ObjectTest_ExtendTest3
$this->assertTrue(
ObjectTest_ExtensionTest3::has_extension('ObjectTest_ExtendTest3'),
"Sub-Extensions are detected with static has_extension() when added through add_extension()"
);
// strictly test against ObjectTest_ExtendTest3, not ObjectTest_ExtendTest4 to test if it picks up
// the sub classes of ObjectTest_ExtendTest3
$this->assertFalse(
ObjectTest_ExtensionTest3::has_extension('ObjectTest_ExtendTest3', null, true),
"Sub-Extensions are detected with static has_extension() when added through add_extension()"
);
// a singleton() wouldn't work as its already initialized
$objectTest_ExtensionTest = new ObjectTest_ExtensionTest();
$this->assertTrue(
@ -518,6 +537,10 @@ class ObjectTest_ExtensionTest2 extends Object {
private static $extensions = array('ObjectTest_Extension');
}
class ObjectTest_ExtensionTest3 extends Object {
}
class ObjectTest_ExtensionRemoveTest extends Object {
private static $extensions = array (
@ -563,4 +586,8 @@ class ObjectTest_ExtendTest3 extends Extension {
public function extendableMethod($argument = null) { return "ExtendTest3($argument)"; }
}
class ObjectTest_ExtendTest4 extends ObjectTest_ExtendTest3 {
public function extendableMethod($argument = null) { return "ExtendTest4($argument)"; }
}
/**#@-*/