Merge pull request laravel#32 from WouterJ/patch-1

Support built-in PHP server
Hydrane · Apr 16, 2015 · a405306 · a405306
2 parents 729490d + e5e4ac6
commit a405306
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/Application.php b/src/Application.php
@@ -1340,7 +1340,7 @@ public function basePath($path = null)
             return $this->basePath.($path ? '/'.$path : $path);
         }
 
-        if ($this->runningInConsole()) {
+        if ($this->runningInConsole() || php_sapi_name() === 'cli-server') {
             $this->basePath = getcwd();
         } else {
             $this->basePath = realpath(getcwd().'/../');