Merge remote-tracking branch 'origin/main' into fix/1838-cloudflare-bounded-browser

Author: chubes4

packages/runtime-playground/src/php-bootstrap.ts

@@ -27,7 +27,7 @@ export function bootstrapPhpCode(spec: RuntimeCreateSpec, code: string, args: st
 
   const command = splitLeadingStrictTypesDeclare(code)
 
-  return `<?php
+  const bootstrapped = `<?php
 ${command.strictTypesDeclare ? `${command.strictTypesDeclare}\n` : ""}${phpFatalDiagnosticPhp()}
 ${failureDiagnosticFile ? phpFailureDiagnosticFilePhp(failureDiagnosticFile) : ""}
 ${phpCliStreamConstants()}
@@ -43,6 +43,18 @@ ${wpCliBridge ? `putenv(${JSON.stringify(`WP_CODEBOX_TERMINAL_ACTION_URL=${wpCli
 putenv(${JSON.stringify(`WP_CODEBOX_TERMINAL_ACTION_TOKEN=${wpCliBridge.token}`)});
 ` : ""}
 ${command.body}`
+
+  return failureDiagnosticFile ? phpFailureDiagnosticWrapperPhp(bootstrapped, failureDiagnosticFile) : bootstrapped
+}
+
+function phpFailureDiagnosticWrapperPhp(code: string, path: string): string {
+  return `<?php
+try {
+    eval('?>' . base64_decode(${JSON.stringify(Buffer.from(code, "utf8").toString("base64"))}));
+} catch (Throwable $wp_codebox_bootstrap_throwable) {
+    @file_put_contents(${JSON.stringify(path)}, 'STAGE_FAIL:bootstrap:' . get_class($wp_codebox_bootstrap_throwable) . ': ' . $wp_codebox_bootstrap_throwable->getMessage() . ' at ' . $wp_codebox_bootstrap_throwable->getFile() . ':' . $wp_codebox_bootstrap_throwable->getLine() . "\\n", FILE_APPEND);
+    throw $wp_codebox_bootstrap_throwable;
+}`
 }
 
 function phpFailureDiagnosticFilePhp(path: string): string {

packages/runtime-playground/src/phpunit-command-handlers.ts

@@ -1234,7 +1234,7 @@ try {
         pg_log('NO_TEST_FILES');
         pg_log('NOTICE:tests directory not found at ' . $test_dir);
         pg_stage_ok('discover_tests');
-        exit(1);
+        exit(0);
     }
     list($directories, $suffixes, $prefixes, $excludes, $configured_files) = wp_codebox_phpunit_parse_config(${JSON.stringify(options.phpunitXml)}, $test_dir);
     $test_files = wp_codebox_phpunit_discover($directories, $suffixes, $prefixes, $excludes, $configured_files);
@@ -1259,7 +1259,7 @@ try {
     if (empty($test_files)) {
         pg_log('NO_TEST_FILES');
         pg_stage_ok('discover_tests');
-        exit(1);
+        exit(0);
     }
     pg_stage_ok('discover_tests');
 } catch (Throwable $e) {
@@ -1585,7 +1585,7 @@ try {
     if (empty($test_files)) {
         core_pg_log('NO_TEST_FILES');
         core_pg_stage_ok('discover_tests');
-        exit(1);
+        exit(0);
     }
     core_pg_stage_ok('discover_tests');
 } catch (Throwable $e) {