mirror of
https://github.com/php/php-src.git
synced 2026-04-28 10:43:30 +02:00
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Add {TMP} placeholder for PHPT INI sections
This commit is contained in:
+2
-3
@@ -2095,9 +2095,8 @@ TEST $file
|
||||
// Any special ini settings
|
||||
// these may overwrite the test defaults...
|
||||
if (array_key_exists('INI', $section_text)) {
|
||||
if (strpos($section_text['INI'], '{PWD}') !== false) {
|
||||
$section_text['INI'] = str_replace('{PWD}', dirname($file), $section_text['INI']);
|
||||
}
|
||||
$section_text['INI'] = str_replace('{PWD}', dirname($file), $section_text['INI']);
|
||||
$section_text['INI'] = str_replace('{TMP}', sys_get_temp_dir(), $section_text['INI']);
|
||||
settings2array(preg_split("/[\n\r]+/", $section_text['INI']), $ini_settings);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user