Fix E2E tests on macOS when STUDIO_RUNTIME=native-php

apps/cli/php-server-child.ts

@@ -346,16 +346,17 @@ async function startServer( config: ServerConfig, signal: AbortSignal ): Promise
 			} );
 		} );
 
-		stopSignal.throwIfAborted();
-		await waitForServerReady( `http://localhost:${ config.port }/`, stopSignal );
-
 		serverChild.once( 'exit', ( code, signalName ) => {
 			errorToConsole(
 				`PHP child process exited unexpectedly (code: ${ code }, signal: ${ signalName })`
 			);
 			process.exit( code ?? 1 );
 		} );
 
+		stopSignal.throwIfAborted();
+		await waitForServerReady( `http://localhost:${ config.port }/`, stopSignal );
+		await installWordPress( config, phpVersion, stopSignal );
+
 		phpProcess = serverChild;
 	} catch ( error ) {
 		if ( spawnedChild && ! spawnedChild.killed ) {

apps/cli/process-manager-daemon.ts

@@ -217,6 +217,7 @@ export class ProcessManagerDaemon {
 			env,
 			stdio: [ 'ignore', 'pipe', 'pipe', 'ipc' ],
 			windowsHide: true,
+			detached: process.platform !== 'win32',
 		} );
 
 		const managedProcess: ManagedProcessRunning = {
@@ -293,7 +294,7 @@ export class ProcessManagerDaemon {
 
 		await new Promise< void >( ( resolve ) => {
 			const timeoutId = setTimeout( () => {
-				managedProcess.child.kill( 'SIGKILL' );
+				this.forceCleanupChild( managedProcess );
 			}, STOP_TIMEOUT_MS );
 
 			managedProcess.child.once( 'exit', () => {
@@ -418,11 +419,28 @@ export class ProcessManagerDaemon {
 			if ( managedProcess.settled ) {
 				continue;
 			}
+			this.forceCleanupChild( managedProcess );
+		}
+	}
+
+	private forceCleanupChild( managedProcess: ManagedProcess ) {
+		if ( process.platform === 'win32' ) {
 			try {
-				managedProcess.child.kill( 'SIGKILL' );
+				managedProcess.child.kill( 'SIGTERM' );
 			} catch {
 				// Do nothing
 			}
+			return;
+		}
+
+		if ( ! managedProcess.child.pid ) {
+			return;
+		}
+
+		try {
+			process.kill( -managedProcess.child.pid, 'SIGKILL' );
+		} catch {
+			// Do nothing
 		}
 	}
 
@@ -432,17 +450,18 @@ export class ProcessManagerDaemon {
 		}
 
 		this.shuttingDown = true;
-		await this.broadcastEvent( {
-			type: 'daemon-kill',
-			payload: { reason },
-		} );
 
 		await Promise.allSettled(
 			Array.from( this.managedProcesses.values() ).map( ( managedProcess ) =>
 				this.stopProcess( managedProcess.name )
 			)
 		);
 
+		await this.broadcastEvent( {
+			type: 'daemon-kill',
+			payload: { reason },
+		} );
+
 		await new Promise< void >( ( resolve ) => {
 			void this.controlServer.close().then( () => resolve() );
 		} );

apps/studio/src/ipc-handlers.ts

@@ -85,6 +85,7 @@ import { setSentryWpcomUserIdMain } from 'src/lib/main-sentry-utils';
 import * as oauthClient from 'src/lib/oauth';
 import { getAiInstructionsPath } from 'src/lib/server-files-paths';
 import { shellOpenExternalWrapper } from 'src/lib/shell-open-external-wrapper';
+import { updateSiteUrl } from 'src/lib/update-site-url';
 import * as windowsHelpers from 'src/lib/windows-helpers';
 import { getLogsFilePath, writeLogToFile, type LogLevel } from 'src/logging';
 import { getMainWindow } from 'src/main-window';
@@ -1053,6 +1054,10 @@ export async function copySite(
 		noStart: true,
 	} );
 
+	// Playground sets the correct siteurl internally, but for the native-php runtime, we need to
+	// explicitly update that option
+	await updateSiteUrl( server, `http://localhost:${ details.port }` );
+
 	// Persist themeDetails to appdata (Studio-only data)
 	if ( sourceSite.themeDetails ) {
 		server.details.themeDetails = sourceSite.themeDetails;

apps/studio/src/modules/cli/lib/execute-export-command.ts

@@ -24,7 +24,7 @@ export function executeExportCliCommand(
 	const { abortSignal } = options;
 
 	function abortExportProcess() {
-		childProcess.kill( 'SIGKILL' );
+		childProcess.kill( 'SIGTERM' );
 		emitFailure( new Error( 'Export aborted' ) );
 	}