sync

.circleci/config.yml

@@ -5,7 +5,7 @@ jobs:
     resource_class: arm.medium
     docker:
       - image: cimg/base:current-22.04
-      - image: mysql:8
+      - image: mysql:8.3
         environment:
           MYSQL_ALLOW_EMPTY_PASSWORD: true
           MYSQL_ROOT_PASSWORD: ''

.github/CODEOWNERS

@@ -10,7 +10,7 @@
 
 /.github @iluuu1994 @TimWolla
 /build/gen_stub.php @kocsismate
-/ext/bcmath @Girgias
+/ext/bcmath @Girgias @nielsdos @SakiTakamachi
 /ext/curl @adoy
 /ext/date @derickr
 /ext/dba @Girgias
@@ -37,10 +37,13 @@
 /ext/pgsql @devnexen
 /ext/random @TimWolla @zeriyoshi
 /ext/session @Girgias
+/ext/simplexml @nielsdos
 /ext/sockets @devnexen
 /ext/spl @Girgias
 /ext/standard @bukka
+/ext/xml @nielsdos
 /ext/xmlreader @nielsdos
+/ext/xmlwriter @nielsdos
 /ext/xsl @nielsdos
 /main @bukka
 /sapi/fpm @bukka

.github/actions/build-libmysqlclient/action.yml

@@ -15,10 +15,9 @@ runs:
         set -x
         LIBMYSQL=${{ inputs.libmysql }}
         MYSQL_BASE=${LIBMYSQL%%-linux-*}
-        MYSQL_VERSION=${MYSQL_BASE#*-}
         MYSQL_DIR=$HOME/$MYSQL_BASE
         mkdir -p $MYSQL_DIR
-        URL=https://cdn.mysql.com/Downloads/MySQL-${MYSQL_VERSION%.*}/$LIBMYSQL
+        URL=https://downloads.mysql.com/archives/get/p/23/file/$LIBMYSQL
         wget -nv $URL
         tar -xf $LIBMYSQL --strip-components=1 -C $MYSQL_DIR
         PDO_MYSQL=${MYSQL_DIR}

.github/workflows/nightly.yml

@@ -159,7 +159,7 @@ jobs:
       image: ubuntu:${{ matrix.branch.version.minor >= 3 && '22.04' || '20.04' }}
     services:
       mysql:
-        image: mysql:8
+        image: mysql:8.3
         ports:
           - 3306:3306
         env:
@@ -745,7 +745,7 @@ jobs:
         uses: ./.github/actions/build-libmysqlclient
         with:
           configurationParameters: --enable-werror
-          libmysql: mysql-8.0.35-linux-glibc2.28-x86_64.tar.xz
+          libmysql: mysql-8.0.36-linux-glibc2.28-x86_64.tar.xz
           withMysqli: ${{ matrix.branch.ref == 'PHP-8.1' }}
       - name: Test mysql-8.0
         uses: ./.github/actions/test-libmysqlclient
@@ -824,6 +824,7 @@ jobs:
         with:
           key: "${{github.job}}-${{hashFiles('php/main/php_version.h')}}"
           append-timestamp: false
+          save: ${{ github.event_name != 'pull_request' }}
       - name: build PHP
         run: |
           cd php

.github/workflows/push.yml

@@ -46,7 +46,7 @@ jobs:
     if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
     services:
       mysql:
-        image: mysql:8
+        image: mysql:8.3
         ports:
           - 3306:3306
         env:
@@ -116,6 +116,7 @@ jobs:
           # job id, not the job name)
           key: "LINUX_X64_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}${{ matrix.asan && '_ASAN' || '' }}-${{hashFiles('main/php_version.h')}}"
           append-timestamp: false
+          save: ${{ github.event_name != 'pull_request' }}
       - name: ./configure
         uses: ./.github/actions/configure-x64
         with:
@@ -170,6 +171,7 @@ jobs:
         with:
           key: "${{github.job}}-${{matrix.os}}-${{hashFiles('main/php_version.h')}}"
           append-timestamp: false
+          save: ${{ github.event_name != 'pull_request' }}
       - name: ./configure
         uses: ./.github/actions/configure-macos
         with:
@@ -246,6 +248,7 @@ jobs:
         with:
           key: "${{github.job}}-${{hashFiles('main/php_version.h')}}"
           append-timestamp: false
+          save: ${{ github.event_name != 'pull_request' }}
       - name: ./configure
         run: |
           set -x

.gitignore

@@ -78,7 +78,7 @@ Makefile
 Makefile.fragments
 Makefile.objects
 
-# Directories for shared object files and headers generated by `./configure`
+# Directories for shared object files generated by `./configure`
 libs/
 modules/
 
@@ -166,11 +166,6 @@ php
 # Extensions files
 # ------------------------------------------------------------------------------
 
-# Miscellaneous extensions files
-/ext/opcache/jit/zend_jit_x86.c
-/ext/opcache/jit/zend_jit_arm64.c
-/ext/opcache/minilua
-
 # Generated by `cd ext/name && phpize && ./configure`
 /ext/*/build/
 /ext/*/configure.ac

CODING_STANDARDS.md

@@ -152,62 +152,74 @@ rewritten to comply with these rules.
 1. Method names follow the *studlyCaps* (also referred to as *bumpy case* or
     *camel caps*) naming convention, with care taken to minimize the letter
     count. The initial letter of the name is lowercase, and each letter that
-    starts a new `word` is capitalized:
+    starts a new "word" is capitalized.
 
-    Good:
+1. Class names should be descriptive nouns in *PascalCase* and as short as
+    possible. Each word in the class name should start with a capital letter,
+    without underscore delimiters. The class name should be prefixed with the
+    name of the "parent set" (e.g. the name of the extension) if no namespaces
+    are used.
+
+1.  Abbreviations and acronyms as well as initialisms should be avoided wherever
+    possible, unless they are much more widely used than the long form (e.g. HTTP
+    or URL). Abbreviations, acronyms, and initialisms should be treated like
+    regular words, thus they should be written with an uppercase first character,
+    followed by lowercase characters.
+
+1.  Diverging from this policy is allowed to keep internal consistency within a
+    single extension, if the name follows an established, language-agnostic
+    standard, or for other reasons, if those reasons are properly justified
+    and voted on as part of the RFC process.
+
+
+    Good method names:
 
     ```php
     connect()
     getData()
     buildSomeWidget()
+    performHttpRequest()
     ```
 
-    Bad:
+    Bad method names:
 
     ```php
     get_Data()
     buildsomewidget()
     getI()
+    performHTTPRequest()
     ```
 
-1. Class names should be descriptive nouns in *PascalCase* and as short as
-    possible. Each word in the class name should start with a capital letter,
-    without underscore delimiters. The class name should be prefixed with the
-    name of the "parent set" (e.g. the name of the extension) if no namespaces
-    are used. Abbreviations and acronyms as well as initialisms should be
-    avoided wherever possible, unless they are much more widely used than the
-    long form (e.g. HTTP or URL). Abbreviations start with a capital letter
-    followed by lowercase letters, whereas acronyms and initialisms are written
-    according to their standard notation. Usage of acronyms and initialisms is
-    not allowed if they are not widely adopted and recognized as such.
-
-    Good:
+    Good class names:
 
     ```php
     Curl
     CurlResponse
-    HTTPStatusCode
-    URL
-    BTreeMap // B-tree Map
-    Id // Identifier
-    ID // Identity Document
+    HttpStatusCode
+    Url
+    BtreeMap // B-tree Map
+    UserId // User Identifier
     Char // Character
     Intl // Internationalization
-    Radar // Radio Detecting and Ranging
+    Ssl\Certificate
+    Ssl\Crl // Certificate Revocation List
+    Ssl\CrlUrl
     ```
 
-    Bad:
+    Bad class names:
 
     ```php
     curl
     curl_response
-    HttpStatusCode
-    Url
-    BtreeMap
-    ID // Identifier
+    HTTPStatusCode
+    URL
+    BTreeMap
+    UserID // User Identifier
     CHAR
     INTL
-    RADAR // Radio Detecting and Ranging
+    SSL\Certificate
+    SSL\CRL
+    SSL\CRLURL
     ```
 
 ## Internal function naming conventions

EXTENSIONS

@@ -170,12 +170,14 @@ EXTENSION:           dom
 PRIMARY MAINTAINER:  Christian Stocker <[email protected]> (2003 - 2011)
                      Rob Richards <[email protected]> (2003 - 2012)
                      Marcus Börger <[email protected]> (2003 - 2006)
+                     Niels Dossche <[email protected]> (2023 - 2024)
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.0
 -------------------------------------------------------------------------------
 EXTENSION:           simplexml
 PRIMARY MAINTAINER:  Marcus Börger <[email protected]> (2003 - 2008)
+                     Niels Dossche <[email protected]> (2023 - 2024)
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.0
@@ -188,30 +190,35 @@ STATUS:              Working
 EXTENSION:           xml
 PRIMARY MAINTAINER:  Thies C. Arntzen <[email protected]> (1999 - 2002)
                      Rob Richards <[email protected]> (2003 - 2013)
+                     Niels Dossche <[email protected]> (2023 - 2024)
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           libxml
 PRIMARY MAINTAINER:  Rob Richards <[email protected]> (2003 - 2009)
                      Christian Stocker <[email protected]> (2004 - 2011)
+                     Niels Dossche <[email protected]> (2023 - 2024)
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           xmlreader
 PRIMARY MAINTAINER:  Rob Richards <[email protected]> (2004 - 2010)
                      Christian Stocker <[email protected]> (2004 - 2004)
+                     Niels Dossche <[email protected]> (2023 - 2024)
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           xmlwriter
 PRIMARY MAINTAINER:  Rob Richards <[email protected]> (2004 - 2010)
                      Pierre-Alain Joye <[email protected]> (2005-2009)
+                     Niels Dossche <[email protected]> (2023 - 2024)
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           xsl
 PRIMARY MAINTAINER:  Christian Stocker <[email protected]> (2003 - 2011)
                      Rob Richards <[email protected]> (2003 - 2010)
+                     Niels Dossche <[email protected]> (2023 - 2024)
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.0

NEWS

@@ -2,6 +2,10 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.4.0alpha1
 
+- BCMath:
+  . [RFC] Add bcfloor, bcceil and bcround to BCMath. (Saki Takamachi)
+  . Improve performance. (Saki Takamachi, nielsdos)
+
 - Core:
   . Added zend_call_stack_get implementation for NetBSD, DragonFlyBSD,
     Solaris and Haiku. (David Carlier)
@@ -86,6 +90,7 @@ PHP                                                                        NEWS
   . ResourceBundle::get() now has a tentative return type of:
     ResourceBundle|array|string|int|null
   . Added the new Grapheme function grapheme_str_split. (youkidearitai)
+  . Added IntlDateFormatter::parseToCalendar. (David Carlier)
 
 - LDAP:
   . Added LDAP_OPT_X_TLS_PROTOCOL_MAX/LDAP_OPT_X_TLS_PROTOCOL_TLS1_3
@@ -123,6 +128,8 @@ PHP                                                                        NEWS
   . Added X509_PURPOSE_OCSP_HELPER and X509_PURPOSE_TIMESTAMP_SIGN constants.
     (Vincent Jardin)
   . Bumped minimum required OpenSSL version to 1.1.1. (Ayesh Karunaratne)
+  . Added compile-time option --with-openssl-legacy-provider to enable legacy
+    provider. (Adam Saponara)
 
 - Output:
   . Clear output handler status flags during handler initialization. (haszi)
@@ -134,7 +141,7 @@ PHP                                                                        NEWS
   . Added pcntl_getaffinity/pcntl_setaffinity. (David Carlier)
   . Updated pcntl_get_signal_handler signal id upper limit to be
     more in line with platforms limits. (David Carlier)
-  . Added pcntl_getcpu for Linux/FreeBSD. (David Carlier)
+  . Added pcntl_getcpu for Linux/FreeBSD/Solaris/Illumos. (David Carlier)
   . Added pcntl_getqos_class/pcntl_setqos_class for macOs. (David Carlier)
   . Added SIGCKPT/SIGCKPTEXIT constants for DragonFlyBSD. (David Carlier)
 
@@ -168,6 +175,7 @@ PHP                                                                        NEWS
     PDO constructor arguments. (SakiTakamachi)
   . Fixed native float support with pdo_pgsql query results. (Yurunsoft)
   . Added class PdoPgsql. (danack, kocsismate)
+  . Retrieve the memory usage of the query result resource. (KentarouTakeda)
 
 - PDO_SQLITE:
   . Added class PdoSqlite. (danack, kocsismate)
@@ -176,6 +184,8 @@ PHP                                                                        NEWS
   . Added the possibility to have no conditions for pg_select. (OmarEmaraDev)
   . Persistent connections support the PGSQL_CONNECT_FORCE_RENEW flag.
     (David Carlier)
+  . Added pg_result_memory_size to get the query result memory usage.
+    (KentarouTakeda)
 
 - Phar:
   . Fixed bug GH-12532 (PharData created from zip has incorrect timestamp).
@@ -209,6 +219,8 @@ PHP                                                                        NEWS
     (David Carlier)
   . Updated the socket_create_listen backlog argument default value to SOMAXCONN.
     (David Carlier)
+  . Added the SO_NOSIGPIPE constant to control the generation of SIGPIPE for
+    macOs and FreeBSD. (David Carlier)
 
 - SNMP:
   . Removed the deprecated inet_ntoa call support. (David Carlier)
@@ -230,6 +242,9 @@ PHP                                                                        NEWS
   . Add support for AEGIS-128L and AEGIS-256 (jedisct1)
   . Enable AES-GCM on aarch64 with the ARM crypto extensions (jedisct1)
 
+- SPL:
+  . Implement SeekableIterator for SplObjectStorage. (nielsdos)
+
 - Standard:
   . Implement GH-12188 (Indication for the int size in phpinfo()). (timwolla)
   . Partly fix GH-12143 (Incorrect round() result for 0.49999999999999994).