Update PHP and dependencies, added ext-encoding for experimental usage

Author: dktapps

compile.sh

@@ -1,17 +1,17 @@
 #!/usr/bin/env bash
-[ -z "$PHP_VERSION" ] && PHP_VERSION="8.1.24"
+[ -z "$PHP_VERSION" ] && PHP_VERSION="8.1.25"
 
 ZLIB_VERSION="1.3"
 GMP_VERSION="6.3.0"
-CURL_VERSION="curl-8_3_0"
+CURL_VERSION="curl-8_4_0"
 YAML_VERSION="0.2.5"
 LEVELDB_VERSION="1c7564468b41610da4f498430e795ca4de0931ff"
 LIBXML_VERSION="2.10.1" #2.10.2 requires automake 1.16.3, which isn't easily available on Ubuntu 20.04
 LIBPNG_VERSION="1.6.40"
 LIBJPEG_VERSION="9e"
-OPENSSL_VERSION="3.1.3"
+OPENSSL_VERSION="3.1.4"
 LIBZIP_VERSION="1.10.1"
-SQLITE3_VERSION="3430100" #3.43.1
+SQLITE3_VERSION="3440000" #3.44.0
 LIBDEFLATE_VERSION="dd12ff2b36d603dbb7fa8838fe7e7176fcbd4f6f" #1.19
 
 EXT_PTHREADS_VERSION="4.2.2"
@@ -26,7 +26,8 @@ EXT_RECURSIONGUARD_VERSION="0.1.0"
 EXT_LIBDEFLATE_VERSION="0.2.1"
 EXT_MORTON_VERSION="0.1.2"
 EXT_XXHASH_VERSION="0.2.0"
-EXT_ARRAYDEBUG_VERSION="0.1.0"
+EXT_ARRAYDEBUG_VERSION="0.2.0"
+EXT_ENCODING_VERSION="0.2.3"
 
 function write_out {
 	echo "[$1] $2"
@@ -347,7 +348,7 @@ else
 			LDFLAGS="$LDFLAGS -Wl,-rpath,@loader_path/../lib";
 			export DYLD_LIBRARY_PATH="@loader_path/../lib"
 		fi
-		CFLAGS="$CFLAGS -Qunused-arguments -Wno-error=unused-command-line-argument-hard-error-in-future"
+		CFLAGS="$CFLAGS -Qunused-arguments"
 		GMP_ABI="64"
 		OPENSSL_TARGET="darwin64-x86_64-cc"
 		CMAKE_GLOBAL_EXTRA_FLAGS="-DCMAKE_OSX_ARCHITECTURES=x86_64"
@@ -431,25 +432,25 @@ fi
 if [ "$mtune" != "none" ]; then
 	$CC -march=$march -mtune=$mtune $CFLAGS -o test test.c >> "$DIR/install.log" 2>&1
 	if [ $? -eq 0 ]; then
-		CFLAGS="-march=$march -mtune=$mtune -fno-gcse $CFLAGS"
+		CFLAGS="-march=$march -mtune=$mtune $CFLAGS"
 	fi
 else
 	$CC -march=$march $CFLAGS -o test test.c >> "$DIR/install.log" 2>&1
 	if [ $? -eq 0 ]; then
-		CFLAGS="-march=$march -fno-gcse $CFLAGS"
+		CFLAGS="-march=$march $CFLAGS"
 	fi
 fi
 
 if [ "$DO_OPTIMIZE" != "no" ]; then
 	#FLAGS_LTO="-fvisibility=hidden -flto"
 	CFLAGS="$CFLAGS -O2"
-	GENERIC_CFLAGS="$CFLAGS -ftree-vectorize -fomit-frame-pointer -funswitch-loops -fivopts"
+	GENERIC_CFLAGS="$CFLAGS -ftree-vectorize -fomit-frame-pointer"
 	$CC $CFLAGS $GENERIC_CFLAGS -o test test.c >> "$DIR/install.log" 2>&1
 	if [ $? -eq 0 ]; then
 		CFLAGS="$CFLAGS $GENERIC_CFLAGS"
 	fi
 	#clang does not understand the following and will fail
-	GCC_CFLAGS="$CFLAGS -funsafe-loop-optimizations -fpredictive-commoning -ftracer -ftree-loop-im -frename-registers -fcx-limited-range"
+	GCC_CFLAGS="$CFLAGS -funsafe-loop-optimizations -fpredictive-commoning -ftracer -ftree-loop-im -frename-registers -fcx-limited-range -funswitch-loops -fivopts -fno-gcse"
 	$CC $CFLAGS $GCC_CFLAGS -o test test.c >> "$DIR/install.log" 2>&1
 	if [ $? -eq 0 ]; then
 		CFLAGS="$CFLAGS $GCC_CFLAGS"
@@ -1065,6 +1066,8 @@ get_github_extension "xxhash" "$EXT_XXHASH_VERSION" "pmmp" "ext-xxhash"
 
 get_github_extension "arraydebug" "$EXT_ARRAYDEBUG_VERSION" "pmmp" "ext-arraydebug"
 
+get_github_extension "encoding" "$EXT_ENCODING_VERSION" "pmmp" "ext-encoding"
+
 write_library "PHP" "$PHP_VERSION"
 
 write_configure
@@ -1190,6 +1193,7 @@ $HAVE_MYSQLI \
 --enable-recursionguard \
 --enable-xxhash \
 --enable-arraydebug \
+--enable-encoding \
 $HAVE_VALGRIND \
 $CONFIGURE_FLAGS >> "$DIR/install.log" 2>&1
 write_compile

windows-compile-vs.bat

@@ -3,7 +3,7 @@
 REM For future users: This file MUST have CRLF line endings. If it doesn't, lots of inexplicable undesirable strange behaviour will result.
 REM Also: Don't modify this version with sed, or it will screw up your line endings.
 set PHP_MAJOR_VER=8.1
-set PHP_VER=%PHP_MAJOR_VER%.24
+set PHP_VER=%PHP_MAJOR_VER%.25
 set PHP_GIT_REV=php-%PHP_VER%
 set PHP_DISPLAY_VER=%PHP_VER%
 set PHP_SDK_VER=2.2.0
@@ -35,7 +35,8 @@ set PHP_MORTON_VER=0.1.2
 set PHP_LIBDEFLATE_VER=0.2.1
 set PHP_XXHASH_VER=0.2.0
 set PHP_XDEBUG_VER=3.2.2
-set PHP_ARRAYDEBUG_VER=0.1.0
+set PHP_ARRAYDEBUG_VER=0.2.0
+set PHP_ENCODING_VER=0.2.3
 
 set script_path=%~dp0
 set log_file=%script_path%compile.log
@@ -269,6 +270,7 @@ call configure^
  --enable-chunkutils2=shared^
  --enable-com-dotnet^
  --enable-ctype^
+ --enable-encoding=shared^
  --enable-fileinfo=shared^
  --enable-filter^
  --enable-hash^
@@ -363,7 +365,6 @@ if "%PM_VERSION_MAJOR%" geq "5" (
 (echo opcache.file_update_protection=0)>>"%php_ini%"
 (echo opcache.optimization_level=0x7FFEBFFF)>>"%php_ini%"
 (echo opcache.cache_id=PHP_BINARY ;prevent sharing SHM between different binaries - they won't work because of ASLR)>>"%php_ini%"
-(echo ;Optional extensions, supplied for PM3 use)>>"%php_ini%"
 (echo ;Optional extensions, supplied for plugin use)>>"%php_ini%"
 (echo extension=php_fileinfo.dll)>>"%php_ini%"
 (echo extension=php_gd.dll)>>"%php_ini%"
@@ -391,6 +392,8 @@ if "%PHP_JIT_ENABLE_ARG%"=="on" (
 (echo xdebug.profiler_output_name=cachegrind.%%s.%%p.%%r)>>"%php_ini%"
 (echo xdebug.gc_stats_output_name=gcstats.%%s.%%p.%%r)>>"%php_ini%"
 (echo xdebug.trace_output_name=trace.%%s.%%p.%%r)>>"%php_ini%"
+(echo ;Optional experimental extensions)>>"%php_ini%"
+(echo extension=php_encoding.dll)>>"%php_ini%"
 
 call :pm-echo "Xdebug is included, but disabled by default. To enable it, change 'xdebug.mode' in your php.ini file."