merge

.cirrus.yml

@@ -14,7 +14,7 @@ task:
     - pkg install -y autoconf bison gmake re2c icu libiconv png freetype2 enchant2 bzip2 krb5 t1lib gmp tidyp libsodium libzip libxml2 libxslt openssl oniguruma pkgconf webp libavif
   script:
     - ./buildconf -f
-    - ./configure --prefix=/usr/local --enable-debug --enable-option-checking=fatal --enable-fpm --with-pdo-sqlite --without-pear --with-bz2 --with-avif --with-jpeg --with-webp --with-freetype --enable-gd --enable-exif --with-zip --with-zlib --enable-soap --enable-xmlreader --with-xsl --with-libxml --enable-shmop --enable-pcntl --enable-mbstring --with-curl --enable-sockets --with-openssl --with-iconv=/usr/local --enable-bcmath --enable-calendar --enable-ftp --with-kerberos --with-ffi --enable-zend-test --enable-intl --with-mhash --with-sodium --enable-werror --with-config-file-path=/etc --with-config-file-scan-dir=/etc/php.d
+    - ./configure --prefix=/usr/local --enable-debug --enable-option-checking=fatal --enable-fpm --with-pdo-sqlite --without-pear --with-bz2 --with-avif --with-jpeg --with-webp --with-freetype --enable-gd --enable-exif --with-zip --with-zlib --enable-soap --enable-xmlreader --with-xsl --with-libxml --enable-shmop --enable-pcntl --enable-mbstring --with-curl --enable-sockets --with-openssl --with-iconv=/usr/local --enable-bcmath --enable-calendar --enable-ftp --with-kerberos --with-ffi --enable-zend-test --enable-dl-test=shared --enable-intl --with-mhash --with-sodium --enable-werror --with-config-file-path=/etc --with-config-file-scan-dir=/etc/php.d
     - gmake -j2
     - mkdir /etc/php.d
     - gmake install

.gitattributes

@@ -13,7 +13,8 @@
 /UPGRADING           merge=NEWS
 /UPGRADING.INTERNALS merge=NEWS
 
-# Enable commit diffs for binary PHP test files. Some PHP test files include
-# special characters, such as ASCII control characters. Git recognizes these as
-# binary and wouldn't generate diffs.
-*.phpt diff
+# Configure proper diff drivers to improve the context lines in the output
+# of git diff and to improve token splitting for --word-diff.
+*.phpt diff=php
+*.php diff=php
+*.[ch] diff=cpp

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

@@ -59,10 +59,10 @@ runs:
           libpng-dev \
           libfreetype6-dev
         mkdir /opt/oracle
-        wget https://download.oracle.com/otn_software/linux/instantclient/instantclient-basiclite-linuxx64.zip
-        unzip instantclient-basiclite-linuxx64.zip
-        wget https://download.oracle.com/otn_software/linux/instantclient/instantclient-sdk-linuxx64.zip
-        unzip instantclient-sdk-linuxx64.zip
+        wget -nv https://download.oracle.com/otn_software/linux/instantclient/instantclient-basiclite-linuxx64.zip
+        unzip instantclient-basiclite-linuxx64.zip && rm instantclient-basiclite-linuxx64.zip
+        wget -nv https://download.oracle.com/otn_software/linux/instantclient/instantclient-sdk-linuxx64.zip
+        unzip instantclient-sdk-linuxx64.zip && rm instantclient-sdk-linuxx64.zip
         mv instantclient_*_* /opt/oracle/instantclient
         # Interferes with libldap2 headers.
         rm /opt/oracle/instantclient/sdk/include/ldap.h

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

@@ -61,6 +61,7 @@ runs:
           --enable-sysvmsg \
           --with-ffi \
           --enable-zend-test \
+          --enable-dl-test=shared \
           --enable-intl \
           --with-mhash \
           --with-sodium \

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

@@ -56,6 +56,7 @@ runs:
           --enable-sysvmsg \
           --with-ffi \
           --enable-zend-test \
+          --enable-dl-test=shared \
           --with-ldap \
           --with-ldap-sasl \
           --with-password-argon2 \

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

@@ -10,5 +10,3 @@ runs:
         sudo chmod 777 /etc/php.d
         echo mysqli.default_socket=/var/run/mysqld/mysqld.sock    > /etc/php.d/mysqli.ini
         echo pdo_mysql.default_socket=/var/run/mysqld/mysqld.sock > /etc/php.d/pdo_mysql.ini
-        echo opcache.enable_cli=1 >> /etc/php.d/opcache.ini
-        echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini

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

@@ -0,0 +1,12 @@
+name: Verify generated files are up to date
+runs:
+  using: composite
+  steps:
+    - shell: bash
+      run: |
+        set -x
+        [[ "$OSTYPE" == "darwin"* ]] && export PATH="/usr/local/opt/bison/bin:$PATH"
+        scripts/dev/genfiles
+        Zend/zend_vm_gen.php
+        build/gen_stub.php -f
+        git add . -Nu && git diff --exit-code

.github/workflows/nightly.yml

@@ -6,6 +6,7 @@ on:
 jobs:
   GENERATE_MATRIX:
     name: Generate Matrix
+    if: github.repository_owner == 'php' || github.event_name == 'workflow_dispatch'
     runs-on: ubuntu-latest
     outputs:
       branches: ${{ steps.set-matrix.outputs.branches }}
@@ -74,21 +75,26 @@ jobs:
           runTestsParameters: >-
             ${{ matrix.run_tests_parameters }}
             -d zend_extension=opcache.so
+            -d opcache.enable_cli=1
             -d opcache.jit_buffer_size=16M
       - name: Test OpCache
         uses: ./.github/actions/test-linux
         with:
           runTestsParameters: >-
             ${{ matrix.run_tests_parameters }}
             -d zend_extension=opcache.so
+            -d opcache.enable_cli=1
       - name: Test Function JIT
         uses: ./.github/actions/test-linux
         with:
           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
   MACOS:
     needs: GENERATE_MATRIX
     if: ${{ needs.GENERATE_MATRIX.outputs.branches != '[]' }}
@@ -126,19 +132,24 @@ jobs:
         with:
           runTestsParameters: >-
             -d zend_extension=opcache.so
+            -d opcache.enable_cli=1
             -d opcache.protect_memory=1
             -d opcache.jit_buffer_size=16M
       - name: Test OpCache
         uses: ./.github/actions/test-macos
         with:
           runTestsParameters: >-
             -d zend_extension=opcache.so
+            -d opcache.enable_cli=1
             -d opcache.protect_memory=1
       - name: Test Function JIT
         uses: ./.github/actions/test-macos
         with:
           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

.github/workflows/push.yml

@@ -53,7 +53,12 @@ jobs:
       - name: Test Tracing JIT
         uses: ./.github/actions/test-linux
         with:
-          runTestsParameters: -d zend_extension=opcache.so -d opcache.jit_buffer_size=16M
+          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-10.15
     steps:
@@ -78,5 +83,8 @@ jobs:
         with:
           runTestsParameters: >-
             -d zend_extension=opcache.so
+            -d opcache.enable_cli=1
             -d opcache.protect_memory=1
             -d opcache.jit_buffer_size=16M
+      - name: Verify generated files are up to date
+        uses: ./.github/actions/verify-generated-files

CONTRIBUTING.md

@@ -36,7 +36,8 @@ supported branch of PHP that the bug affects (only green branches on
 [the supported version page](https://www.php.net/supported-versions.php) are
 supported). For example, at the time of writing, the lowest supported version is
 PHP 8.0, which corresponds to the `PHP-8.0` branch in Git. Please also make sure
-you add a link to the PR in the bug on [the bug tracker](https://bugs.php.net/).
+you add a link to the PR in the bug on [the bug tracker](https://github.com/php/php-src/issues)
+or [the old bug tracker](https://bugs.php.net/).
 
 Pull requests implementing RFCs should be submitted against `master`.
 
@@ -49,7 +50,8 @@ them by using `git rebase` instead of `git merge`.
 Fork the official PHP repository and send a pull request. A notification will be
 sent to the pull request mailing list. Sending a note to PHP Internals list
 (internals@lists.php.net) may help getting more feedback and quicker turnaround.
-You can also add pull requests to [bug reports](https://bugs.php.net/).
+You can also add pull requests to [bug reports](https://github.com/php/php-src/issues)
+and [old bug reports](https://bugs.php.net/).
 
 Read [Git access page](https://www.php.net/git.php) for help on using Git to get
 and build PHP source code. We recommend to look at our

NEWS

@@ -9,11 +9,23 @@ PHP                                                                        NEWS
   . Fixed bug #81380 (Observer may not be initialized properly). (krakjoe)
   . Fixed bug GH-7771 (Fix filename/lineno of constant expressions). (ilutov)
   . Fixed bug GH-7792 (Improve class type in error messages). (ilutov)
+  . Support huge pages on MacOS. (David CARLIER)
+
+- Curl:
+  . Added support for CURLOPT_XFERINFOFUNCTION. (David Carlier)
+
+- Date:
+  . Fixed GH-8458 (DateInterval::createFromDateString does not throw if
+    non-relative items are present). (Derick)
+  . idate() now accepts format specifiers "N" (ISO Day-of-Week) and "o" (ISO
+    Year). (Pavel Djundik)
 
 - FPM:
   . Emit error for invalid port setting. (David Carlier)
   . Added extra check for FPM proc dumpable on SELinux based systems.
     (David Carlier)
+  . Added support for listening queue on macOS. (David Carlier)
+  . Changed default for listen.backlog on Linux to -1. (Cristian Rodríguez)
 
 - Intl:
   . Update all grandfathered language tags with preferred values
@@ -28,9 +40,20 @@ PHP                                                                        NEWS
   . Fixed bug #80909 (crash with persistent connections in PDO_ODBC). (Calvin
     Buckley)
 
+- Reflection:
+  . Added ReflectionFunction::isAnonymous(). (Nicolas Grekas)
+  . Added ReflectionMethod::hasPrototype(). (Ollie Read)
+
 - Sodium:
   . Added sodium_crypto_stream_xchacha20_xor_ic(). (Scott)
 
+- SQLite3:
+  . Changed sqlite3.defensive from PHP_INI_SYSTEM to PHP_INI_USER. (bohwaz)
+
+- Streams:
+  . Set IP_BIND_ADDRESS_NO_PORT if available when connecting to remote host.
+    (Cristian Rodríguez)
+
 - Standard:
   . net_get_interfaces() also reports wireless network interfaces on Windows.
     (Yurun)

TSRM/TSRM.c

@@ -288,9 +288,9 @@ TSRM_API ts_rsrc_id ts_allocate_id(ts_rsrc_id *rsrc_id, size_t size, ts_allocate
 		tsrm_resource_type *_tmp;
 		_tmp = (tsrm_resource_type *) realloc(resource_types_table, sizeof(tsrm_resource_type)*id_count);
 		if (!_tmp) {
-			tsrm_mutex_unlock(tsmm_mutex);
 			TSRM_ERROR((TSRM_ERROR_LEVEL_ERROR, "Unable to allocate storage for resource"));
 			*rsrc_id = 0;
+			tsrm_mutex_unlock(tsmm_mutex);
 			return 0;
 		}
 		resource_types_table = _tmp;
@@ -331,10 +331,10 @@ TSRM_API ts_rsrc_id ts_allocate_fast_id(ts_rsrc_id *rsrc_id, size_t *offset, siz
 
 	size = TSRM_ALIGNED_SIZE(size);
 	if (tsrm_reserved_size - tsrm_reserved_pos < size) {
-		tsrm_mutex_unlock(tsmm_mutex);
 		TSRM_ERROR((TSRM_ERROR_LEVEL_ERROR, "Unable to allocate space for fast resource"));
 		*rsrc_id = 0;
 		*offset = 0;
+		tsrm_mutex_unlock(tsmm_mutex);
 		return 0;
 	}
 
@@ -346,9 +346,9 @@ TSRM_API ts_rsrc_id ts_allocate_fast_id(ts_rsrc_id *rsrc_id, size_t *offset, siz
 		tsrm_resource_type *_tmp;
 		_tmp = (tsrm_resource_type *) realloc(resource_types_table, sizeof(tsrm_resource_type)*id_count);
 		if (!_tmp) {
-			tsrm_mutex_unlock(tsmm_mutex);
 			TSRM_ERROR((TSRM_ERROR_LEVEL_ERROR, "Unable to allocate storage for resource"));
 			*rsrc_id = 0;
+			tsrm_mutex_unlock(tsmm_mutex);
 			return 0;
 		}
 		resource_types_table = _tmp;
@@ -736,13 +736,15 @@ TSRM_API size_t tsrm_get_ls_cache_tcb_offset(void)
 #if defined(__APPLE__) && defined(__x86_64__)
     // TODO: Implement support for fast JIT ZTS code ???
 	return 0;
-#elif defined(__x86_64__) && defined(__GNUC__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__MUSL__)
+#elif defined(__x86_64__) && defined(__GNUC__) && !defined(__FreeBSD__) && \
+	!defined(__OpenBSD__) && !defined(__MUSL__) && !defined(__HAIKU__)
 	size_t ret;
 
 	asm ("movq _tsrm_ls_cache@gottpoff(%%rip),%0"
           : "=r" (ret));
 	return ret;
-#elif defined(__i386__) && defined(__GNUC__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__MUSL__)
+#elif defined(__i386__) && defined(__GNUC__) && !defined(__FreeBSD__) && \
+	!defined(__OpenBSD__) && !defined(__MUSL__) && !defined(__HAIKU__)
 	size_t ret;
 
 	asm ("leal _tsrm_ls_cache@ntpoff,%0"

UPGRADING

@@ -19,6 +19,12 @@ PHP 8.2 UPGRADE NOTES
 1. Backward Incompatible Changes
 ========================================
 
+- Date:
+  . DateTime::createFromImmutable() now has a tentative return type of static,
+    previously it was DateTime
+  . DateTimeImmutable::createFromMutable() now has a tentative return type of static,
+    previously it was DateTimeImmutable
+
 - Standard:
   . strtolower() and strtoupper() are no longer locale-sensitive. They now
     perform ASCII case conversion, as if the locale were "C". Use
@@ -35,6 +41,10 @@ PHP 8.2 UPGRADE NOTES
     * SplFileObject::ftell()
     * SplFileObject::fgetc()
     * SplFileObject::fpassthru()
+  . SplFileObject::hasChildren() now has a tentative return type of false,
+    previously it was bool
+  . SplFileObject::getChildren() now has a tentative return type of null,
+    previously it was ?RecursiveIterator
 
 ========================================
 2. New Features
@@ -44,6 +54,8 @@ PHP 8.2 UPGRADE NOTES
   . Added the #[\SensitiveParameter] attribute to redact sensitive data in
     backtraces.
     RFC: https://wiki.php.net/rfc/redact_parameters_in_back_traces
+  . It is now possible to use null and false as standalone types.
+    RFC: https://wiki.php.net/rfc/null-false-standalone-types
 
 - Curl:
   . Added CURLINFO_EFFECTIVE_METHOD option and returning the effective
@@ -100,6 +112,10 @@ PHP 8.2 UPGRADE NOTES
 
     RFC: https://wiki.php.net/rfc/deprecate_partially_supported_callables
 
+  . The "${var}" and "${expr}" style string interpolations are deprecated and
+    will be removed in PHP 9. Use "$var"/"{$var}" or "{${expr}}", respectively.
+    RFC: https://wiki.php.net/rfc/deprecate_dollar_brace_string_interpolation
+
 - Mbstring:
   . Use of QPrint, Base64, Uuencode, and HTML-ENTITIES 'text encodings' is
     deprecated for all Mbstring functions. Unlike all the other text
@@ -128,6 +144,10 @@ PHP 8.2 UPGRADE NOTES
 6. New Functions
 ========================================
 
+- Reflection:
+  . ReflectionFunction::isAnonymous()
+  . ReflectionMethod::hasPrototype()
+
 - Sodium:
   . sodium_crypto_stream_xchacha20_xor_ic()
 
@@ -158,6 +178,9 @@ PHP 8.2 UPGRADE NOTES
 - OCI8:
   . The minimum Oracle Client library version required is now 11.2.
 
+- SQLite3:
+  . sqlite3.defensive is now PHP_INI_USER.
+
 - Standard:
   . getimagesize() now reports the actual image dimensions, bits and channels
     of AVIF images. Previously, the dimensions have been reported as 0x0, and
@@ -174,6 +197,9 @@ PHP 8.2 UPGRADE NOTES
 - COM_DOTNET:
   . LOCALE_NEUTRAL
 
+- Curl:
+  . CURLOPT_XFERINFOFUNCTION
+
 - Sockets:
   . SO_INCOMING_CPU