Fix cross-device mv by switching to copy

packages/php-wasm/node/src/test/php-networking.spec.ts

@@ -21,7 +21,7 @@ describe.each(SupportedPHPVersions)(
 			expect(text).toEqual('response from express');
 		});
 	},
-	1000
+	5000
 );
 
 async function startServer() {

packages/php-wasm/node/src/test/php.spec.ts

@@ -77,7 +77,7 @@ describe.each(SupportedPHPVersions)('PHP %s', (phpVersion) => {
 					$pipes
 				);
 
-				// Yields back to JS event loop to capture and process the 
+				// Yields back to JS event loop to capture and process the
 				// child_process output. This is fine. Regular PHP scripts
 				// typically wait for the child process to finish.
 				sleep(1);
@@ -122,7 +122,7 @@ describe.each(SupportedPHPVersions)('PHP %s', (phpVersion) => {
 		// This test fails
 		if (!['7.0', '7.1', '7.2', '7.3'].includes(phpVersion)) {
 			/*
-			There is a race condition in this variant of the test which 
+			There is a race condition in this variant of the test which
 			causes the following failure (but only sometimes):
 
 				src/test/php.spec.ts > PHP 8.2 > proc_open() > cat – stdin=pipe, stdout=file, stderr=file
@@ -142,7 +142,7 @@ describe.each(SupportedPHPVersions)('PHP %s', (phpVersion) => {
 			);
 			fwrite($pipes[0], 'WordPress\n');
 
-			// Yields back to JS event loop to capture and process the 
+			// Yields back to JS event loop to capture and process the
 			// child_process output. This is fine. Regular PHP scripts
 			// typically wait for the child process to finish.
 			sleep(1);
@@ -173,7 +173,7 @@ describe.each(SupportedPHPVersions)('PHP %s', (phpVersion) => {
 					$pipes
 				);
 
-				// Yields back to JS event loop to capture and process the 
+				// Yields back to JS event loop to capture and process the
 				// child_process output. This is fine. Regular PHP scripts
 				// typically wait for the child process to finish.
 				sleep(1);
@@ -324,6 +324,65 @@ describe.each(SupportedPHPVersions)('PHP %s', (phpVersion) => {
 			);
 		});
 
+		it('cp() should copy a file', () => {
+			php.mkdir(testDirPath);
+			const file1 = testDirPath + '/1.txt';
+			const file2 = testDirPath + '/2.txt';
+			php.writeFile(file1, '1');
+			php.cp(file1, file2);
+			expect(php.fileExists(file1)).toEqual(true);
+			expect(php.fileExists(file2)).toEqual(true);
+			expect(php.readFileAsText(file2)).toEqual('1');
+		});
+
+		it('cp() should copy a directory', () => {
+			const testDirPath1 = testDirPath;
+			const testDirPath2 = '/__test987654322';
+			php.mkdir(testDirPath1);
+			php.writeFile(testDirPath1 + '/1.txt', '1');
+			php.writeFile(testDirPath1 + '/2.txt', '2');
+			php.cp(testDirPath1, testDirPath2, true);
+			expect(php.fileExists(testDirPath2 + '/1.txt')).toEqual(true);
+			expect(php.fileExists(testDirPath2 + '/2.txt')).toEqual(true);
+			expect(php.readFileAsText(testDirPath2 + '/1.txt')).toEqual('1');
+			expect(php.readFileAsText(testDirPath2 + '/2.txt')).toEqual('2');
+		});
+
+		it('cp() should replace target file if it exists', () => {
+			php.mkdir(testDirPath);
+			const file1 = testDirPath + '/1.txt';
+			const file2 = testDirPath + '/2.txt';
+			php.writeFile(file1, '1');
+			php.writeFile(file2, '2');
+			php.cp(file1, file2);
+			expect(php.fileExists(file1)).toEqual(true);
+			expect(php.fileExists(file2)).toEqual(true);
+			expect(php.readFileAsText(file2)).toEqual('1');
+		});
+
+		it('cp() should throw a useful error when source file does not exist', () => {
+			php.mkdir(testDirPath);
+			const file1 = testDirPath + '/1.txt';
+			const file2 = testDirPath + '/2.txt';
+			expect(() => {
+				php.cp(file1, file2);
+			}).toThrowError(
+				`Could not copy "${testDirPath}/1.txt": There is no such file or directory OR the parent directory does not exist.`
+			);
+		});
+
+		it('cp() should throw a useful error when target directory does not exist', () => {
+			php.mkdir(testDirPath);
+			const file1 = testDirPath + '/1.txt';
+			const file2 = testDirPath + '/nowhere/2.txt';
+			php.writeFile(file1, '1');
+			expect(() => {
+				php.cp(file1, file2);
+			}).toThrowError(
+				`Could not copy "${testDirPath}/1.txt": There is no such file or directory OR the parent directory does not exist.`
+			);
+		});
+
 		it('mkdir() should create a directory', () => {
 			php.mkdir(testDirPath);
 			expect(php.fileExists(testDirPath)).toEqual(true);

packages/php-wasm/universal/src/lib/base-php.ts

@@ -25,7 +25,7 @@ import {
 	improveWASMErrorReporting,
 	UnhandledRejectionsTarget,
 } from './wasm-error-reporting';
-import { Semaphore } from '@php-wasm/util';
+import { Semaphore, joinPaths } from '@php-wasm/util';
 
 const STRING = 'string';
 const NUMBER = 'number';
@@ -616,6 +616,53 @@ export abstract class BasePHP implements IsomorphicLocalPHP {
 		this[__private__dont__use].FS.rename(fromPath, toPath);
 	}
 
+	/** @inheritDoc */
+	@rethrowFileSystemError('Could not copy "{path}"')
+	cp(fromPath: string, toPath: string, recursive = false) {
+		const FS = this[__private__dont__use].FS;
+
+		const fromStat = FS.stat(fromPath);
+
+		// Emscripten directories will have the sticky-bit set
+		// https://linux.die.net/man/1/chmod
+		const fromIsDir = fromStat.mode & 0o40000;
+
+		let toExists: boolean;
+
+		try {
+			FS.stat(toPath);
+			toExists = true;
+		} catch {
+			toExists = false;
+		}
+
+		if (!fromIsDir) {
+			const file = FS.readFile(fromPath, { encoding: 'binary' });
+			FS.writeFile(toPath, file);
+			return;
+		}
+
+		if (!recursive) {
+			throw new Error(
+				`Cannot use non-recurive copy on directory: ${fromPath}`
+			);
+		}
+
+		if (!toExists) {
+			FS.mkdir(toPath);
+		}
+
+		const files = this.listFiles(fromPath);
+
+		files.forEach((file: string) =>
+			this.cp(
+				joinPaths(fromPath, file),
+				joinPaths(toPath, file),
+				recursive
+			)
+		);
+	}
+
 	/** @inheritDoc */
 	@rethrowFileSystemError('Could not remove directory "{path}"')
 	rmdir(path: string, options: RmDirOptions = { recursive: true }) {

packages/php-wasm/universal/src/lib/universal-php.ts

@@ -256,6 +256,15 @@ export interface IsomorphicLocalPHP extends RequestHandler {
 	 */
 	mv(oldPath: string, newPath: string): void;
 
+	/**
+	 * Copies a file or directory in the PHP filesystem to a
+	 * new location.
+	 *
+	 * @param oldPath The file or directory to be copied.
+	 * @param newPath The new, full path to copy the file or directory to.
+	 */
+	cp(oldPath: string, newPath: string, recurive: boolean): void;
+
 	/**
 	 * Removes a directory from the PHP filesystem.
 	 *

packages/php-wasm/web/src/lib/web-php-endpoint.ts

@@ -89,6 +89,11 @@ export class WebPHPEndpoint implements IsomorphicLocalPHP {
 		return _private.get(this)!.php.mv(fromPath, toPath);
 	}
 
+	/** @inheritDoc @php-wasm/universal!IsomorphicLocalPHP.mv  */
+	cp(fromPath: string, toPath: string) {
+		return _private.get(this)!.php.cp(fromPath, toPath);
+	}
+
 	/** @inheritDoc @php-wasm/universal!IsomorphicLocalPHP.rmdir  */
 	rmdir(path: string, options?: RmDirOptions) {
 		return _private.get(this)!.php.rmdir(path, options);

packages/playground/blueprints/src/lib/steps/install-asset.ts

@@ -83,7 +83,7 @@ export async function installAsset(
 
 		// Move asset folder to target path
 		const assetFolderPath = `${targetPath}/${assetFolderName}`;
-		await playground.mv(tmpAssetPath, assetFolderPath);
+		await playground.cp(tmpAssetPath, assetFolderPath, true);
 		await cleanup();
 
 		return {

packages/playground/website/cypress/e2e/app.cy.ts

@@ -86,7 +86,7 @@ describe('Query API', () => {
 					{
 						step: 'writeFile',
 						path: '/wordpress/test.php',
-						data: `<?php 
+						data: `<?php
 						require("/wordpress/wp-load.php");
 						echo wp_http_supports(array( "ssl" )) ? "true" : "false";
 						`,
@@ -104,7 +104,7 @@ describe('Query API', () => {
 			cy.wordPressDocument()
 				.find('[data-slug=gutenberg].active')
 				.should('exist');
-		});
+		}, 120_000);
 	});
 
 	describe('option `theme`', () => {