Use php instead of PHP_BINARY when automatic binary detection fails

Author: clue

src/Factory.php

@@ -375,7 +375,7 @@ private function openSocketIo($filename, $flags = null)
     private function which($bin)
     {
         foreach (\explode(\PATH_SEPARATOR, \getenv('PATH')) as $path) {
-            if (\is_executable($path . \DIRECTORY_SEPARATOR . $bin)) {
+            if (@\is_executable($path . \DIRECTORY_SEPARATOR . $bin)) {
                 return $path . \DIRECTORY_SEPARATOR . $bin;
             }
         }
@@ -396,20 +396,26 @@ private function resolve($filename)
 
     /**
      * @return string
+     * @codeCoverageIgnore Covered by `/tests/FunctionalExampleTest.php` instead.
      */
     private function php()
     {
-        // if this is the php-cgi binary, check if we can execute the php binary instead
-        $binary = \PHP_BINARY;
-        $candidate = \str_replace('-cgi', '', $binary);
-        if ($candidate !== $binary && \is_executable($candidate)) {
-            $binary = $candidate; // @codeCoverageIgnore
+        $binary = 'php';
+        if (\PHP_SAPI === 'cli' || \PHP_SAPI === 'cli-server') {
+            // use same PHP_BINARY in CLI mode, but do not use same binary for CGI/FPM
+            $binary = \PHP_BINARY;
+        } else {
+            // if this is the php-cgi binary, check if we can execute the php binary instead
+            $candidate = \str_replace('-cgi', '', \PHP_BINARY);
+            if ($candidate !== \PHP_BINARY && @\is_executable($candidate)) {
+                $binary = $candidate;
+            }
         }
 
         // if `php` is a symlink to the php binary, use the shorter `php` name
         // this is purely cosmetic feature for the process list
-        if (\realpath($this->which('php')) === $binary) {
-            $binary = 'php'; // @codeCoverageIgnore
+        if ($binary !== 'php' && \realpath($this->which('php')) === $binary) {
+            $binary = 'php';
         }
 
         return $binary;

tests/FunctionalExampleTest.php

@@ -22,10 +22,7 @@ public function testQueryExampleReturnsCalculatedValueFromPlaceholderVariables()
 
     public function testQueryExampleExecutedWithCgiReturnsDefaultValueAfterContentTypeHeader()
     {
-        $code = 1;
-        $null = DIRECTORY_SEPARATOR === '\\' ? 'NUL' : '/dev/null';
-        system("php-cgi --version >$null 2>$null", $code);
-        if ($code !== 0) {
+        if (!$this->canExecute('php-cgi --version')) {
             $this->markTestSkipped('Unable to execute "php-cgi"');
         }
 
@@ -34,6 +31,37 @@ public function testQueryExampleExecutedWithCgiReturnsDefaultValueAfterContentTy
         $this->assertStringEndsWith("\r\n\r\n" . 'value' . PHP_EOL . '42' . PHP_EOL, $output);
     }
 
+    public function testQueryExampleWithOpenBasedirRestrictedRunsDefaultPhpAndReturnsDefaultValue()
+    {
+        if (!$this->canExecute('php --version')) {
+            $this->markTestSkipped('Unable to execute "php"');
+        }
+
+        $output = $this->execExample(escapeshellarg(PHP_BINARY) . ' -dopen_basedir=' . escapeshellarg(dirname(__DIR__)) . ' query.php');
+
+        $this->assertEquals('value' . PHP_EOL . '42' . PHP_EOL, $output);
+    }
+
+    public function testQueryExampleExecutedWithCgiAndOpenBasedirRestrictedRunsDefaultPhpAndReturnsDefaultValueAfterContentTypeHeader()
+    {
+        if (!$this->canExecute('php-cgi --version') || !$this->canExecute('php --version')) {
+            $this->markTestSkipped('Unable to execute "php-cgi" or "php"');
+        }
+
+        $output = $this->execExample('php-cgi -dopen_basedir=' . escapeshellarg(dirname(__DIR__)) . ' query.php');
+
+        $this->assertStringEndsWith("\r\n\r\n" . 'value' . PHP_EOL . '42' . PHP_EOL, $output);
+    }
+
+    private function canExecute($command)
+    {
+        $code = 1;
+        $null = DIRECTORY_SEPARATOR === '\\' ? 'NUL' : '/dev/null';
+        system("$command >$null 2>$null", $code);
+
+        return $code === 0;
+    }
+
     private function execExample($command)
     {
         chdir(__DIR__ . '/../examples/');