Merge branch 'PHP-7.4' into PHP-8.0

cmb69 · cmb69 · commit 8162c3d1fdd1 · 2021-02-23T13:22:50.000+01:00
* PHP-7.4:
  run-tests: fixed exit code not being set on BORKED tests
diff --git a/run-tests.php b/run-tests.php
@@ -803,7 +803,7 @@ function main(): void
 
     junit_save_xml();
     if (getenv('REPORT_EXIT_STATUS') !== '0' && getenv('REPORT_EXIT_STATUS') !== 'no' &&
-            ($sum_results['FAILED'] || $sum_results['LEAKED'])) {
+            ($sum_results['FAILED'] || $sum_results['BORKED'] || $sum_results['LEAKED'])) {
         exit(1);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -803,7 +803,7 @@ function main(): void`
`803`	`803`
`804`	`804`	`junit_save_xml();`
`805`	`805`	`if (getenv('REPORT_EXIT_STATUS') !== '0' && getenv('REPORT_EXIT_STATUS') !== 'no' &&`
`806`		`- ($sum_results['FAILED'] \|\| $sum_results['LEAKED'])) {`
	`806`	`+ ($sum_results['FAILED'] \|\| $sum_results['BORKED'] \|\| $sum_results['LEAKED'])) {`
`807`	`807`	`exit(1);`
`808`	`808`	`}`
`809`	`809`	`}`