run-tests: preserved skip-check environment isolation

Author: NickSdot

run-tests.php

@@ -2221,10 +2221,19 @@ function run_test(string $php, $file, array $env): string
 
     if ($test->sectionNotEmpty('SKIPIF')) {
         show_file_block('skip', $test->getSection('SKIPIF'));
+        $skipEnv = $env;
+        if (!IS_WINDOWS) {
+            unset(
+                $skipEnv['REQUEST_METHOD'],
+                $skipEnv['QUERY_STRING'],
+                $skipEnv['PATH_TRANSLATED'],
+                $skipEnv['SCRIPT_FILENAME'],
+            );
+        }
 
         if ($valgrind) {
-            $env['USE_ZEND_ALLOC'] = '0';
-            $env['ZEND_DONT_UNLOAD_MODULES'] = 1;
+            $skipEnv['USE_ZEND_ALLOC'] = '0';
+            $skipEnv['ZEND_DONT_UNLOAD_MODULES'] = 1;
         }
 
         $junit->startTimer($shortname);
@@ -2246,7 +2255,7 @@ function run_test(string $php, $file, array $env): string
             '-d',
             'display_startup_errors=0',
         ];
-        $output = $skipCache->checkSkip($commandLine, $test->getSection('SKIPIF'), $test_skipif, $temp_skipif, $env);
+        $output = $skipCache->checkSkip($commandLine, $test->getSection('SKIPIF'), $test_skipif, $temp_skipif, $skipEnv);
 
         $time = microtime(true) - $startTime;
         $junit->stopTimer($shortname);

tests/run-test/clean_environment.phpt

@@ -1,5 +1,15 @@
 --TEST--
-CLEAN does not inherit request environment variables on POSIX
+SKIPIF and CLEAN do not inherit request environment variables on POSIX
+--SKIPIF--
+<?php
+if (PHP_OS_FAMILY !== 'Windows') {
+    foreach (['REQUEST_METHOD', 'QUERY_STRING', 'PATH_TRANSLATED', 'SCRIPT_FILENAME'] as $name) {
+        if (getenv($name) !== false) {
+            die("$name was inherited\n");
+        }
+    }
+}
+?>
 --FILE--
 <?php
 ?>