Merge branch 'php:master' into master

.circleci/config.yml

@@ -46,7 +46,6 @@ jobs:
               libicu-dev \
               libtidy-dev \
               libenchant-2-dev \
-              libaspell-dev \
               libsasl2-dev \
               libxpm-dev \
               libzip-dev \
@@ -149,9 +148,6 @@ jobs:
               --with-qdbm \
               --with-snmp \
               `#--with-unixODBC` \
-              --with-imap \
-              --with-kerberos \
-              --with-imap-ssl \
               `#--with-pdo-odbc=unixODBC,/usr` \
               `#--with-pdo-oci=shared,instantclient,/opt/oracle/instantclient` \
               `#--with-oci8=shared,instantclient,/opt/oracle/instantclient` \

.gdbinit

@@ -66,18 +66,18 @@ define dump_bt
 		if $func
 			if $ex->This->value.obj
 				if $func->common.scope
-					printf "%s->", $func->common.scope->name->val
+					printf "%s->", (char*)$func->common.scope->name->val
 				else
-					printf "%s->", $ex->This->value.obj->ce.name->val
+					printf "%s->", (char*)$ex->This->value.obj->ce.name->val
 				end
 			else
 				if $func->common.scope
-					printf "%s::", $func->common.scope->name->val
+					printf "%s::", (char*)$func->common.scope->name->val
 				end
 			end
 
 			if $func->common.function_name
-				printf "%s(", $func->common.function_name->val
+				printf "%s(", (char*)$func->common.function_name->val
 			else
 				printf "(main"
 			end
@@ -109,7 +109,7 @@ define dump_bt
 					printf "%f", $zvalue->value.dval
 				end
 				if $type == 6
-					____print_str $zvalue->value.str->val $zvalue->value.str->len
+					____print_str (char*)$zvalue->value.str->val $zvalue->value.str->len
 				end
 				if $type == 7
 					printf "array(%d)[%p]", $zvalue->value.arr->nNumOfElements, $zvalue
@@ -135,7 +135,7 @@ define dump_bt
 		end
 		if $func != 0
 			if $func->type == 2
-				printf "%s:%d ", $func->op_array.filename->val, $ex->opline->lineno
+				printf "%s:%d ", (char*)$func->op_array.filename->val, $ex->opline->lineno
 			else
 				printf "[internal function]"
 			end
@@ -186,7 +186,7 @@ define ____printzv_contents
 		printf "double: %f", $zvalue->value.dval
 	end
 	if $type == 6
-		printf "string: %s", $zvalue->value.str->val
+		printf "string: %s", (char*)$zvalue->value.str->val
 	end
 	if $type == 7
 		printf "array: "
@@ -208,7 +208,7 @@ define ____printzv_contents
 		set $handle = $zvalue->value.obj.handle
 		set $handlers = $zvalue->value.obj.handlers
 		set $zobj = $zvalue->value.obj
-		set $cname = $zobj->ce->name->val
+		set $cname = (char*)$zobj->ce->name->val
 		printf "(%s) #%d", $cname, $handle
 		if ! $arg1
 			if $handlers->get_properties == &zend_std_get_properties
@@ -233,7 +233,7 @@ define ____printzv_contents
 						set $name = $p->key
 						set $prop = (zend_property_info*)$p->val.value.ptr
 						set $val = (zval*)((char*)$zobj + $prop->offset)
-						printf "%s => ", $name->val
+						printf "%s => ", (char*)$name->val
 						printzv $val
 						set $k = $k + 1
 					end
@@ -348,7 +348,7 @@ define ____print_ht
 			end
 			printf "[%d] ", $i
 			if $key
-				____print_str $key->val $key->len
+				____print_str (char*)$key->val $key->len
 				printf " => "
 			else
 				printf "%d => ", $h
@@ -365,7 +365,7 @@ define ____print_ht
 			end
 			if $arg1 == 3
 				set $func = (zend_function*)$val->value.ptr
-				printf "\"%s\"\n", $func->common.function_name->val
+				printf "\"%s\"\n", (char*)$func->common.function_name->val
 			end
 			if $arg1 == 4
 				set $const = (zend_constant *)$val->value.ptr
@@ -423,15 +423,15 @@ define ____print_inh_class
 			printf "final "
 		end
 	end
-	printf "class %s", $ce->name->val
+	printf "class %s", (char*)$ce->name->val
 	if $ce->parent != 0
-		printf " extends %s", $ce->parent->name->val
+		printf " extends %s", (char*)$ce->parent->name->val
 	end
 	if $ce->num_interfaces != 0
 		printf " implements"
 		set $tmp = 0
 		while $tmp < $ce->num_interfaces
-			printf " %s", $ce->interfaces[$tmp]->name->val
+			printf " %s", (char*)$ce->interfaces[$tmp]->name->val
 			set $tmp = $tmp + 1
 			if $tmp < $ce->num_interfaces
 				printf ","
@@ -443,10 +443,10 @@ end
 
 define ____print_inh_iface
 	set $ce = $arg0
-	printf "interface %s", $ce->name->val
+	printf "interface %s", (char*)$ce->name->val
 	if $ce->num_interfaces != 0
 		set $ce = $ce->interfaces[0]
-		printf " extends %s", $ce->name->val
+		printf " extends %s", (char*)$ce->name->val
 	else
 		set $ce = 0
 	end
@@ -486,7 +486,7 @@ define print_pi
 	set $ptr_to_val = (zval*)((char*)$pi->ce->default_properties_table + $pi->offset - $initial_offset)
 	printf "[%p] {\n", $pi
 	printf "    offset = %p\n", $pi->offset
-	printf "    ce = [%p] %s\n", $pi->ce, $pi->ce->name->val
+	printf "    ce = [%p] %s\n", $pi->ce, (char*)$pi->ce->name->val
 	printf "    flags = 0x%x (", $pi->flags
 	if $pi->flags & 0x100
 		printf "ZEND_ACC_PUBLIC"
@@ -608,7 +608,7 @@ define print_zstr
 		set $maxlen = $zstr->len
 	end
 	printf "string(%d) ", $zstr->len
-	____print_str $zstr->val $zstr->len $maxlen
+	____print_str (char*)$zstr->val $zstr->len $maxlen
 	printf "\n"
 end
 

.github/actions/apt-x32/action.yml

@@ -17,7 +17,6 @@ runs:
           g++-multilib \
           gcc-multilib \
           language-pack-de \
-          libaspell-dev:i386 \
           libbz2-dev:i386 \
           libc6:i386 \
           libcurl4-openssl-dev:i386 \

.github/actions/apt-x64/action.yml

@@ -32,7 +32,6 @@ runs:
           libicu-dev \
           libtidy-dev \
           libenchant-2-dev \
-          libaspell-dev \
           libbz2-dev \
           libsasl2-dev \
           libxpm-dev \

.github/actions/brew/action.yml

@@ -31,6 +31,7 @@ runs:
           tidy-html5 \
           libxml2 \
           libjpeg \
+          libsodium \
           libxslt \
           postgresql
         brew link icu4c gettext --force

.github/actions/configure-macos/action.yml

@@ -9,24 +9,25 @@ runs:
     - shell: bash
       run: |
         set -x
-        export PATH="/usr/local/opt/bison/bin:$PATH"
-        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/openssl@1.1/lib/pkgconfig"
-        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/curl/lib/pkgconfig"
-        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/krb5/lib/pkgconfig"
-        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/libffi/lib/pkgconfig"
-        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/libxml2/lib/pkgconfig"
-        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/libxslt/lib/pkgconfig"
-        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/zlib/lib/pkgconfig"
-        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/icu4c/lib/pkgconfig"
+        BREW_OPT="$(brew --prefix)"/opt
+        export PATH="$BREW_OPT/bison/bin:$PATH"
+        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/openssl@1.1/lib/pkgconfig"
+        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/curl/lib/pkgconfig"
+        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/krb5/lib/pkgconfig"
+        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/libffi/lib/pkgconfig"
+        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/libxml2/lib/pkgconfig"
+        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/libxslt/lib/pkgconfig"
+        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/zlib/lib/pkgconfig"
+        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/icu4c/lib/pkgconfig"
         ./buildconf --force
         ./configure \
           --enable-option-checking=fatal \
           --prefix=/usr/local \
           --enable-fpm \
           --with-pdo-mysql=mysqlnd \
           --with-mysqli=mysqlnd \
-          --with-pgsql=/usr/local/opt/libpq \
-          --with-pdo-pgsql=/usr/local/opt/libpq \
+          --with-pgsql="$BREW_OPT"/libpq \
+          --with-pdo-pgsql="$BREW_OPT"/libpq \
           --with-pdo-sqlite \
           --without-pear \
           --enable-gd \
@@ -39,21 +40,21 @@ runs:
           --enable-soap \
           --enable-xmlreader \
           --with-xsl \
-          --with-tidy=/usr/local/opt/tidy-html5 \
+          --with-tidy="$BREW_OPT"/tidy-html5 \
           --with-libxml \
           --enable-sysvsem \
           --enable-sysvshm \
           --enable-shmop \
           --enable-pcntl \
-          --with-readline=/usr/local/opt/readline \
+          --with-readline="$BREW_OPT"/readline \
           --enable-mbstring \
           --with-curl \
-          --with-gettext=/usr/local/opt/gettext \
+          --with-gettext="$BREW_OPT"/gettext \
           --enable-sockets \
-          --with-bz2=/usr/local/opt/bzip2 \
+          --with-bz2="$BREW_OPT"/bzip2 \
           --with-openssl \
-          --with-gmp=/usr/local/opt/gmp \
-          --with-iconv=/usr/local/opt/libiconv \
+          --with-gmp="$BREW_OPT"/gmp \
+          --with-iconv="$BREW_OPT"/libiconv \
           --enable-bcmath \
           --enable-calendar \
           --enable-ftp \

.github/actions/configure-x64/action.yml

@@ -72,8 +72,6 @@ runs:
           --with-qdbm \
           ${{ inputs.skipSlow == 'false' && '--with-snmp' || '' }} \
           ${{ inputs.skipSlow == 'false' && '--with-unixODBC' || '' }} \
-          ${{ inputs.skipSlow == 'false' && '--with-imap' || '' }} \
-          ${{ inputs.skipSlow == 'false' && '--with-imap-ssl' || '' }} \
           ${{ inputs.skipSlow == 'false' && '--with-pdo-odbc=unixODBC,/usr' || '' }} \
           $([ -d "/opt/oracle/instantclient" ] && echo '--with-pdo-oci=shared,instantclient,/opt/oracle/instantclient') \
           $([ -d "/opt/oracle/instantclient" ] && echo '--with-oci8=shared,instantclient,/opt/oracle/instantclient') \

.github/actions/setup-caddy/action.yml

@@ -3,8 +3,10 @@ runs:
   using: composite
   steps:
     - shell: bash
+      env:
+        GH_TOKEN: ${{ github.token }}
       run: |
         set -x
-        sudo curl 'https://caddyserver.com/api/download?os=linux&arch=amd64' -o /usr/bin/caddy
+        gh release -R caddyserver/caddy download --pattern 'caddy_*_linux_amd64.tar.gz' -O - | sudo tar -xz -C /usr/bin caddy
         sudo chmod +x /usr/bin/caddy
         sudo caddy start --config ext/curl/tests/Caddyfile

.github/actions/test-linux/action.yml

@@ -9,6 +9,9 @@ inputs:
   jitType:
     default: 'disable'
     required: false
+  idleCpu:
+    default: 'false'
+    required: false
 runs:
   using: composite
   steps:
@@ -50,14 +53,14 @@ runs:
           -d opcache.jit=${{ inputs.jitType }} \
           -d opcache.protect_memory=1 \
           -d opcache.jit_buffer_size=64M \
-          -j$(/usr/bin/nproc) \
+          ${{ inputs.idleCpu == 'true' && '-j$(($(/usr/bin/nproc) - 1))' || '-j$(/usr/bin/nproc)' }} \
           -g FAIL,BORK,LEAK,XLEAK \
           --no-progress \
           --offline \
           --show-diff \
           --show-slow 1000 \
           --set-timeout 120
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       if: always() && inputs.testArtifacts != null
       with:
         name: ${{ github.job }}_${{ inputs.testArtifacts }}

.github/actions/test-macos/action.yml

@@ -23,14 +23,14 @@ runs:
           -d opcache.jit=${{ inputs.jitType }} \
           -d opcache.protect_memory=1 \
           -d opcache.jit_buffer_size=64M \
-          -j$(sysctl -n hw.ncpu) \
+          -j$(($(sysctl -n hw.ncpu) - 1)) \
           -g FAIL,BORK,LEAK,XLEAK \
           --no-progress \
           --offline \
           --show-diff \
           --show-slow 1000 \
           --set-timeout 120
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       if: always() && inputs.testArtifacts != null
       with:
         name: ${{ github.job }}_${{ inputs.testArtifacts }}

.github/actions/verify-generated-files/action.yml

@@ -5,7 +5,7 @@ runs:
     - shell: bash
       run: |
         set -x
-        [[ "$OSTYPE" == "darwin"* ]] && export PATH="/usr/local/opt/bison/bin:$PATH"
+        [[ "$OSTYPE" == "darwin"* ]] && export PATH="$(brew --prefix)/opt/bison/bin:$PATH"
         scripts/dev/credits
         scripts/dev/genfiles
         Zend/zend_vm_gen.php

.github/labeler.yml

@@ -74,9 +74,6 @@
 "Extension: iconv":
 - ext/iconv/**/*
 
-"Extension: imap":
-- ext/imap/**/*
-
 "Extension: intl":
 - ext/intl/**/*