From 6aa1a407dbb9050ac4c24bc08843ea89467f7da0 Mon Sep 17 00:00:00 2001
From: Bero <berislav.grgicak@gmail.com>
Date: Thu, 29 Feb 2024 12:53:23 +0100
Subject: [PATCH 1/2] Default url rewrites to /index.php

---
 .../node/src/test/php-request-handler.spec.ts | 36 ++++++++++++++++---
 .../universal/src/lib/php-request-handler.ts  | 15 ++++----
 2 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/packages/php-wasm/node/src/test/php-request-handler.spec.ts b/packages/php-wasm/node/src/test/php-request-handler.spec.ts
index 91c6817965..d10d1f2991 100644
--- a/packages/php-wasm/node/src/test/php-request-handler.spec.ts
+++ b/packages/php-wasm/node/src/test/php-request-handler.spec.ts
@@ -142,7 +142,7 @@ describe.each(SupportedPHPVersions)(
 			 */
 			php.writeFile(
 				'/index.php',
-				`<?php 
+				`<?php
 				echo json_encode($_POST);`
 			);
 			const response = await handler.request({
@@ -163,7 +163,7 @@ describe.each(SupportedPHPVersions)(
 			 */
 			php.writeFile(
 				'/index.php',
-				`<?php 
+				`<?php
 				move_uploaded_file($_FILES["myFile"]["tmp_name"], '/tmp/moved.txt');
 				echo json_encode(file_exists('/tmp/moved.txt'));`
 			);
@@ -180,7 +180,7 @@ describe.each(SupportedPHPVersions)(
 		it('Should allow mixing data and files when `body` is a JavaScript object', async () => {
 			php.writeFile(
 				'/index.php',
-				`<?php 
+				`<?php
 				move_uploaded_file($_FILES["myFile"]["tmp_name"], '/tmp/moved.txt');
 				echo json_encode(array_merge(
 					$_POST,
@@ -203,7 +203,7 @@ describe.each(SupportedPHPVersions)(
 		it('Should handle an empty file object and post data', async () => {
 			await php.writeFile(
 				'/index.php',
-				`<?php 
+				`<?php
 				echo json_encode($_POST);`
 			);
 			const response = await handler.request({
@@ -235,6 +235,34 @@ describe.each(SupportedPHPVersions)(
 			expect((await response1).httpStatusCode).toEqual(200);
 			expect((await response2).httpStatusCode).toEqual(502);
 		});
+
+		it('should return 200 when a valid request is made to a PHP file', async () => {
+			php.writeFile('/test.php', `<?php echo "Hello";`);
+			const response = await handler.request({
+				url: '/test.php',
+			});
+			expect(response.httpStatusCode).toEqual(200);
+			expect(response.text).toEqual('Hello');
+		});
+
+		it('should return 200 status when a valid request is made to a WordPress permalink', async () => {
+			php.writeFile('/index.php', `<?php echo "Hello";`);
+			const response = await handler.request({
+				url: '/category/uncategorized/',
+			});
+			expect(response.httpStatusCode).toEqual(200);
+			expect(response.text).toEqual('Hello');
+		});
+
+		it('should return 200 when a valid request is made to a folder', async () => {
+			php.mkdirTree('/folder');
+			php.writeFile('/folder/index.php', `<?php echo "Hello";`);
+			const response = await handler.request({
+				url: '/folder/',
+			});
+			expect(response.httpStatusCode).toEqual(200);
+			expect(response.text).toEqual('Hello');
+		});
 	}
 );
 
diff --git a/packages/php-wasm/universal/src/lib/php-request-handler.ts b/packages/php-wasm/universal/src/lib/php-request-handler.ts
index 871e07e029..c2e86007d3 100644
--- a/packages/php-wasm/universal/src/lib/php-request-handler.ts
+++ b/packages/php-wasm/universal/src/lib/php-request-handler.ts
@@ -268,17 +268,18 @@ export class PHPRequestHandler implements RequestHandler {
 	#resolvePHPFilePath(requestedPath: string): string {
 		let filePath = removePathPrefix(requestedPath, this.#PATHNAME);
 
-		// If the path mentions a .php extension, that's our file's path.
 		if (filePath.includes('.php')) {
+			// If the path mentions a .php extension, that's our file's path.
 			filePath = filePath.split('.php')[0] + '.php';
-		} else {
-			// Otherwise, let's assume the file is $request_path/index.php
+		} else if (this.php.isDir(`${this.#DOCROOT}${filePath}`)) {
 			if (!filePath.endsWith('/')) {
-				filePath += '/';
-			}
-			if (!filePath.endsWith('index.php')) {
-				filePath += 'index.php';
+				filePath = `${filePath}/`;
 			}
+			// If the path is a directory, let's assume the file is index.php
+			filePath = `${filePath}index.php`;
+		} else {
+			// Otherwise, let's assume the file is /index.php
+			filePath = '/index.php';
 		}
 
 		const resolvedFsPath = `${this.#DOCROOT}${filePath}`;

From cc68366e39434267203dc126d2f92c0b5e395387 Mon Sep 17 00:00:00 2001
From: Bero <berislav.grgicak@gmail.com>
Date: Fri, 1 Mar 2024 09:58:17 +0100
Subject: [PATCH 2/2] Add query string tests

---
 .../node/src/test/php-request-handler.spec.ts | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/php-wasm/node/src/test/php-request-handler.spec.ts b/packages/php-wasm/node/src/test/php-request-handler.spec.ts
index d10d1f2991..a44501791e 100644
--- a/packages/php-wasm/node/src/test/php-request-handler.spec.ts
+++ b/packages/php-wasm/node/src/test/php-request-handler.spec.ts
@@ -236,32 +236,32 @@ describe.each(SupportedPHPVersions)(
 			expect((await response2).httpStatusCode).toEqual(502);
 		});
 
-		it('should return 200 when a valid request is made to a PHP file', async () => {
-			php.writeFile('/test.php', `<?php echo "Hello";`);
+		it('should return 200 and pass query strings when a valid request is made to a PHP file', async () => {
+			php.writeFile('/test.php', `<?php echo $_GET['key'];`);
 			const response = await handler.request({
-				url: '/test.php',
+				url: '/test.php?key=value',
 			});
 			expect(response.httpStatusCode).toEqual(200);
-			expect(response.text).toEqual('Hello');
+			expect(response.text).toEqual('value');
 		});
 
-		it('should return 200 status when a valid request is made to a WordPress permalink', async () => {
-			php.writeFile('/index.php', `<?php echo "Hello";`);
+		it('should return 200 status and pass query strings when a valid request is made to a WordPress permalink', async () => {
+			php.writeFile('/index.php', `<?php echo $_GET['key'];`);
 			const response = await handler.request({
-				url: '/category/uncategorized/',
+				url: '/category/uncategorized/?key=value',
 			});
 			expect(response.httpStatusCode).toEqual(200);
-			expect(response.text).toEqual('Hello');
+			expect(response.text).toEqual('value');
 		});
 
-		it('should return 200 when a valid request is made to a folder', async () => {
+		it('should return 200 and pass query strings when a valid request is made to a folder', async () => {
 			php.mkdirTree('/folder');
-			php.writeFile('/folder/index.php', `<?php echo "Hello";`);
+			php.writeFile('/folder/index.php', `<?php echo $_GET['key'];`);
 			const response = await handler.request({
-				url: '/folder/',
+				url: '/folder/?key=value',
 			});
 			expect(response.httpStatusCode).toEqual(200);
-			expect(response.text).toEqual('Hello');
+			expect(response.text).toEqual('value');
 		});
 	}
 );