Merge tag 'php-8.1.25' into was-8.1.x

Tag for php 8.1.25

Author: MaxKellermann

.cirrus.yml

@@ -3,6 +3,7 @@ env:
 
 freebsd_task:
   name: FREEBSD_DEBUG_NTS
+  only_if: $CIRRUS_CRON == 'nightly' || $CIRRUS_CHANGE_TITLE =~ '.*\[ci freebsd\].*'
   freebsd_instance:
     image_family: freebsd-13-2
   env:
@@ -29,6 +30,7 @@ freebsd_task:
 
 arm_task:
   name: ARM_DEBUG_NTS
+  only_if: $CIRRUS_CRON == 'nightly' || $CIRRUS_CHANGE_TITLE =~ '.*\[ci arm\].*'
   arm_container:
     image: debian:11
     additional_containers:

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

@@ -3,6 +3,9 @@ inputs:
   runTestsParameters:
     default: ''
     required: false
+  jitType:
+    default: 'disable'
+    required: false
 runs:
   using: composite
   steps:
@@ -27,6 +30,7 @@ runs:
         export PDO_OCI_TEST_DSN="oci:dbname=localhost/XEPDB1;charset=AL32UTF8"
         export SKIP_IO_CAPTURE_TESTS=1
         sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
+          -d opcache.jit=${{ inputs.jitType }} \
           -j$(/usr/bin/nproc) \
           -g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP \
           --offline \

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

@@ -3,6 +3,9 @@ inputs:
   runTestsParameters:
     default: ''
     required: false
+  jitType:
+    default: 'disable'
+    required: false
 runs:
   using: composite
   steps:
@@ -12,6 +15,7 @@ runs:
         export SKIP_IO_CAPTURE_TESTS=1
         export CI_NO_IPV6=1
         sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
+          -d opcache.jit=${{ inputs.jitType }} \
           -j$(sysctl -n hw.ncpu) \
           -g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP \
           --offline \

.github/scripts/windows/test_task.bat

@@ -32,8 +32,7 @@ set PDO_MYSQL_TEST_PASS=%MYSQL_PWD%
 set PDO_MYSQL_TEST_HOST=%MYSQL_TEST_HOST%
 set PDO_MYSQL_TEST_PORT=%MYSQL_TEST_PORT%
 set PDO_MYSQL_TEST_DSN=mysql:host=%PDO_MYSQL_TEST_HOST%;port=%PDO_MYSQL_TEST_PORT%;dbname=test
-set TMP_MYSQL_BIN=C:\mysql\bin
-"%TMP_MYSQL_BIN%\mysql.exe" --host=%PDO_MYSQL_TEST_HOST% --port=%MYSQL_TEST_PORT% --user=%MYSQL_TEST_USER% --password=%MYSQL_TEST_PASSWD% -e "CREATE DATABASE IF NOT EXISTS test"
+mysql --host=%PDO_MYSQL_TEST_HOST% --port=%MYSQL_TEST_PORT% --user=%MYSQL_TEST_USER% --password=%MYSQL_TEST_PASSWD% -e "CREATE DATABASE IF NOT EXISTS test"
 if %errorlevel% neq 0 exit /b 3
 
 rem setup PostgreSQL related exts

.github/workflows/nightly.yml

@@ -13,7 +13,7 @@ jobs:
       matrix-include: ${{ steps.set-matrix.outputs.matrix-include }}
       windows-matrix-include: ${{ steps.set-matrix.outputs.windows-matrix-include }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           # Set fetch-depth to 0 to clone the full repository
           # including all branches. This is required to find
@@ -54,7 +54,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ matrix.branch.ref }}
       - name: Create MSSQL container
@@ -84,6 +84,7 @@ jobs:
       - name: Test Tracing JIT
         uses: ./.github/actions/test-linux
         with:
+          jitType: tracing
           runTestsParameters: >-
             ${{ matrix.run_tests_parameters }}
             -d zend_extension=opcache.so
@@ -102,12 +103,12 @@ jobs:
         if: matrix.test_function_jit
         uses: ./.github/actions/test-linux
         with:
+          jitType: function
           runTestsParameters: >-
             ${{ matrix.run_tests_parameters }}
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
             -d opcache.jit_buffer_size=16M
-            -d opcache.jit=1205
       - name: Verify generated files are up to date
         uses: ./.github/actions/verify-generated-files
       - name: Notify Slack
@@ -142,7 +143,7 @@ jobs:
           MYSQL_ROOT_PASSWORD: root
     steps:
       - name: git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ matrix.branch.ref }}
       - name: apt
@@ -165,6 +166,7 @@ jobs:
       - name: Test Tracing JIT
         uses: ./.github/actions/test-linux
         with:
+          jitType: tracing
           runTestsParameters: >-
             ${{ matrix.run_tests_parameters }}
             -d zend_extension=opcache.so
@@ -180,12 +182,12 @@ jobs:
       - name: Test Function JIT
         uses: ./.github/actions/test-linux
         with:
+          jitType: function
           runTestsParameters: >-
             ${{ matrix.run_tests_parameters }}
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
             -d opcache.jit_buffer_size=16M
-            -d opcache.jit=1205
       - name: Notify Slack
         if: failure()
         uses: ./.github/actions/notify-slack
@@ -201,10 +203,10 @@ jobs:
         debug: [true, false]
         zts: [true, false]
     name: "${{ matrix.branch.name }}_MACOS_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
-    runs-on: macos-11
+    runs-on: macos-12
     steps:
       - name: git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ matrix.branch.ref }}
       - name: brew
@@ -226,6 +228,7 @@ jobs:
       - name: Test Tracing JIT
         uses: ./.github/actions/test-macos
         with:
+          jitType: tracing
           runTestsParameters: >-
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
@@ -241,12 +244,12 @@ jobs:
       - name: Test Function JIT
         uses: ./.github/actions/test-macos
         with:
+          jitType: function
           runTestsParameters: >-
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
             -d opcache.protect_memory=1
             -d opcache.jit_buffer_size=16M
-            -d opcache.jit=1205
       - name: Verify generated files are up to date
         uses: ./.github/actions/verify-generated-files
       - name: Notify Slack
@@ -259,7 +262,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Create MSSQL container
         uses: ./.github/actions/setup-mssql
       - name: Create Oracle container
@@ -308,7 +311,7 @@ jobs:
       USE_TRACKED_ALLOC: 1
     steps:
       - name: git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ matrix.branch.ref }}
       - name: apt
@@ -424,7 +427,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ matrix.branch.ref }}
       - name: Create MSSQL container
@@ -500,7 +503,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ matrix.branch.ref }}
       - name: apt
@@ -599,7 +602,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ matrix.branch.ref }}
       - name: apt
@@ -670,7 +673,7 @@ jobs:
       - name: git config
         run: git config --global core.autocrlf false && git config --global core.eol lf
       - name: git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ matrix.branch.ref }}
       - name: Setup

.github/workflows/push.yml

@@ -51,7 +51,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Create MSSQL container
         uses: ./.github/actions/setup-mssql
       - name: Create Oracle container
@@ -85,17 +85,18 @@ jobs:
       - name: Test Tracing JIT
         uses: ./.github/actions/test-linux
         with:
+          jitType: tracing
           runTestsParameters: >-
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
             -d opcache.jit_buffer_size=16M
       - name: Verify generated files are up to date
         uses: ./.github/actions/verify-generated-files
   MACOS_DEBUG_NTS:
-    runs-on: macos-11
+    runs-on: macos-12
     steps:
       - name: git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: brew
         uses: ./.github/actions/brew
       - name: ccache
@@ -116,6 +117,7 @@ jobs:
       - name: Test Tracing JIT
         uses: ./.github/actions/test-macos
         with:
+          jitType: tracing
           runTestsParameters: >-
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
@@ -141,7 +143,7 @@ jobs:
       - name: git config
         run: git config --global core.autocrlf false && git config --global core.eol lf
       - name: git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup
         uses: ./.github/actions/setup-windows
       - name: Build

NEWS

@@ -1,5 +1,79 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+26 Oct 2023, PHP 8.1.25
+
+- Core:
+  . Fixed bug GH-12207 (memory leak when class using trait with doc block).
+    (rioderelfte)
+  . Fixed bug GH-12215 (Module entry being overwritten causes type errors in
+    ext/dom). (nielsdos)
+  . Fixed bug GH-12273 (__builtin_cpu_init check). (Freaky)
+  . Fixed bug #80092 (ZTS + preload = segfault on shutdown). (nielsdos)
+
+- CLI:
+  . Ensure a single Date header is present. (coppolafab)
+
+- CType:
+  . Fixed bug GH-11997 (ctype_alnum 5 times slower in PHP 8.1 or greater).
+    (nielsdos)
+
+- DOM:
+  . Restore old namespace reconciliation behaviour. (nielsdos)
+  . Fixed bug GH-8996 (DOMNode serialization on PHP ^8.1). (nielsdos)
+
+- Fileinfo:
+  . Fixed bug GH-11891 (fileinfo returns text/xml for some svg files). (usarise)
+
+- Filter:
+  . Fix explicit FILTER_REQUIRE_SCALAR with FILTER_CALLBACK (ilutov)
+
+- Hash:
+  . Fixed bug GH-12186 (segfault copying/cloning a finalized HashContext).
+    (MaxSem)
+
+- Intl:
+  . Fixed bug GH-12243 (segfault on IntlDateFormatter::construct).
+    (David Carlier)
+  . Fixed bug GH-12282 (IntlDateFormatter::construct should throw an exception
+    on an invalid locale). (David Carlier)
+
+- MySQLnd:
+  . Fixed bug GH-12297 (PHP Startup: Invalid library (maybe not a PHP library)
+    'mysqlnd.so' in Unknown on line). (nielsdos)
+
+- Opcache:
+  . Fixed opcache_invalidate() on deleted file. (mikhainin)
+  . Fixed bug GH-12380 (JIT+private array property access inside closure
+    accesses private property in child class). (nielsdos)
+
+- PCRE:
+  . Fixed bug GH-11956 (Backport upstream fix, PCRE regular expressions with
+    JIT enabled gives different result). (nielsdos)
+
+- SimpleXML:
+  . Fixed bug GH-12170 (Can't use xpath with comments in SimpleXML). (nielsdos)
+  . Fixed bug GH-12223 (Entity reference produces infinite loop in
+    var_dump/print_r). (nielsdos)
+  . Fixed bug GH-12167 (Unable to get processing instruction contents in
+    SimpleXML). (nielsdos)
+  . Fixed bug GH-12169 (Unable to get comment contents in SimpleXML).
+    (nielsdos)
+
+- Streams:
+  . Fixed bug GH-12190 (binding ipv4 address with both address and port at 0).
+    (David Carlier)
+
+- XML:
+  . Fix return type of stub of xml_parse_into_struct(). (nielsdos)
+  . Fix memory leak when calling xml_parse_into_struct() twice. (nielsdos)
+
+- XSL:
+  . Fix type error on XSLTProcessor::transformToDoc return value with
+    SimpleXML. (nielsdos)
+
+- Sockets:
+  . Fix socket_export_stream() with wrong protocol (twosee)
+
 28 Sep 2023, PHP 8.1.24
 
 - Core:

Zend/Optimizer/zend_inference.c

@@ -2177,7 +2177,7 @@ static zend_property_info *zend_fetch_prop_info(const zend_op_array *op_array, z
 	if (opline->op2_type == IS_CONST) {
 		zend_class_entry *ce = NULL;
 
-		if (opline->op1_type == IS_UNUSED) {
+		if (opline->op1_type == IS_UNUSED && !(op_array->fn_flags & ZEND_ACC_TRAIT_CLONE)) {
 			ce = op_array->scope;
 		} else if (ssa_op->op1_use >= 0) {
 			ce = ssa->var_info[ssa_op->op1_use].ce;

Zend/tests/traits/bugs/overridding-static-property-with-doc-block.phpt

@@ -0,0 +1,21 @@
+--TEST--
+Overriding a static property where both declarations have a doc block does not leak memory
+--FILE--
+<?php
+trait MyTrait {
+    /**
+     * trait comment
+     */
+    static $property;
+}
+
+class MyClass {
+    use MyTrait;
+
+    /**
+     * class comment
+     */
+    static $property;
+}
+?>
+--EXPECT--

Zend/zend.h

@@ -20,7 +20,7 @@
 #ifndef ZEND_H
 #define ZEND_H
 
-#define ZEND_VERSION "4.1.24"
+#define ZEND_VERSION "4.1.25"
 
 #define ZEND_ENGINE_3