Build intl dynamic extension for php wasm web JSPI 8.3

Author: mho22

packages/php-wasm/compile/build.js

@@ -91,11 +91,6 @@ const argParser = yargs(process.argv.slice(2))
 			choices: ['yes', 'no'],
 			description: 'Build with mbregex support',
 		},
-		WITH_INTL: {
-			type: 'string',
-			choices: ['yes', 'no'],
-			description: 'Build with intl support',
-		},
 		WITH_CLI_SAPI: {
 			type: 'string',
 			choices: ['yes', 'no'],
@@ -262,8 +257,6 @@ await asyncSpawn(
 		'--build-arg',
 		getArg('WITH_MBREGEX'),
 		'--build-arg',
-		getArg('WITH_INTL'),
-		'--build-arg',
 		getArg('WITH_CLI_SAPI'),
 		'--build-arg',
 		getArg('WITH_OPENSSL'),
@@ -331,17 +324,6 @@ await asyncSpawn(
 	{ cwd: sourceDir, stdio: 'inherit' }
 );
 
-// Copy data files
-const libDir = path.resolve(process.cwd(), 'packages/php-wasm/compile');
-const publicDir = `${path.dirname(path.dirname(outputDir))}`;
-if (getArg('WITH_INTL').endsWith('yes') && platform === 'web') {
-	await asyncSpawn(
-		'cp',
-		[`${libDir}/libintl/icudt74l.dat`, `${publicDir}/shared/icudt74l.dat`],
-		{ cwd: sourceDir, stdio: 'inherit' }
-	);
-}
-
 function asyncSpawn(...args) {
 	console.log('Running', args[0], args[1].join(' '), '...');
 	return new Promise((resolve, reject) => {

packages/php-wasm/compile/php/Dockerfile

@@ -45,7 +45,6 @@ COPY ./libsqlite3/ /root/builds/libsqlite3
 COPY ./libxml2/ /root/builds/libxml2
 COPY ./libz/ /root/builds/libz
 COPY ./oniguruma/ /root/builds/oniguruma
-COPY ./libintl/ /root/builds/libintl
 
 RUN if [ "$WITH_JSPI" = "yes" ]; then \
 	cp -r /root/builds/*/jspi/dist/root/lib/* /root/lib; \
@@ -71,11 +70,6 @@ else \
 	cp -r /root/builds-libopenssl/asyncify/dist/root/lib /libs/libopenssl; \
 fi
 
-# Workaround to add ICU FLAGS to intl below 7.3 to inject -fPIC.
-RUN if [[ "${PHP_VERSION:0:1}" -eq "7" && "${PHP_VERSION:2:1}" -eq "2" ]]; then \
-		sed -i "s/\$ICU_INCS/\$ICU_INCS \$ICU_CFLAGS/" /root/php-src/ext/intl/config.m4; \
-	fi;
-
 # Workaround to unbundle sqlite from PHP <7.4.
 # Prior to 7.4, PHP bundled sqlite internally,
 # leading compilation to fail with : wasm-ld: error: duplicate symbol: [sqlite3_xxx]
@@ -135,7 +129,6 @@ ARG OUTPUT_DIR_ON_HOST
 ARG WITH_DEBUG
 ARG DEBUG_DWARF_COMPILATION_DIR
 ARG WITH_WS_NETWORKING_PROXY
-ARG WITH_INTL
 
 # The platform to build for: web or node
 ARG EMSCRIPTEN_ENVIRONMENT=web
@@ -321,26 +314,6 @@ RUN if [ "$WITH_EXIF" = "yes" ]; \
 		echo -n ' --disable-exif ' >> /root/.php-configure-flags; \
 	fi;
 
-# Add intl if needed
-RUN if [ "$WITH_INTL" = "yes" ]; \
-	then \
-		if [ "${PHP_VERSION:0:1}" -eq "8" ] || [[ "${PHP_VERSION:0:1}" -eq "7" && "${PHP_VERSION:2:1}" -ge "2" ]]; then \
-			echo -n ' --enable-intl ' >> /root/.php-configure-flags; \
-			echo -n ' /root/lib/lib/libicudata.a /root/lib/lib/libicui18n.a /root/lib/lib/libicuio.a /root/lib/lib/libicutest.a /root/lib/lib/libicutu.a /root/lib/lib/libicuuc.a ' >> /root/.emcc-php-wasm-sources; \
-
-			if [[ "${PHP_VERSION:0:1}" -eq "7" && "${PHP_VERSION:2:1}" -le "3" ]]; then \
-				/root/replace.sh 's/UBool operator/bool operator/' /root/php-src/ext/intl/breakiterator/codepointiterator_internal.h; \
-				/root/replace.sh 's/UBool CodePointBreakIterator::operator/bool CodePointBreakIterator::operator/' /root/php-src/ext/intl/breakiterator/codepointiterator_internal.cpp; \
-				/root/replace.sh 's/ getArg/ phpGetArg/g; s/::getArg/::phpGetArg/g; s/ getMessage/ phpGetMessage/g; s/::getMessage/::phpGetMessage/g' /root/php-src/ext/intl/msgformat/msgformat_helpers.cpp; \
-			fi; \
-
-			if [[ "${PHP_VERSION:0:1}" -eq "7" && "${PHP_VERSION:2:1}" -eq "2" ]]; then \
-				files=( /root/php-src/ext/intl/collator/collator_sort.c /root/php-src/ext/intl/normalizer/normalizer_normalize.c /root/php-src/ext/intl/dateformat/dateformat_attr.c /root/php-src/ext/intl/timezone/timezone_class.cpp /root/php-src/ext/intl/timezone/timezone_methods.cpp /root/php-src/ext/intl/breakiterator/codepointiterator_internal.cpp ); \
-				for file in "${files[@]}"; do /root/replace.sh 's/\bFALSE\b/false/g; s/\bTRUE\b/true/g' "$file"; done; \
-			fi; \
-		fi; \
-	fi
-
 # Add mbregex if needed
 RUN if [ "$WITH_MBREGEX" = "yes" ] && [ "${PHP_VERSION:0:3}" != "7.0" ]; \
 	then \

packages/php-wasm/compile/shared/build.js

@@ -19,18 +19,23 @@ const argParser = yargs(process.argv.slice(2))
 			required: true,
 		},
 		OUTPUT_DIR: {
-			type: 'string',
+			type: 'array',
 			description: 'The output directory',
 			required: true,
 		},
+		SHARED_DIR: {
+			type: 'array',
+			description: 'The shared directory',
+			required: true,
+		},
 		WITH_DEBUG: {
 			type: 'string',
 			choices: ['yes', 'no'],
 			description: 'Build with DWARF debug information.',
 		},
 		WITH_JSPI: {
-			type: 'boolean',
-			default: false,
+			type: 'string',
+			choices: ['yes', 'no'],
 			description: 'Build with JSPI support',
 		},
 	});
@@ -66,7 +71,9 @@ if (!requestedVersion || requestedVersion === 'undefined') {
 }
 
 const sourceDir = path.dirname(new URL(import.meta.url).pathname);
-const outputDir = path.resolve(process.cwd(), args['OUTPUT_DIR']);
+const outputDirs = args['OUTPUT_DIR'].map((dir) =>
+	path.resolve(process.cwd(), dir)
+);
 
 // Build the base image
 await asyncSpawn('make', ['base-image'], {
@@ -98,27 +105,29 @@ await asyncSpawn(
 
 const version = args['PHP_VERSION'].replace('.', '_');
 
-// Store the shared library
-await asyncSpawn(
-	'docker',
-	[
-		'run',
-		'--name',
-		'playground-php-wasm-tmp',
-		'--rm',
-		'-v',
-		`${outputDir}:/output`,
-		`playground-php-wasm:${library}`,
-		// Use sh -c because wildcards are a shell feature and
-		// they don't work without running cp through shell.
-		'sh',
-		'-c',
-		`rm -rf /output/extensions/${library}/${version} && \
-			mkdir -p /output/extensions/${library}/${version} && \
-			cp -rf /root/${library}/modules/* /output/extensions/${library}/${version}`,
-	],
-	{ cwd: path.dirname(sourceDir), stdio: 'inherit' }
-);
+// Store the shared library in output directories
+for (const outputDir of outputDirs) {
+	await asyncSpawn(
+		'docker',
+		[
+			'run',
+			'--name',
+			'playground-php-wasm-tmp',
+			'--rm',
+			'-v',
+			`${outputDir}:/output`,
+			`playground-php-wasm:${library}`,
+			// Use sh -c because wildcards are a shell feature and
+			// they don't work without running cp through shell.
+			'sh',
+			'-c',
+			`rm -rf /output/extensions/${library}/${version} && \
+				mkdir -p /output/extensions/${library}/${version} && \
+				cp -rf /root/${library}/modules/* /output/extensions/${library}/${version}`,
+		],
+		{ cwd: path.dirname(sourceDir), stdio: 'inherit' }
+	);
+}
 
 // Store the shared data if any
 await asyncSpawn(
@@ -142,16 +151,19 @@ await asyncSpawn(
 	{ cwd: path.dirname(sourceDir), stdio: 'inherit' }
 );
 
+const sharedDirs = args['SHARED_DIR'].map((dir) =>
+	path.resolve(process.cwd(), dir)
+);
+
 // Copy data files
 if (fs.existsSync(`${sourceDir}/${library}/data`)) {
-	const publicDir = `${path.dirname(
-		outputDir
-	)}/src/lib/extensions/${library}/shared`;
-	await asyncSpawn(
-		'sh',
-		['-c', `cp ${sourceDir}/${library}/data/* ${publicDir}`],
-		{ cwd: sourceDir, stdio: 'inherit' }
-	);
+	for (const sharedDir of sharedDirs) {
+		await asyncSpawn(
+			'sh',
+			['-c', `cp ${sourceDir}/${library}/data/* ${sharedDir}`],
+			{ cwd: sourceDir, stdio: 'inherit' }
+		);
+	}
 }
 
 function asyncSpawn(...args) {

packages/php-wasm/compile/shared/project.json

@@ -6,7 +6,7 @@
 			"executor": "nx:run-commands",
 			"options": {
 				"commands": [
-					"node packages/php-wasm/compile/shared/build.js --LIBRARY_NAME=intl --OUTPUT_DIR=packages/php-wasm/node/jspi --WITH_JSPI=yes"
+					"node packages/php-wasm/compile/shared/build.js --LIBRARY_NAME=intl --WITH_JSPI=yes --OUTPUT_DIR=packages/php-wasm/node/jspi --SHARED_DIR=packages/php-wasm/node/src/lib/extensions/intl/shared --OUTPUT_DIR=packages/php-wasm/web/public/php/jspi --SHARED_DIR=packages/php-wasm/web/public/shared"
 				],
 				"parallel": false
 			}
@@ -31,7 +31,7 @@
 			"executor": "nx:run-commands",
 			"options": {
 				"commands": [
-					"node packages/php-wasm/compile/shared/build.js --LIBRARY_NAME=intl --OUTPUT_DIR=packages/php-wasm/node/asyncify"
+					"node packages/php-wasm/compile/shared/build.js --LIBRARY_NAME=intl --OUTPUT_DIR=packages/php-wasm/node/asyncify --SHARED_DIR=packages/php-wasm/node/src/lib/extensions/intl/shared --OUTPUT_DIR=packages/php-wasm/web/public/php/asyncify --SHARED_DIR=packages/php-wasm/web/public/shared"
 				],
 				"parallel": false
 			}

packages/php-wasm/node/asyncify/extensions/intl/8_3/intl.so

@@ -115,14 +115,6 @@
 				"maxWarnings": 0
 			}
 		},
-		"test": {
-			"executor": "@nx/vite:test",
-			"outputs": ["{workspaceRoot}/coverage/packages/php-wasm/web"],
-			"options": {
-				"passWithNoTests": true,
-				"reportsDirectory": "../../coverage/packages/php-wasm/web"
-			}
-		},
 		"typecheck": {
 			"executor": "nx:run-commands",
 			"options": {