Merge pull request #22 from MitchProbst/master

Preserve globals for bootstrap files

src/Runner/Runner.php

@@ -169,11 +169,6 @@ public function afterEach(\Closure $closure)
      */
     public function run()
     {
-        if (self::$console->options['bootstrap'] &&
-            !$this->loadBootstrap(self::$console->options['bootstrap'])) {
-            return;
-        }
-
         // Get and instantiate the reporter class, load files
         $reporterClass = self::$console->getReporterClass();
         $this->reporter = new $reporterClass(self::$console);
@@ -340,25 +335,4 @@ private function runRunnable($runnable)
             $runnable->run();
         }
     }
-
-    /**
-     * Loads a bootstrap file given its string path.
-     *
-     * @param  string $bootstrap Path to the bootstrap file to load
-     * @return bool   Whether or not the file was successfully loaded
-     */
-    private function loadBootstrap($bootstrap)
-    {
-        if (!file_exists($bootstrap)) {
-            self::$console->writeLn("Bootstrap file not found: $bootstrap");
-        } else if(!is_readable($bootstrap)) {
-            self::$console->writeLn("Bootstrap file not readable: $bootstrap");
-        } else if(!@include_once($bootstrap)) {
-            self::$console->writeLn("Unable to include bootstrap: $bootstrap");
-        } else {
-            return true;
-        }
-
-        return false;
-    }
 }

src/pho.php

@@ -187,6 +187,22 @@ function expandPaths($paths)
     require_once($path);
 }
 
+// Bootstrap file must be required directly rather than from function
+// invocation to preserve any loaded globals
+$bootstrap = $console->options['bootstrap'];
+if ($bootstrap) {
+    if (!file_exists($bootstrap)) {
+        $console->writeLn("Bootstrap file not found: $bootstrap");
+        exit(1);
+    } else if(!is_readable($bootstrap)) {
+        $console->writeLn("Bootstrap file not readable: $bootstrap");
+        exit(1);
+    } else if(!@include_once($bootstrap)) {
+        $console->writeLn("Unable to include bootstrap: $bootstrap");
+        exit(1);
+    }
+}
+
 // Files must be required directly rather than from function
 // invocation to preserve any loaded globals
 $paths = expandPaths($console->getPaths());