Merge branch '4.3' into 4

This commit is contained in:
Aaron Carlino 2019-03-27 13:25:57 +13:00
commit fc6213c293
5 changed files with 28 additions and 5 deletions

View File

@ -388,6 +388,10 @@ trait Extensible
if (!$strict && is_subclass_of($extension, $requiredExtension)) { if (!$strict && is_subclass_of($extension, $requiredExtension)) {
return true; return true;
} }
$inst = Injector::inst()->get($extension);
if ($inst instanceof $requiredExtension) {
return $strict ? strcasecmp(get_class($inst), $requiredExtension) === 0 : true;
}
} }
return false; return false;

View File

@ -11,6 +11,7 @@ use SilverStripe\Core\Tests\ObjectTest\ExtendTest1;
use SilverStripe\Core\Tests\ObjectTest\ExtendTest2; use SilverStripe\Core\Tests\ObjectTest\ExtendTest2;
use SilverStripe\Core\Tests\ObjectTest\ExtendTest3; use SilverStripe\Core\Tests\ObjectTest\ExtendTest3;
use SilverStripe\Core\Tests\ObjectTest\ExtendTest4; use SilverStripe\Core\Tests\ObjectTest\ExtendTest4;
use SilverStripe\Core\Tests\ObjectTest\ExtendTest5;
use SilverStripe\Core\Tests\ObjectTest\ExtensionRemoveTest; use SilverStripe\Core\Tests\ObjectTest\ExtensionRemoveTest;
use SilverStripe\Core\Tests\ObjectTest\ExtensionTest; use SilverStripe\Core\Tests\ObjectTest\ExtensionTest;
use SilverStripe\Core\Tests\ObjectTest\ExtensionTest2; use SilverStripe\Core\Tests\ObjectTest\ExtensionTest2;
@ -290,6 +291,13 @@ class ObjectTest extends SapphireTest
"Extensions are detected with instance hasExtension() when added through add_extension()" "Extensions are detected with instance hasExtension() when added through add_extension()"
); );
// load in a custom implementation
Injector::inst()->registerService(new ExtendTest5(), ExtendTest4::class);
$this->assertTrue(
ExtensionTest3::has_extension(ExtendTest5::class),
"Injected sub-extensions are detected with static has_extension() when added through add_extension()"
);
// @todo At the moment, this does NOT remove the extension due to parameterized naming, // @todo At the moment, this does NOT remove the extension due to parameterized naming,
// meaning the extension will remain added in further test cases // meaning the extension will remain added in further test cases
ExtensionTest::remove_extension(ExtendTest3::class); ExtensionTest::remove_extension(ExtendTest3::class);

View File

@ -0,0 +1,11 @@
<?php
namespace SilverStripe\Core\Tests\ObjectTest;
class ExtendTest5 extends ExtendTest4
{
public function extendableMethod($argument = null)
{
return "ExtendTest5($argument)";
}
}