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

Merge pull request #6760 from mikenz/patch-10

Browse Source 
FIX illegal_extensions in unit tests not being honored
This commit is contained in:
Daniel Hensby 2017-03-30 15:10:30 +01:00 committed by GitHub
commit 2b67481225
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Dev/SapphireTest.php
View File

@ -356,15 +356,15 @@ class SapphireTest extends PHPUnit_Framework_TestCase
continue; continue;
} }
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(self::$extensions_to_reapply[$class])) { }
self::$extensions_to_reapply[$class] = array(); if (!isset(self::$extensions_to_reapply[$class])) {
} self::$extensions_to_reapply[$class] = array();
self::$extensions_to_reapply[$class][] = $extension; }
$class::remove_extension($extension); self::$extensions_to_reapply[$class][] = $extension;
$isAltered = true; $class::remove_extension($extension);
$isAltered = true;
} }
} }