fixup! fixup!

KnpLabs · Feb 14, 2020 · 5e04f87 · 5e04f87
1 parent 70aa35e
commit 5e04f87
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/tests/Knp/Snappy/AbstractGeneratorTest.php b/tests/Knp/Snappy/AbstractGeneratorTest.php
@@ -566,17 +566,19 @@ private function getPHPExecutableFromPath(): ?string
             return PHP_BINARY;
         }
 
-        if (false !== getenv('PATH')) {
-            $paths = explode(PATH_SEPARATOR, getenv('PATH'));
-            foreach ($paths as $path) {
-                // we need this for XAMPP (Windows)
-                if (strstr($path, 'php.exe') && isset($_SERVER['WINDIR']) && file_exists($path) && is_file($path)) {
-                    return $path;
-                } else {
-                    $php_executable = $path . DIRECTORY_SEPARATOR . 'php' . (isset($_SERVER['WINDIR']) ? '.exe' : '');
-                    if (file_exists($php_executable) && is_file($php_executable)) {
-                        return $php_executable;
-                    }
+        if (false === getenv('PATH')) {
+            return null;
+        }
+
+        $paths = explode(PATH_SEPARATOR, getenv('PATH'));
+        foreach ($paths as $path) {
+            // we need this for XAMPP (Windows)
+            if (strstr($path, 'php.exe') && isset($_SERVER['WINDIR']) && file_exists($path) && is_file($path)) {
+                return $path;
+            } else {
+                $php_executable = $path . DIRECTORY_SEPARATOR . 'php' . (isset($_SERVER['WINDIR']) ? '.exe' : '');
+                if (file_exists($php_executable) && is_file($php_executable)) {
+                    return $php_executable;
                 }
             }
         }