Skip to content

Commit 71da2b7

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: [Profiler] relax return type for memory data collector Fix param annotation in HttpKernelBrowser [Cache] fix compat with apcu < 5.1.10 Expand FormView key to include int [PropertyInfo] PhpStan extractor nested object fix [Console] Fix autocompletion of argument with default value Run `open_basedir` tests in separate processes
2 parents 00b8863 + 2b3ba87 commit 71da2b7

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

Tests/ExecutableFinderTest.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,9 @@ public function testFindWithExtraDirs()
9696
$this->assertSamePath(\PHP_BINARY, $result);
9797
}
9898

99+
/**
100+
* @runInSeparateProcess
101+
*/
99102
public function testFindWithOpenBaseDir()
100103
{
101104
if ('\\' === \DIRECTORY_SEPARATOR) {
@@ -114,6 +117,9 @@ public function testFindWithOpenBaseDir()
114117
$this->assertSamePath(\PHP_BINARY, $result);
115118
}
116119

120+
/**
121+
* @runInSeparateProcess
122+
*/
117123
public function testFindProcessInOpenBasedir()
118124
{
119125
if (ini_get('open_basedir')) {

0 commit comments

Comments
 (0)