Remove extensionsToRemove and extensionsToReapply, now obsolete

This commit is contained in:
Robbie Averill 2018-10-10 22:19:15 +02:00
parent 56d5621934
commit 3642e7aeae

View File

@ -13,16 +13,6 @@ use SilverStripe\ORM\DataObject;
*/ */
class ExtensionTestState implements TestState class ExtensionTestState implements TestState
{ {
/**
* @var array
*/
protected $extensionsToReapply = [];
/**
* @var array
*/
protected $extensionsToRemove = [];
/** /**
* Called on setup * Called on setup
* *
@ -41,8 +31,6 @@ class ExtensionTestState implements TestState
{ {
// May be altered by another class // May be altered by another class
$isAltered = false; $isAltered = false;
$this->extensionsToReapply = [];
$this->extensionsToRemove = [];
/** @var string|SapphireTest $class */ /** @var string|SapphireTest $class */
/** @var string|DataObject $dataClass */ /** @var string|DataObject $dataClass */
@ -58,10 +46,6 @@ class ExtensionTestState implements TestState
if (!class_exists($extension) || !$dataClass::has_extension($extension)) { if (!class_exists($extension) || !$dataClass::has_extension($extension)) {
continue; continue;
} }
if (!isset($this->extensionsToReapply[$dataClass])) {
$this->extensionsToReapply[$dataClass] = [];
}
$this->extensionsToReapply[$dataClass][] = $extension;
$dataClass::remove_extension($extension); $dataClass::remove_extension($extension);
$isAltered = true; $isAltered = true;
} }
@ -78,10 +62,6 @@ class ExtensionTestState implements TestState
throw new LogicException("Test {$class} requires extension {$extension} which doesn't exist"); throw new LogicException("Test {$class} requires extension {$extension} which doesn't exist");
} }
if (!$dataClass::has_extension($extension)) { if (!$dataClass::has_extension($extension)) {
if (!isset($this->extensionsToRemove[$dataClass])) {
$this->extensionsToRemove[$dataClass] = [];
}
$this->extensionsToRemove[$dataClass][] = $extension;
$dataClass::add_extension($extension); $dataClass::add_extension($extension);
$isAltered = true; $isAltered = true;
} }