- Merge [5437].

sebastianbergmann · Dec 14, 2009 · 14b91ab · 14b91ab
1 parent c166e30
commit 14b91ab
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/PHPUnit/Util/Fileloader.php b/PHPUnit/Util/Fileloader.php
@@ -100,15 +100,19 @@ public static function checkAndLoad($filename, $syntaxCheck = FALSE)
      */
     public static function load($filename)
     {
-        $filename = PHPUnit_Util_Filesystem::fileExistsInIncludePath($filename);
+        $_filename = PHPUnit_Util_Filesystem::fileExistsInIncludePath(
+          $filename
+        );
 
-        if (!$filename) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(
-              1, 'existing file', $filename
+        if (!$_filename) {
+            throw new RuntimeException(
+              sprintf('Cannot open file "%s".' . "\n", $filename)
             );
         }
 
+        $filename         = $_filename;
         $oldVariableNames = array_keys(get_defined_vars());
+        unset($_filename);
 
         include_once $filename;