Don't overwrite INI section

Author: nikic

run-tests.php

@@ -1292,7 +1292,7 @@ function run_all_tests($test_files, $env, $redir_tested = null)
         /* Automatically skip opcache tests in --file-cache mode,
          * because opcache generally doesn't expect those to run under file cache */
         $test_files = array_filter($test_files, function($path) {
-            return false !== strpos('ext/opcache', $path);
+            return false === strpos($path, 'ext/opcache');
         });
     }
 
@@ -2128,16 +2128,6 @@ function run_test($php, $file, $env)
 
     $orig_ini_settings = settings2params($ini_settings);
 
-    // Any special ini settings
-    // these may overwrite the test defaults...
-    if (array_key_exists('INI', $section_text)) {
-        $section_text['INI'] = str_replace('{PWD}', dirname($file), $section_text['INI']);
-        $section_text['INI'] = str_replace('{TMP}', sys_get_temp_dir(), $section_text['INI']);
-        $replacement = IS_WINDOWS ? '"' . PHP_BINARY . ' -r \"while ($in = fgets(STDIN)) echo $in;\" > $1"' : 'tee $1 >/dev/null';
-        $section_text['INI'] = preg_replace('/{MAIL:(\S+)}/', $replacement, $section_text['INI']);
-        settings2array(preg_split("/[\n\r]+/", $section_text['INI']), $ini_settings);
-    }
-
     if ($file_cache !== null) {
         $ini_settings['opcache.file_cache'] = '/tmp';
         // Make sure warnings still show up on the second run.
@@ -2151,6 +2141,16 @@ function run_test($php, $file, $env)
         }
     }
 
+    // Any special ini settings
+    // these may overwrite the test defaults...
+    if (array_key_exists('INI', $section_text)) {
+        $section_text['INI'] = str_replace('{PWD}', dirname($file), $section_text['INI']);
+        $section_text['INI'] = str_replace('{TMP}', sys_get_temp_dir(), $section_text['INI']);
+        $replacement = IS_WINDOWS ? '"' . PHP_BINARY . ' -r \"while ($in = fgets(STDIN)) echo $in;\" > $1"' : 'tee $1 >/dev/null';
+        $section_text['INI'] = preg_replace('/{MAIL:(\S+)}/', $replacement, $section_text['INI']);
+        settings2array(preg_split("/[\n\r]+/", $section_text['INI']), $ini_settings);
+    }
+
     $ini_settings = settings2params($ini_settings);
 
     $env['TEST_PHP_EXTRA_ARGS'] = $pass_options . ' ' . $ini_settings;