From b3da76c30c3f33c21356ceeb631f8958b2b932cd Mon Sep 17 00:00:00 2001
From: Alexandre Daubois <alex.daubois@gmail.com>
Date: Mon, 29 Apr 2024 16:31:15 +0200
Subject: [PATCH 1/2] Remove calls to `TestCase::iniSet()` and calls to
 deprecated methods of `MockBuilder`

---
 Tests/ExecutableFinderTest.php | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/Tests/ExecutableFinderTest.php b/Tests/ExecutableFinderTest.php
index 5c63cf0f..6d089def 100644
--- a/Tests/ExecutableFinderTest.php
+++ b/Tests/ExecutableFinderTest.php
@@ -109,12 +109,16 @@ public function testFindWithOpenBaseDir()
             $this->markTestSkipped('Cannot test when open_basedir is set');
         }
 
-        $this->iniSet('open_basedir', \dirname(\PHP_BINARY).\PATH_SEPARATOR.'/');
+        $initialOpenBaseDir = ini_set('open_basedir', \dirname(\PHP_BINARY).\PATH_SEPARATOR.'/');
 
-        $finder = new ExecutableFinder();
-        $result = $finder->find($this->getPhpBinaryName());
+        try {
+            $finder = new ExecutableFinder();
+            $result = $finder->find($this->getPhpBinaryName());
 
-        $this->assertSamePath(\PHP_BINARY, $result);
+            $this->assertSamePath(\PHP_BINARY, $result);
+        } finally {
+            ini_set('open_basedir', $initialOpenBaseDir);
+        }
     }
 
     /**
@@ -130,12 +134,17 @@ public function testFindProcessInOpenBasedir()
         }
 
         $this->setPath('');
-        $this->iniSet('open_basedir', \PHP_BINARY.\PATH_SEPARATOR.'/');
 
-        $finder = new ExecutableFinder();
-        $result = $finder->find($this->getPhpBinaryName(), false);
+        $initialOpenBaseDir = ini_set('open_basedir', \PHP_BINARY.\PATH_SEPARATOR.'/');
 
-        $this->assertSamePath(\PHP_BINARY, $result);
+        try {
+            $finder = new ExecutableFinder();
+            $result = $finder->find($this->getPhpBinaryName(), false);
+
+            $this->assertSamePath(\PHP_BINARY, $result);
+        } finally {
+            ini_set('open_basedir', $initialOpenBaseDir);
+        }
     }
 
     public function testFindBatchExecutableOnWindows()

From 1393de6f0688c254d8e3bc4933670a6700c2c64b Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Tue, 7 May 2024 13:49:07 -0400
Subject: [PATCH 2/2] Return false in isTtySupported() when open_basedir
 restrictions prevent access to /dev/tty.

If open_basedir restrictions are in effect, checking if the file /dev/tty is writable will prevent setting tty mode on the process, and avoid failing to create a Process.
---
 Process.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Process.php b/Process.php
index c804a179..bf2e8e85 100644
--- a/Process.php
+++ b/Process.php
@@ -1211,7 +1211,7 @@ public static function isTtySupported(): bool
     {
         static $isTtySupported;
 
-        return $isTtySupported ??= ('/' === \DIRECTORY_SEPARATOR && stream_isatty(\STDOUT));
+        return $isTtySupported ??= ('/' === \DIRECTORY_SEPARATOR && stream_isatty(\STDOUT) && @is_writable('/dev/tty'));
     }
 
     /**