Update phpGetThemeDetails to use server process

Automattic · Apr 24, 2024 · 1de5f35 · 1de5f35
1 parent e52bc0e
commit 1de5f35
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/src/ipc-handlers.ts b/src/ipc-handlers.ts
@@ -502,7 +502,7 @@ export async function getThemeDetails( event: IpcMainInvokeEvent, id: string ) {
 	if ( ! server.details.running || ! server.server ) {
 		return null;
 	}
-	const themeDetails = await phpGetThemeDetails( server.server.php );
+	const themeDetails = await phpGetThemeDetails( server.server );
 
 	const parentWindow = BrowserWindow.fromWebContents( event.sender );
 	if ( themeDetails?.path && themeDetails.path !== server.details.themeDetails?.path ) {

diff --git a/src/lib/php-get-theme-details.ts b/src/lib/php-get-theme-details.ts
@@ -1,12 +1,16 @@
 import * as Sentry from '@sentry/electron/main';
-import { WPNowServer } from '../../vendor/wp-now/src';
+import SiteServerProcess from './site-server-process';
 
 export async function phpGetThemeDetails(
-	php: WPNowServer[ 'php' ]
+	server: SiteServerProcess
 ): Promise< StartedSiteDetails[ 'themeDetails' ] > {
+	if ( ! server.php ) {
+		throw Error( 'PHP is not instantiated' );
+	}
+
 	let themeDetails = null;
 	const themeDetailsPhp = `<?php
-    require_once('${ php.documentRoot }/wp-load.php');
+    require_once('${ server.php.documentRoot }/wp-load.php');
     $theme = wp_get_theme();
     echo json_encode([
         'name' => $theme->get('Name'),
@@ -19,11 +23,9 @@ export async function phpGetThemeDetails(
     ]);
     `;
 	try {
-		themeDetails = (
-			await php.run( {
-				code: themeDetailsPhp,
-			} )
-		).text;
+		themeDetails = await server.runPhp( {
+			code: themeDetailsPhp,
+		} );
 		themeDetails = JSON.parse( themeDetails );
 	} catch ( error ) {
 		Sentry.captureException( error, {