Merge branch 'master' of github.com:seanmorris/php-wasm

seanmorris · seanmorris · commit a67960068af3 · 2025-04-16T04:05:57.000-04:00
diff --git a/Makefile b/Makefile
@@ -898,9 +898,11 @@ NPM_PUBLISH_DRY?=--dry-run
 publish:
 	npm publish ${NPM_PUBLISH_DRY}
 
-test:
-	${DOCKER_RUN} echo "Works!"
-	${MAKE} node-mjs
+test: node-mjs
+	${MAKE} test-node
+	${MAKE} test-deno
+
+test-node:
 	WITH_LIBXML=${WITH_LIBXML} \
 	WITH_LIBZIP=${WITH_LIBZIP} \
 	WITH_ICONV=${WITH_ICONV} \
@@ -921,6 +923,27 @@ test:
 	WITH_OPENSSL=${WITH_OPENSSL} \
 	WITH_INTL=${WITH_INTL} node --test ${TEST_LIST} `ls test/*.mjs`
 
+test-deno:
+	WITH_LIBXML=${WITH_LIBXML} \
+	WITH_LIBZIP=${WITH_LIBZIP} \
+	WITH_ICONV=${WITH_ICONV} \
+	WITH_SQLITE=${WITH_ICONV} \
+	WITH_GD=${WITH_GD} \
+	WITH_PHAR=${WITH_PHAR} \
+	WITH_ZLIB=${WITH_ZLIB} \
+	WITH_LIBPNG=${WITH_LIBPNG} \
+	WITH_FREETYPE=${WITH_FREETYPE} \
+	WITH_LIBJPEG=${WITH_LIBJPEG} \
+	WITH_DOM=${WITH_DOM} \
+	WITH_SIMPLEXML=${WITH_SIMPLEXML} \
+	WITH_XML=${WITH_XML} \
+	WITH_YAML=${WITH_YAML} \
+	WITH_TIDY=${WITH_TIDY} \
+	WITH_MBSTRING=${WITH_MBSTRING} \
+	WITH_ONIGURUMA=${WITH_ONIGURUMA} \
+	WITH_OPENSSL=${WITH_OPENSSL} \
+	WITH_INTL=${WITH_INTL} deno test ${TEST_LIST} `ls test/*.mjs` --allow-read --allow-write --allow-env --allow-net
+
 run:
 	${DOCKER_ENV} emscripten-builder bash
 
diff --git a/demo-node/index.mjs b/demo-node/index.mjs
@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import http from 'http';
+import http from 'node:http';
 import { PhpCgiNode } from 'php-cgi-wasm/PhpCgiNode.mjs';
 
 const php = new PhpCgiNode({
diff --git a/packages/dom/test/basic.mjs b/packages/dom/test/basic.mjs
@@ -1,9 +1,10 @@
 import { test } from 'node:test';
 import { strict as assert } from 'node:assert';
 import { PhpNode } from '../../../packages/php-wasm/PhpNode.mjs';
+import { env } from 'node:process';
 
 test('DOM Extension is enabled.', async () => {
-	const php = process.env.WITH_DOM === 'dynamic'
+	const php = env.WITH_DOM === 'dynamic'
 		? new PhpNode({sharedLibs:[`php${PhpNode.phpVersion}-dom.so`]})
 		: new PhpNode;
 
diff --git a/packages/gd/test/basic.mjs b/packages/gd/test/basic.mjs
@@ -1,9 +1,10 @@
 import { test } from 'node:test';
 import { strict as assert } from 'node:assert';
 import { PhpNode } from '../../../packages/php-wasm/PhpNode.mjs';
+import { env } from 'node:process';
 
 test('GD Extension is enabled.', async () => {
-	const php = process.env.WITH_GD === 'dynamic'
+	const php = env.WITH_GD === 'dynamic'
 		? new PhpNode({sharedLibs:[`php${PhpNode.phpVersion}-gd.so`]})
 		: new PhpNode;
 
diff --git a/packages/iconv/test/basic.mjs b/packages/iconv/test/basic.mjs
@@ -1,9 +1,10 @@
 import { test } from 'node:test';
 import { strict as assert } from 'node:assert';
 import { PhpNode } from '../../../packages/php-wasm/PhpNode.mjs';
+import { env } from 'node:process';
 
 test('Iconv Extension is enabled.', async () => {
-	const php = process.env.WITH_INTL === 'dynamic'
+	const php = env.WITH_INTL === 'dynamic'
 		? new PhpNode({sharedLibs:[`php${PhpNode.phpVersion}-iconv.so`]})
 		: new PhpNode;
 
diff --git a/packages/intl/test/basic.mjs b/packages/intl/test/basic.mjs
@@ -1,9 +1,10 @@
 import { test } from 'node:test';
 import { strict as assert } from 'node:assert';
 import { PhpNode } from '../../../packages/php-wasm/PhpNode.mjs';
+import { env } from 'node:process';
 
 test('Intl Extension is enabled. (explicit)', async () => {
-	const php = process.env.WITH_INTL === 'dynamic'
+	const php = env.WITH_INTL === 'dynamic'
 		? new PhpNode({
 			sharedLibs: [`php${PhpNode.phpVersion}-intl.so`]
 			, files: [{parent: '/preload/', name: 'icudt72l.dat', url: './node_modules/php-wasm-intl/icudt72l.dat'}]
diff --git a/packages/libyaml/test/basic.mjs b/packages/libyaml/test/basic.mjs
@@ -1,9 +1,10 @@
 import { test } from 'node:test';
 import { strict as assert } from 'node:assert';
 import { PhpNode } from '../../../packages/php-wasm/PhpNode.mjs';
+import { env } from 'node:process';
 
 test('Yaml Extension is enabled.', async () => {
-	const php = process.env.WITH_YAML === 'dynamic'
+	const php = env.WITH_YAML === 'dynamic'
 		? new PhpNode({sharedLibs:[`php${PhpNode.phpVersion}-yaml.so`]})
 		: new PhpNode;
 
diff --git a/packages/libzip/test/basic.mjs b/packages/libzip/test/basic.mjs
@@ -1,9 +1,10 @@
 import { test } from 'node:test';
 import { strict as assert } from 'node:assert';
 import { PhpNode } from '../../../packages/php-wasm/PhpNode.mjs';
+import { env } from 'node:process';
 
 test('Zip Extension is enabled.', async () => {
-	const php = process.env.WITH_LIBZIP === 'dynamic'
+	const php = env.WITH_LIBZIP === 'dynamic'
 		? new PhpNode({sharedLibs:[`php${PhpNode.phpVersion}-zip.so`]})
 		: new PhpNode;
 
diff --git a/packages/openssl/test/basic.mjs b/packages/openssl/test/basic.mjs
@@ -1,9 +1,10 @@
 import { test } from 'node:test';
 import { strict as assert } from 'node:assert';
 import { PhpNode } from '../../../packages/php-wasm/PhpNode.mjs';
+import { env } from 'node:process';
 
 test('OpenSSL Extension is enabled.', async () => {
-	const php = process.env.WITH_OPENSSL === 'dynamic'
+	const php = env.WITH_OPENSSL === 'dynamic'
 		? new PhpNode({sharedLibs:[`php${PhpNode.phpVersion}-openssl.so`]})
 		: new PhpNode;
 	let stdOut = '', stdErr = '';
@@ -22,7 +23,7 @@ test('OpenSSL Extension is enabled.', async () => {
 });
 
 test('OpenSSL can generate SHA-256 hashes.', async () => {
-	const php = process.env.WITH_OPENSSL === 'dynamic'
+	const php = env.WITH_OPENSSL === 'dynamic'
 		? new PhpNode({sharedLibs:[`php${PhpNode.phpVersion}-openssl.so`]})
 		: new PhpNode;
 
diff --git a/packages/phar/test/basic.mjs b/packages/phar/test/basic.mjs
@@ -1,9 +1,10 @@
 import { test } from 'node:test';
 import { strict as assert } from 'node:assert';
 import { PhpNode } from '../../../packages/php-wasm/PhpNode.mjs';
+import { env } from 'node:process';
 
 test('Phar Extension is enabled.', async () => {
-	const php = process.env.WITH_PHAR === 'dynamic'
+	const php = env.WITH_PHAR === 'dynamic'
 		? new PhpNode({sharedLibs:[`php${PhpNode.phpVersion}-phar.so`]})
 		: new PhpNode;
 
diff --git a/packages/simplexml/test/basic.mjs b/packages/simplexml/test/basic.mjs
@@ -1,9 +1,10 @@
 import { test } from 'node:test';
 import { strict as assert } from 'node:assert';
 import { PhpNode } from '../../../packages/php-wasm/PhpNode.mjs';
+import { env } from 'node:process';
 
 test('SimpleXML Extension is enabled.', async () => {
-	const php = process.env.WITH_SIMPLEXML === 'dynamic'
+	const php = env.WITH_SIMPLEXML === 'dynamic'
 		? new PhpNode({sharedLibs:[`php${PhpNode.phpVersion}-simplexml.so`]})
 		: new PhpNode;
 
diff --git a/packages/sqlite/test/basic.mjs b/packages/sqlite/test/basic.mjs
@@ -1,9 +1,10 @@
 import { test } from 'node:test';
 import { strict as assert } from 'node:assert';
 import { PhpNode } from '../../../packages/php-wasm/PhpNode.mjs';
+import { env } from 'node:process';
 
 test('Sqlite3 Extension is enabled.', async () => {
-	const php = process.env.WITH_SQLITE === 'dynamic'
+	const php = env.WITH_SQLITE === 'dynamic'
 		? new PhpNode({sharedLibs:[`php${PhpNode.phpVersion}-sqlite.so`]})
 		: new PhpNode;
 
diff --git a/packages/tidy/test/basic.mjs b/packages/tidy/test/basic.mjs
@@ -1,9 +1,10 @@
 import { test } from 'node:test';
 import { strict as assert } from 'node:assert';
 import { PhpNode } from '../../../packages/php-wasm/PhpNode.mjs';
+import { env } from 'node:process';
 
 test('Tidy Extension is enabled.', async () => {
-	const php = process.env.WITH_TIDY === 'dynamic'
+	const php = env.WITH_TIDY === 'dynamic'
 		? new PhpNode({sharedLibs:[`php${PhpNode.phpVersion}-tidy.so`]})
 		: new PhpNode;
 
diff --git a/packages/vrzno/test/basic.mjs b/packages/vrzno/test/basic.mjs
diff --git a/packages/xml/test/basic.mjs b/packages/xml/test/basic.mjs
diff --git a/packages/zlib/test/basic.mjs b/packages/zlib/test/basic.mjs
diff --git a/test/basic.mjs b/test/basic.mjs
