Merge branch '4.4' into 5.3

derrabus · derrabus · commit bcd167b6b5b6 · 2021-12-27T22:00:39.000+01:00
* 4.4:
  [Cache] fix compat with apcu &lt; 5.1.10
  Run `open_basedir` tests in separate processes
diff --git a/Tests/ExecutableFinderTest.php b/Tests/ExecutableFinderTest.php
@@ -96,6 +96,9 @@ public function testFindWithExtraDirs()
         $this->assertSamePath(\PHP_BINARY, $result);
     }
 
+    /**
+     * @runInSeparateProcess
+     */
     public function testFindWithOpenBaseDir()
     {
         if ('\\' === \DIRECTORY_SEPARATOR) {
@@ -114,6 +117,9 @@ public function testFindWithOpenBaseDir()
         $this->assertSamePath(\PHP_BINARY, $result);
     }
 
+    /**
+     * @runInSeparateProcess
+     */
     public function testFindProcessInOpenBasedir()
     {
         if (ini_get('open_basedir')) {

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,9 @@ public function testFindWithExtraDirs()`
`96`	`96`	`$this->assertSamePath(\PHP_BINARY, $result);`
`97`	`97`	`}`
`98`	`98`
	`99`	`+ /**`
	`100`	`+ * @runInSeparateProcess`
	`101`	`+ */`
`99`	`102`	`public function testFindWithOpenBaseDir()`
`100`	`103`	`{`
`101`	`104`	`if ('\\' === \DIRECTORY_SEPARATOR) {`
`@@ -114,6 +117,9 @@ public function testFindWithOpenBaseDir()`
`114`	`117`	`$this->assertSamePath(\PHP_BINARY, $result);`
`115`	`118`	`}`
`116`	`119`
	`120`	`+ /**`
	`121`	`+ * @runInSeparateProcess`
	`122`	`+ */`
`117`	`123`	`public function testFindProcessInOpenBasedir()`
`118`	`124`	`{`
`119`	`125`	`if (ini_get('open_basedir')) {`