Merge branch 'master'

Author: mvorisek

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

@@ -7,17 +7,14 @@ runs:
         set -x
 
         sudo service mysql start
-        sudo service postgresql start
         sudo service slapd start
         mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
         # Ensure local_infile tests can run.
         mysql -uroot -proot -e "SET GLOBAL local_infile = true"
-        sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';"
-        sudo -u postgres psql -c "CREATE DATABASE test;"
         docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "<YourStrong@Passw0rd>" -Q "create login pdo_test with password='password', check_policy=off; create user pdo_test for login pdo_test; grant alter, control to pdo_test;"
         sudo locale-gen de_DE
 
-        ./.github/scripts/setup-slapd.sh &>/dev/null
+        ./.github/scripts/setup-slapd.sh
 
         sudo cp ext/snmp/tests/snmpd.conf /etc/snmp
         sudo cp ext/snmp/tests/bigtest /etc/snmp

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

@@ -28,6 +28,8 @@ runs:
         export PDO_OCI_TEST_USER="system"
         export PDO_OCI_TEST_PASS="pass"
         export PDO_OCI_TEST_DSN="oci:dbname=localhost/XEPDB1;charset=AL32UTF8"
+        export PGSQL_TEST_CONNSTR="host=postgres dbname=test port=5432 user=postgres password=postgres"
+        export PDO_PGSQL_TEST_DSN="host=postgres dbname=test port=5432 user=postgres password=postgres"
         export SKIP_IO_CAPTURE_TESTS=1
         export TEST_PHP_JUNIT=junit.out.xml
         export STACK_LIMIT_DEFAULTS_CHECK=1

.github/lsan-suppressions.txt

@@ -1 +1,2 @@
 leak:acommon::DictInfoList::elements
+leak:timer_create

.github/scripts/setup-slapd.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-set -ex
+set -e
 
 # Create TLS certificate
 sudo mkdir -p /etc/ldap/ssl
@@ -42,8 +42,6 @@ sudo sed -e 's|^\s*SLAPD_SERVICES\s*=.*$|SLAPD_SERVICES="ldap:/// ldaps:/// ldap
 # Configure LDAP database.
 DBDN=`sudo ldapsearch -Q -LLL -Y EXTERNAL -H ldapi:/// -b cn=config '(&(olcRootDN=*)(olcSuffix=*))' dn | grep -i '^dn:' | sed -e 's/^dn:\s*//'`;
 
-sudo ldapadd -Q -Y EXTERNAL -H ldapi:/// -f /etc/ldap/schema/ppolicy.ldif
-
 sudo service slapd restart
 
 sudo ldapmodify -Q -Y EXTERNAL -H ldapi:/// << EOF

.github/workflows/nightly.yml

@@ -35,6 +35,13 @@ jobs:
   LINUX_X64:
     needs: GENERATE_MATRIX
     if: ${{ needs.GENERATE_MATRIX.outputs.branches != '[]' }}
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: test
     strategy:
       fail-fast: false
       matrix:
@@ -47,7 +54,7 @@ jobs:
         zts: [true, false]
         include: ${{ fromJson(needs.GENERATE_MATRIX.outputs.matrix-include) }}
     name: "${{ matrix.branch.name }}_LINUX_X64${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-${{ matrix.branch.ref == 'master' && '22.04' || '20.04' }}
     steps:
       - name: git checkout
         uses: actions/checkout@v3
@@ -122,7 +129,7 @@ jobs:
     name: "${{ matrix.branch.name }}_LINUX_X32_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
     runs-on: ubuntu-latest
     container:
-      image: ubuntu:20.04
+      image: ubuntu:${{ matrix.branch.ref == 'master' && '22.04' || '20.04' }}
     env:
       MYSQL_TEST_HOST: mysql
       PDO_MYSQL_TEST_DSN: mysql:host=mysql;dbname=test
@@ -246,7 +253,14 @@ jobs:
         uses: ./.github/actions/verify-generated-files
   COVERAGE_DEBUG_NTS:
     if: github.repository_owner == 'php' || github.event_name == 'workflow_dispatch'
-    runs-on: ubuntu-20.04
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: test
+    runs-on: ubuntu-22.04
     steps:
       - name: git checkout
         uses: actions/checkout@v3
@@ -286,7 +300,7 @@ jobs:
       matrix:
         branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
     name: "${{ matrix.branch.name }}_COMMUNITY"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-${{ matrix.branch.ref == 'master' && '22.04' || '20.04' }}
     env:
       UBSAN_OPTIONS: print_stacktrace=1
       USE_ZEND_ALLOC: 0
@@ -396,12 +410,19 @@ jobs:
   OPCACHE_VARIATION:
     needs: GENERATE_MATRIX
     if: ${{ needs.GENERATE_MATRIX.outputs.branches != '[]' }}
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: test
     strategy:
       fail-fast: false
       matrix:
         branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
     name: "${{ matrix.branch.name }}_OPCACHE_VARIATION"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-${{ matrix.branch.ref == 'master' && '22.04' || '20.04' }}
     steps:
       - name: git checkout
         uses: actions/checkout@v3
@@ -472,7 +493,7 @@ jobs:
       matrix:
         branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
     name: "${{ matrix.branch.name }}_MSAN"
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-${{ matrix.branch.ref == 'master' && '22.04' || '20.04' }}
     steps:
       - name: git checkout
         uses: actions/checkout@v3
@@ -567,7 +588,7 @@ jobs:
         exclude:
           - branch: { name: 'PHP-80', ref: 'PHP-8.0' }
     name: "${{ matrix.branch.name }}_LIBMYSQLCLIENT"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-${{ matrix.branch.ref == 'master' && '22.04' || '20.04' }}
     steps:
       - name: git checkout
         uses: actions/checkout@v3
@@ -593,7 +614,7 @@ jobs:
       - name: Build mysql-5.7
         uses: ./.github/actions/build-libmysqlclient
         with:
-          libmysql: mysql-5.7.38-linux-glibc2.12-x86_64.tar.gz
+          libmysql: mysql-5.7.41-linux-glibc2.12-x86_64.tar.gz
           withMysqli: ${{ matrix.branch.ref == 'PHP-8.1' }}
       - name: Test mysql-5.7
         uses: ./.github/actions/test-libmysqlclient
@@ -613,7 +634,8 @@ jobs:
       - name: Verify generated files are up to date
         uses: ./.github/actions/verify-generated-files
   PECL:
-    runs-on: ubuntu-20.04
+    if: github.repository_owner == 'php' || github.event_name == 'workflow_dispatch'
+    runs-on: ubuntu-22.04
     env:
       CC: ccache gcc
       CXX: ccache g++

.github/workflows/push.yml

@@ -28,6 +28,13 @@ env:
   CXX: ccache g++
 jobs:
   LINUX_X64:
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: test
     strategy:
       fail-fast: false
       matrix:
@@ -37,7 +44,7 @@ jobs:
           - debug: false
             zts: true
     name: "LINUX_X64_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: git checkout
         uses: actions/checkout@v3
@@ -85,7 +92,7 @@ jobs:
     name: LINUX_X32_DEBUG_ZTS
     runs-on: ubuntu-latest
     container:
-      image: ubuntu:20.04
+      image: ubuntu:22.04
     env:
       MYSQL_TEST_HOST: mysql
       PDO_MYSQL_TEST_DSN: mysql:host=mysql;dbname=test
@@ -171,8 +178,10 @@ jobs:
         include:
           - x64: true
             zts: false
+            opcache: true
           - x64: false
             zts: true
+            opcache: false
     name: "WINDOWS_${{ matrix.x64 && 'X64' || 'X86' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
     runs-on: windows-2019
     env:
@@ -185,6 +194,7 @@ jobs:
       THREAD_SAFE: "${{ matrix.zts && '1' || '0' }}"
       INTRINSICS: "${{ matrix.zts && 'AVX2' || '' }}"
       PARALLEL: -j2
+      OPCACHE: "${{ matrix.opcache && '1' || '0' }}"
     steps:
       - name: git config
         run: git config --global core.autocrlf false && git config --global core.eol lf

NEWS

@@ -23,6 +23,8 @@ PHP                                                                        NEWS
   . Fix bug GH-8821 (Improve line numbers for errors in constant expressions).
     (ilutov)
   . Fix bug GH-10083 (Allow comments between & and parameter). (ilutov)
+  . Zend Max Execution Timers is now enabled by default for ZTS builds on
+    Linux. (Kévin Dunglas)
 
 - Date:
   . Implement More Appropriate Date/Time Exceptions RFC. (Derick)
@@ -49,6 +51,8 @@ PHP                                                                        NEWS
   . Added pattern format error infos for numfmt_set_pattern. (David Carlier)
   . Added MIXED_NUMBERS and HIDDEN_OVERLAY constants for
     the Spoofchecker's class. (David Carlier)
+  . Updated datefmt_set_timezone/IntlDateformatter::setTimezone returns type.
+    (David Carlier).
 
 - JSON:
   . Added json_validate(). (Juan Morales)

README.md

@@ -17,7 +17,6 @@ blog to the most popular websites in the world. PHP is distributed under the
 [![Push](https://github.com/php/php-src/actions/workflows/push.yml/badge.svg)](https://github.com/php/php-src/actions/workflows/push.yml)
 [![Build status](https://travis-ci.com/php/php-src.svg?branch=master)](https://travis-ci.com/github/php/php-src)
 [![Build status](https://ci.appveyor.com/api/projects/status/meyur6fviaxgdwdy/branch/master?svg=true)](https://ci.appveyor.com/project/php/php-src)
-[![Build Status](https://dev.azure.com/phpazuredevops/php/_apis/build/status/php.php-src?branchName=master)](https://dev.azure.com/phpazuredevops/php/_build/latest?definitionId=1&branchName=master)
 [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/php.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:php)
 
 ## Documentation

UPGRADING

@@ -33,6 +33,8 @@ PHP 8.3 UPGRADE NOTES
     Internally, this works by caching the result on posix systems. If you want
     the old behaviour, you can check the "cached" key in the array returned by
     proc_get_status() to check whether the result was cached.
+  . Zend Max Execution Timers is now enabled by default for ZTS builds on
+    Linux.
 
 - FFI:
   . C functions that have a return type of void now return null instead of
@@ -76,6 +78,10 @@ PHP 8.3 UPGRADE NOTES
 - Dom:
   . Changed DOMCharacterData::appendData() tentative return type to true.
 
+- Intl:
+  . datefmt_set_timezone (and its alias IntlDateformatter::setTimeZone) 
+    now returns true on sucess, previously null was returned.
+
 - MBString:
   . mb_strtolower, mb_strtotitle, and mb_convert_case implement conditional
     casing rules for the Greek letter sigma. For mb_convert_case, conditional

Zend/Optimizer/sccp.c

@@ -1646,8 +1646,9 @@ static void sccp_visit_instr(scdf_ctx *scdf, zend_op *opline, zend_ssa_op *ssa_o
 				break;
 			}
 
-			/* We're only interested in functions with up to three arguments right now */
-			if (call->num_args > 3 || call->send_unpack || call->is_prototype) {
+			/* We're only interested in functions with up to three arguments right now.
+			 * Note that named arguments with the argument in declaration order will still work. */
+			if (call->num_args > 3 || call->send_unpack || call->is_prototype || call->named_args) {
 				SET_RESULT_BOT(result);
 				break;
 			}