Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Add {TMP} placeholder for PHPT INI sections

diff --cc run-tests.php
index 58d10967a19ce468973b890e14ba1ea2541fdfbf,6491507fc37cabfdfc5d52418d7a13930f9946c5..b48fa084cde4372fadeabcc79b7ebb7ea479b9b6
mode 100755,100644..100755
--- 1/run-tests.php
--- 2/run-tests.php
+++ b/run-tests.php
@@@ -2095,10 -1593,9 +2095,9 @@@ TEST $fil
        // 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);
 +              settings2array(preg_split("/[\n\r]+/", $section_text['INI']), $ini_settings);
        }
  
        settings2params($ini_settings);