tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-29 12:49:06 +02:00
Code Issues Projects Releases Wiki Activity

FIX: Fix test breakage in most recent change.

Browse Source
This commit is contained in:
Sam Minnee 2017-03-30 11:55:43 +13:00
parent ac075eaf0b
commit 9cdcb339e9
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Dev/SapphireTest.php
View File

@ -358,10 +358,10 @@ class SapphireTest extends PHPUnit_Framework_TestCase
foreach ($extensions as $extension) { foreach ($extensions as $extension) {
if (!class_exists($extension) ||$class::has_extension($extension)) { if (!class_exists($extension) ||$class::has_extension($extension)) {
continue; continue;
}if (!isset(static::$extensions_to_reapply[$class])) { }if (!isset(self::$extensions_to_reapply[$class])) {
static::$extensions_to_reapply[$class] = array(); self::$extensions_to_reapply[$class] = array();
} }
static::$extensions_to_reapply[$class][] = $extension; self::$extensions_to_reapply[$class][] = $extension;
$class::remove_extension($extension); $class::remove_extension($extension);
$isAltered = true; $isAltered = true;
@ -374,17 +374,17 @@ class SapphireTest extends PHPUnit_Framework_TestCase
$self = static::class; $self = static::class;
throw new LogicException("Test {$self} requires class {$class} which doesn't exist"); throw new LogicException("Test {$self} requires class {$class} which doesn't exist");
} }
static::$extensions_to_remove[$class] = array(); self::$extensions_to_remove[$class] = array();
foreach ($extensions as $extension) { foreach ($extensions as $extension) {
if (!class_exists($extension)) { if (!class_exists($extension)) {
$self = static::class; $self = static::class;
throw new LogicException("Test {$self} requires extension {$extension} which doesn't exist"); throw new LogicException("Test {$self} requires extension {$extension} which doesn't exist");
} }
if (!$class::has_extension($extension)) { if (!$class::has_extension($extension)) {
if (!isset(static::$extensions_to_remove[$class])) { if (!isset(self::$extensions_to_remove[$class])) {
static::$extensions_to_reapply[$class] = array(); self::$extensions_to_reapply[$class] = array();
} }
static::$extensions_to_remove[$class][] = $extension; self::$extensions_to_remove[$class][] = $extension;
$class::add_extension($extension); $class::add_extension($extension);
$isAltered = true; $isAltered = true;
} }
@ -392,7 +392,7 @@ class SapphireTest extends PHPUnit_Framework_TestCase
} }
// If we have made changes to the extensions present, then migrate the database schema. // If we have made changes to the extensions present, then migrate the database schema.
if ($isAltered || static::$extensions_to_reapply || static::$extensions_to_remove || static::getExtraDataObjects()) { if ($isAltered || self::$extensions_to_reapply || self::$extensions_to_remove || static::getExtraDataObjects()) {
DataObject::reset(); DataObject::reset();
if (!self::using_temp_db()) { if (!self::using_temp_db()) {
self::create_temp_db(); self::create_temp_db();
@ -422,20 +422,20 @@ class SapphireTest extends PHPUnit_Framework_TestCase
public static function tearDownAfterClass() public static function tearDownAfterClass()
{ {
// If we have made changes to the extensions present, then migrate the database schema. // If we have made changes to the extensions present, then migrate the database schema.
if (static::$extensions_to_reapply || static::$extensions_to_remove) { if (self::$extensions_to_reapply || self::$extensions_to_remove) {
// @todo: This isn't strictly necessary to restore extensions, but only to ensure that // @todo: This isn't strictly necessary to restore extensions, but only to ensure that
// Object::$extra_methods is properly flushed. This should be replaced with a simple // Object::$extra_methods is properly flushed. This should be replaced with a simple
// flush mechanism for each $class. // flush mechanism for each $class.
// //
// Remove extensions added for testing // Remove extensions added for testing
foreach (static::$extensions_to_remove as $class => $extensions) { foreach (self::$extensions_to_remove as $class => $extensions) {
foreach ($extensions as $extension) { foreach ($extensions as $extension) {
$class::remove_extension($extension); $class::remove_extension($extension);
} }
} }
// Reapply ones removed // Reapply ones removed
foreach (static::$extensions_to_reapply as $class => $extensions) { foreach (self::$extensions_to_reapply as $class => $extensions) {
foreach ($extensions as $extension) { foreach ($extensions as $extension) {
$class::add_extension($extension); $class::add_extension($extension);
} }
@ -448,7 +448,7 @@ class SapphireTest extends PHPUnit_Framework_TestCase
Config::unnest(); Config::unnest();
$extraDataObjects = static::getExtraDataObjects(); $extraDataObjects = static::getExtraDataObjects();
if (!empty(static::$extensions_to_reapply) || !empty(static::$extensions_to_remove) || !empty($extraDataObjects)) { if (!empty(self::$extensions_to_reapply) || !empty(self::$extensions_to_remove) || !empty($extraDataObjects)) {
static::resetDBSchema(); static::resetDBSchema();
} }
} }