Fix E_WARNING: Undefined variable $diff in /home/runner/work/php-src/php-src/run-tests.php on line 2752

TimWolla · TimWolla · commit 14ec18d0491e · 2022-07-27T00:04:34.000+02:00
diff --git a/run-tests.php b/run-tests.php
@@ -2749,6 +2749,8 @@ function run_test(string $php, $file, array $env): string
         show_file_block('mem', file_get_contents($memcheck_filename));
     }
 
+    $diff = empty($diff) ? '' : preg_replace('/\e/', '<esc>', $diff);
+
     show_result(implode('&', $restype), $tested, $tested_file, $info, $diff);
 
     foreach ($restype as $type) {
@@ -2761,8 +2763,6 @@ function run_test(string $php, $file, array $env): string
         ];
     }
 
-    $diff = empty($diff) ? '' : preg_replace('/\e/', '<esc>', $diff);
-
     $junit->markTestAs($restype, $shortname, $tested, null, $info, $diff);
 
     return $restype[0] . 'ED';

Original file line number	Diff line number	Diff line change
`@@ -2749,6 +2749,8 @@ function run_test(string $php, $file, array $env): string`
`2749`	`2749`	`show_file_block('mem', file_get_contents($memcheck_filename));`
`2750`	`2750`	`}`
`2751`	`2751`
	`2752`	`+ $diff = empty($diff) ? '' : preg_replace('/\e/', '<esc>', $diff);`
	`2753`	`+`
`2752`	`2754`	`show_result(implode('&', $restype), $tested, $tested_file, $info, $diff);`
`2753`	`2755`
`2754`	`2756`	`foreach ($restype as $type) {`
`@@ -2761,8 +2763,6 @@ function run_test(string $php, $file, array $env): string`
`2761`	`2763`	`];`
`2762`	`2764`	`}`
`2763`	`2765`
`2764`		`- $diff = empty($diff) ? '' : preg_replace('/\e/', '<esc>', $diff);`
`2765`		`-`
`2766`	`2766`	`$junit->markTestAs($restype, $shortname, $tested, null, $info, $diff);`
`2767`	`2767`
`2768`	`2768`	`return $restype[0] . 'ED';`