Reject incomplete PHPUnit bootstrap runs

Author: chubes4

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

@@ -1898,9 +1898,11 @@ echo json_encode(array('command' => 'inspect-mounted-inputs', 'mounts' => $inspe
 
 function executionSpecWithEnvironment(spec: ExecutionSpec): ExecutionSpec {
   if (!spec.environment || Object.keys(spec.environment).length === 0) return spec
+  const args = spec.args ?? []
+  const runtimeEnvironment = JSON.parse(argValue(args, "runtime-env-json") ?? "{}") as Record<string, string>
   return {
     ...spec,
-    args: [...(spec.args ?? []).filter((argument) => !argument.startsWith("runtime-env-json=")), `runtime-env-json=${JSON.stringify(spec.environment)}`],
+    args: [...args.filter((argument) => !argument.startsWith("runtime-env-json=")), `runtime-env-json=${JSON.stringify({ ...runtimeEnvironment, ...spec.environment })}`],
   }
 }
 

packages/runtime-playground/src/wordpress-command-runners.ts

@@ -966,6 +966,9 @@ export async function runPhpunitCommand({
     }
     throw error
   }
+  if (structured) {
+    throw attachPlaygroundDiagnostics(new Error("wordpress.phpunit terminated before completing bootstrap"), "wordpress.phpunit structured diagnostics", structured)
+  }
 
   return response.text
 }

tests/phpunit-runtime-failure-diagnostics.test.ts

@@ -15,7 +15,7 @@ await assert.rejects(
     mounts: [],
     runPlaygroundCommand: async (_command, _server, input) => {
       submittedCode = input.code
-      return { exitCode: 1, errors: "", text: "" }
+      return { exitCode: 0, errors: "", text: "" }
     },
     runtimeSpec: { environment: { kind: "wordpress", name: "test", version: "latest" }, policy: { commands: ["wordpress.phpunit"] } } as never,
     server: {
@@ -29,7 +29,7 @@ await assert.rejects(
     spec: { command: "wordpress.phpunit", args: ["plugin-slug=demo-plugin"] },
   }),
   (error: Error) => {
-    assert.match(error.message, /wordpress\.phpunit failed with exit code 1/)
+    assert.match(error.message, /wordpress\.phpunit terminated before completing bootstrap/)
     assert.match(error.message, /wordpress\.phpunit structured diagnostics/)
     assert.match(error.message, /Bootstrap failed with token: \[redacted\]/)
     assert.match(error.message, /\[diagnostic truncated\]/)

tests/playground-phpunit-bootstrap-failure.integration.test.ts

@@ -52,7 +52,7 @@ try {
   assert.match(commandLog, /PHPUnit bootstrap fixture token: \[redacted\]/)
   assert.doesNotMatch(commandLog, new RegExp(secret))
 
-  await writeFile(fatalMuPlugin, `<?php\necho 'PHPUnit bootstrap exit fixture token: ${secret}';\nexit(1);\n`)
+  await writeFile(fatalMuPlugin, `<?php\necho 'PHPUnit bootstrap exit fixture token: ${secret}';\nexit;\n`)
   const exitOutput = await runFailedRecipe(exitArtifactsPath)
   assert.equal(exitOutput.success, false, JSON.stringify(exitOutput))
   const exitMessage = exitOutput.error?.message ?? ""