replace dispose with exit methods

Author: mho22

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

@@ -24,7 +24,7 @@ describe.each(['7.3', '7.4', '8.0', '8.1'])(
 		});
 
 		afterEach(async () => {
-			php?.[Symbol.dispose]?.();
+			php.exit();
 		});
 
 		function unhandledRejectionHandler(error: any) {

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

@@ -13,7 +13,7 @@ describe.each(SupportedPHPVersions)('PHP %s', (phpVersion) => {
 		});
 
 		afterEach(async () => {
-			php?.[Symbol.dispose]?.();
+			php.exit();
 		});
 
 		it('does not load dynamically by default', async () => {

packages/php-wasm/node/src/test/php-file-get-contents.spec.ts

@@ -89,7 +89,7 @@ const httpsServer = https.createServer(
 			});
 
 			afterEach(async () => {
-				php?.[Symbol.dispose]?.();
+				php.exit();
 			});
 
 			describe.each(Object.keys(topOfTheStack))(

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

@@ -92,7 +92,7 @@ const httpsServer = https.createServer(
 			});
 
 			afterEach(async () => {
-				php?.[Symbol.dispose]?.();
+				php.exit();
 			});
 
 			describe.each(Object.keys(topOfTheStack))(

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

@@ -94,7 +94,7 @@ const httpsServer = https.createServer(
 			});
 
 			afterEach(async () => {
-				php?.[Symbol.dispose]?.();
+				php.exit();
 			});
 
 			describe.each(Object.keys(topOfTheStack))(

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

@@ -93,7 +93,7 @@ const httpsServer = https.createServer(
 			});
 
 			afterEach(async () => {
-				php?.[Symbol.dispose]?.();
+				php.exit();
 			});
 
 			describe.each(Object.keys(topOfTheStack))(

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

@@ -23,7 +23,7 @@ custom_setting = true
 	});
 
 	afterEach(async () => {
-		php?.[Symbol.dispose]?.();
+		php.exit();
 	});
 
 	describe('getPhpIniEntries', () => {

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

@@ -16,7 +16,7 @@ describe.each(phpVersions)('PHP %s – memory allocation', (phpVersion) => {
 	});
 
 	afterEach(async () => {
-		php?.[Symbol.dispose]?.();
+		php.exit();
 	});
 
 	it('can concat large string out of many small strings without reaching Out-of-memory condition', async () => {

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

@@ -129,7 +129,7 @@ const httpsServer = https.createServer(
 			});
 
 			afterEach(async () => {
-				php?.[Symbol.dispose]?.();
+				php.exit();
 			});
 
 			describe.each(Object.keys(topOfTheStack))(

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

@@ -239,21 +239,16 @@ describe.each(SupportedPHPVersions)('PHP %s', (phpVersion) => {
 			}
 		});
 
-		it(
-			'should support HTTPS requests',
-			async () => {
-				const php = new PHP(await loadNodeRuntime(phpVersion));
-				await setPhpIniEntries(php, {
-					'openssl.cafile': '/tmp/ca-bundle.crt',
-					allow_url_fopen: 1,
-					disable_functions: '',
-				});
-				php.writeFile(
-					'/tmp/ca-bundle.crt',
-					rootCertificates.join('\n')
-				);
-				const { text } = await php.run({
-					code: `<?php
+		it('should support HTTPS requests', async () => {
+			const php = new PHP(await loadNodeRuntime(phpVersion));
+			await setPhpIniEntries(php, {
+				'openssl.cafile': '/tmp/ca-bundle.crt',
+				allow_url_fopen: 1,
+				disable_functions: '',
+			});
+			php.writeFile('/tmp/ca-bundle.crt', rootCertificates.join('\n'));
+			const { text } = await php.run({
+				code: `<?php
 					$ch = curl_init();
 					curl_setopt($ch, CURLOPT_URL, "https://api.wordpress.org/stats/php/1.0/");
 					curl_setopt($ch, CURLOPT_TCP_NODELAY, 0);
@@ -263,22 +258,18 @@ describe.each(SupportedPHPVersions)('PHP %s', (phpVersion) => {
 					$json = json_decode($result, true);
 					var_dump(array_key_exists('8.3', $json));
 					`,
-				});
-				expect(text).toContain('bool(true)');
-			},
-			{ timeout: 4000 }
-		);
+			});
+			expect(text).toContain('bool(true)');
+		}, 8000);
 
-		it(
-			'should support HTTPS requests when certificate verification is disabled',
-			async () => {
-				const php = new PHP(await loadNodeRuntime(phpVersion));
-				await setPhpIniEntries(php, {
-					allow_url_fopen: 1,
-					disable_functions: '',
-				});
-				const { text } = await php.run({
-					code: `<?php
+		it('should support HTTPS requests when certificate verification is disabled', async () => {
+			const php = new PHP(await loadNodeRuntime(phpVersion));
+			await setPhpIniEntries(php, {
+				allow_url_fopen: 1,
+				disable_functions: '',
+			});
+			const { text } = await php.run({
+				code: `<?php
 					$ch = curl_init();
 					curl_setopt($ch, CURLOPT_URL, "https://api.wordpress.org/stats/php/1.0/");
 					curl_setopt($ch, CURLOPT_TCP_NODELAY, 0);
@@ -290,11 +281,9 @@ describe.each(SupportedPHPVersions)('PHP %s', (phpVersion) => {
 					$json = json_decode($result, true);
 					var_dump(array_key_exists('8.3', $json));
 					`,
-				});
-				expect(text).toContain('bool(true)');
-			},
-			{ timeout: 4000 }
-		);
+			});
+			expect(text).toContain('bool(true)');
+		}, 8000);
 
 		it('should close server when runtime is exited', async () => {
 			const id = await loadNodeRuntime(phpVersion);

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

@@ -91,8 +91,7 @@ describe.each(configsForRequestTests)(
 		});
 
 		afterEach(async () => {
-			php?.[Symbol.dispose]?.();
-			await handler?.[Symbol.asyncDispose]?.();
+			php.exit();
 		});
 
 		it('should execute a PHP file', async () => {
@@ -687,7 +686,7 @@ describe.each(SupportedPHPVersions)(
 		});
 
 		afterEach(async () => {
-			await handler?.[Symbol.asyncDispose]?.();
+			(await handler.getPrimaryPhp()).exit();
 		});
 
 		it.each([

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

@@ -277,7 +277,7 @@ describe(`SQLite3 – ${runtimeMode}`, () => {
 		});
 
 		afterEach(async () => {
-			php?.[Symbol.dispose]?.();
+			php.exit();
 		});
 
 		describe.each(Object.keys(topOfTheStack))('%s', (networkCallKey) => {

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

@@ -16,7 +16,7 @@ describe('phpVar', () => {
 	});
 
 	afterEach(async () => {
-		php?.[Symbol.dispose]?.();
+		php.exit();
 	});
 
 	const data = [

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

@@ -88,12 +88,7 @@ describe.each(SupportedPHPVersions)('PHP %s', (phpVersion) => {
 		await setPhpIniEntries(php, { disable_functions: '' });
 	});
 	afterEach(async () => {
-		// Clean up
-		try {
-			php.exit(0);
-		} catch {
-			// ignore exit-related exceptions
-		}
+		php.exit();
 	});
 
 	describe('php.runStream()', () => {

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

@@ -73,15 +73,10 @@ testSymlinks.forEach(({ name, sourcePath, symlinkPath }) => {
 			}
 		});
 		afterEach(async () => {
-			// Clean up
-			try {
-				if (fs.existsSync(symlinkPath)) {
-					fs.unlinkSync(symlinkPath);
-				}
-				php.exit(0);
-			} catch {
-				// ignore exit-related exceptions
+			if (fs.existsSync(symlinkPath)) {
+				fs.unlinkSync(symlinkPath);
 			}
+			php.exit();
 		});
 
 		describe('Test symlinks', () => {

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

@@ -13,7 +13,7 @@ describe('writeFiles', () => {
 	});
 
 	afterEach(async () => {
-		php?.[Symbol.dispose]?.();
+		php.exit();
 	});
 
 	it('removes the previous directory contents', async () => {