Skip to content

Commit 64b6202

Browse files
committed
Merge branch '5.4' into 6.4
* 5.4: [PropertyInfo] Update DoctrineExtractor for new DBAL 4 BIGINT type Update security.nl.xlf [Validator] IBAN Check digits should always between 2 and 98 [Security] Populate translations for trans-unit 20 add missing plural translation messages filter out empty HTTP header parts [String] Fix folded in compat mode Remove calls to `getMockForAbstractClass()` [ErrorHandler] Do not call xdebug_get_function_stack() with xdebug >= 3.0 when not in develop mode [Serializer] Fix type for missing property add test for JSON response with null as content [Filesystem] Fix dumpFile `stat failed` error hitting custom handler Remove calls to `TestCase::iniSet()` and calls to deprecated methods of `MockBuilder` [PhpUnitBridge] Fix `DeprecationErrorHandler` with PhpUnit 10
2 parents 1393de6 + b3da76c commit 64b6202

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

Tests/ExecutableFinderTest.php

+8-4
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,16 @@ public function testFindWithOpenBaseDir()
9999
}
100100

101101
putenv('PATH='.\dirname(\PHP_BINARY));
102-
$this->iniSet('open_basedir', \dirname(\PHP_BINARY).\PATH_SEPARATOR.'/');
102+
$initialOpenBaseDir = ini_set('open_basedir', \dirname(\PHP_BINARY).\PATH_SEPARATOR.'/');
103103

104-
$finder = new ExecutableFinder();
105-
$result = $finder->find($this->getPhpBinaryName());
104+
try {
105+
$finder = new ExecutableFinder();
106+
$result = $finder->find($this->getPhpBinaryName());
106107

107-
$this->assertSamePath(\PHP_BINARY, $result);
108+
$this->assertSamePath(\PHP_BINARY, $result);
109+
} finally {
110+
ini_set('open_basedir', $initialOpenBaseDir);
111+
}
108112
}
109113

110114
public function testFindBatchExecutableOnWindows()

0 commit comments

Comments
 (0)