From c95c6c466f70e48f9c53e37ce4c7ef6ff9f4b502 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Thu, 27 Apr 2017 17:59:52 +1200 Subject: [PATCH] FIX Regression from 3.x: allow $required_extensions to have arguments --- src/Dev/SapphireTest.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Dev/SapphireTest.php b/src/Dev/SapphireTest.php index 66a24fc78..0d5387a05 100644 --- a/src/Dev/SapphireTest.php +++ b/src/Dev/SapphireTest.php @@ -16,6 +16,7 @@ use SilverStripe\Core\Config\ConfigLoader; use SilverStripe\Core\Config\CoreConfigFactory; use SilverStripe\Core\Config\DefaultConfig; use SilverStripe\Core\Config\Middleware\ExtensionMiddleware; +use SilverStripe\Core\Extension; use SilverStripe\Core\Flushable; use SilverStripe\Core\Injector\Injector; use SilverStripe\Core\Manifest\ClassManifest; @@ -376,7 +377,8 @@ class SapphireTest extends PHPUnit_Framework_TestCase } self::$extensions_to_remove[$class] = array(); foreach ($extensions as $extension) { - if (!class_exists($extension)) { + $extensionClass = Extension::get_classname_without_arguments($extension); + if (!class_exists($extensionClass)) { $self = static::class; throw new LogicException("Test {$self} requires extension {$extension} which doesn't exist"); }