fix: Env PATH fetch and find exec file not works in windows

php-toolkit · Jul 9, 2022 · 82be07f · 82be07f
1 parent b347e8c
commit 82be07f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/Sys.php b/src/Sys.php
@@ -248,13 +248,19 @@ public static function getCpuNum(): int
      */
     public static function findExecutable(string $name, array $paths = []): string
     {
+        $isWin = self::isWindows();
         $paths = $paths ?: self::getEnvPaths();
 
         foreach ($paths as $path) {
             $filename = $path . DIRECTORY_SEPARATOR . $name;
             if (is_file($filename)) {
                 return $filename;
             }
+
+            // maybe is exe file
+            if ($isWin && is_file($filename . '.exe')) {
+                return $filename . '.exe';
+            }
         }
         return "";
     }

diff --git a/src/SysEnv.php b/src/SysEnv.php
@@ -80,7 +80,7 @@ public static function setEnv(string $key, int|string $value): bool
      */
     public static function getEnvPaths(): array
     {
-        $pathStr = $_SERVER['PATH'] ?? '';
+        $pathStr = $_SERVER['PATH'] ?? ($_SERVER['Path'] ?? '');
         if (!$pathStr) {
             return [];
         }