Merge remote-tracking branch 'origin/master'

Author: sebastianfeldmann

src/Util/Cli.php

@@ -84,7 +84,7 @@ public static function detectCmdLocation($cmd, $path = null, $optionalLocations
         }
 
         // checking environment variable.
-        $pathList = explode(PATH_SEPARATOR, $_SERVER['PATH']);
+        $pathList = explode(PATH_SEPARATOR, self::getEnvPath());
         foreach ($pathList as $path) {
             $command = $path . DIRECTORY_SEPARATOR . $cmd;
             $bin     = self::isExecutable($command);
@@ -104,6 +104,23 @@ public static function detectCmdLocation($cmd, $path = null, $optionalLocations
         throw new RuntimeException(sprintf('\'%s\' was nowhere to be found please specify the correct path', $cmd));
     }
 
+    /**
+     * Return local $PATH variable.
+     *
+     * @return string
+     * @throws \RuntimeException
+     */
+    public static function getEnvPath()
+    {
+        // check for unix and windows case $_SERVER index
+        foreach (array('PATH', 'Path', 'path') as $index) {
+            if (isset($_SERVER[$index])) {
+                return $_SERVER[$index];
+            }
+        }
+        throw new RuntimeException('cant find local PATH variable');
+    }
+
     /**
      * Returns the executable command if the command is executable, null otherwise.
      * Search for $command.exe on Windows systems.