From 87c03b4750dad996c1507430d8fdccf11559a2ed Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Fri, 5 Mar 2010 08:34:31 +0000 Subject: [PATCH] BUGFIX If fixture file is NULL don't cause the test framework to break down because of it git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100548 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- dev/SapphireTest.php | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/dev/SapphireTest.php b/dev/SapphireTest.php index ad6a992cd..cd49e703e 100755 --- a/dev/SapphireTest.php +++ b/dev/SapphireTest.php @@ -121,17 +121,19 @@ class SapphireTest extends PHPUnit_Framework_TestCase { self::empty_temp_db(); - $fixtureFiles = (is_array($fixtureFile)) ? $fixtureFile : array($fixtureFile); - - $i = 0; - foreach($fixtureFiles as $fixtureFilePath) { - $fixture = new YamlFixture($fixtureFilePath); - $fixture->saveIntoDatabase(); - $this->fixtures[] = $fixture; - - // backwards compatibility: Load first fixture into $this->fixture - if($i == 0) $this->fixture = $fixture; - $i++; + if($fixtureFile) { + $fixtureFiles = (is_array($fixtureFile)) ? $fixtureFile : array($fixtureFile); + + $i = 0; + foreach($fixtureFiles as $fixtureFilePath) { + $fixture = new YamlFixture($fixtureFilePath); + $fixture->saveIntoDatabase(); + $this->fixtures[] = $fixture; + + // backwards compatibility: Load first fixture into $this->fixture + if($i == 0) $this->fixture = $fixture; + $i++; + } } $this->logInWithPermission("ADMIN");