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

Merge pull request #8840 from open-sausages/pulls/4.3/has-extension-injectable

Browse Source 
ENHANCEMENT: has_extension() should allow injector overrides
This commit is contained in:
Guy Marriott 2019-03-27 13:23:30 +13:00 committed by GitHub
commit 0f00154563
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Core/Extensible.php
View File

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

2
src/Forms/GridField/GridFieldLevelup.php
View File

@ -88,7 +88,7 @@ class GridFieldLevelup implements GridField_HTMLProvider
$template = SSViewer::get_templates_by_class($this, '', __CLASS__);
return array(
'before' => $forTemplate->renderWith($template),
);
);
}
public function setAttributes($attrs)

8
src/includes/constants.php
View File

@ -139,11 +139,11 @@ if (!defined('BASE_URL')) {
) {
$requestURI = $_SERVER['REQUEST_URI'];
// Check if /base/public or /base are in the request
foreach ([$baseURL, dirname($baseURL)] as $candidate) {
if (stripos($requestURI, $candidate) === 0) {
return $candidate;
}
foreach ([$baseURL, dirname($baseURL)] as $candidate) {
if (stripos($requestURI, $candidate) === 0) {
return $candidate;
}
}
// Ambiguous
return '';
}

6
tests/behat/src/CmsUiContext.php
View File

@ -58,9 +58,9 @@ class CmsUiContext implements Context
$timeoutMs = $this->getMainContext()->getAjaxTimeout();
$this->getSession()->wait(
$timeoutMs,
"(".
"document.getElementsByClassName('cms-content-loading-overlay').length +".
"document.getElementsByClassName('cms-loading-container').length".
"(" .
"document.getElementsByClassName('cms-content-loading-overlay').length +" .
"document.getElementsByClassName('cms-loading-container').length" .
") == 0"
);
}

8
tests/php/Core/ObjectTest.php
View File

@ -11,6 +11,7 @@ use SilverStripe\Core\Tests\ObjectTest\ExtendTest1;
use SilverStripe\Core\Tests\ObjectTest\ExtendTest2;
use SilverStripe\Core\Tests\ObjectTest\ExtendTest3;
use SilverStripe\Core\Tests\ObjectTest\ExtendTest4;
use SilverStripe\Core\Tests\ObjectTest\ExtendTest5;
use SilverStripe\Core\Tests\ObjectTest\ExtensionRemoveTest;
use SilverStripe\Core\Tests\ObjectTest\ExtensionTest;
use SilverStripe\Core\Tests\ObjectTest\ExtensionTest2;
@ -289,6 +290,13 @@ class ObjectTest extends SapphireTest
$objectTest_ExtensionTest->hasExtension(ExtendTest3::class),
"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,
// meaning the extension will remain added in further test cases

11
tests/php/Core/ObjectTest/ExtendTest5.php Normal file
View File

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