[pull] master from php:master

.circleci/config.yml

@@ -166,6 +166,7 @@ jobs:
           name: Test
           no_output_timeout: 30m
           command: |
+            export RUN_RESOURCE_HEAVY_TESTS=1
             sapi/cli/php run-tests.php \
               -d opcache.enable_cli=1 \
               -d opcache.jit_buffer_size=64M \

.github/actions/freebsd/action.yml

@@ -107,6 +107,7 @@ runs:
           export SKIP_IO_CAPTURE_TESTS=1
           export CI_NO_IPV6=1
           export STACK_LIMIT_DEFAULTS_CHECK=1
+          export RUN_RESOURCE_HEAVY_TESTS=1
           sapi/cli/php run-tests.php \
             -P -q -j2 \
             -g FAIL,BORK,LEAK,XLEAK \

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

@@ -25,6 +25,7 @@ runs:
         # Slow tests criteron is doubled because this runner isn't as fast as others
         export SKIP_IO_CAPTURE_TESTS=1
         export STACK_LIMIT_DEFAULTS_CHECK=1
+        export RUN_RESOURCE_HEAVY_TESTS=1
         sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
           -j$(nproc) \
           -g FAIL,BORK,LEAK,XLEAK \

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

@@ -9,6 +9,7 @@ runs:
         export PDO_MYSQL_TEST_HOST=127.0.0.1
         export PDO_MYSQL_TEST_USER=root
         export PDO_MYSQL_TEST_PASS=root
+        export RUN_RESOURCE_HEAVY_TESTS=1
         sapi/cli/php run-tests.php -P -q \
           -g FAIL,BORK,LEAK,XLEAK \
           --no-progress --offline --show-diff --show-slow 1000 --set-timeout 120 \

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

@@ -44,6 +44,7 @@ runs:
         export PDO_ODBC_TEST_DSN="odbc:Driver={ODBC Driver 17 for SQL Server};Server=127.0.0.1;Database=pdo_odbc;uid=$ODBC_TEST_USER;pwd=$ODBC_TEST_PASS"
         export SKIP_IO_CAPTURE_TESTS=1
         export STACK_LIMIT_DEFAULTS_CHECK=1
+        export RUN_RESOURCE_HEAVY_TESTS=1
         sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
           ${{ inputs.enableOpcache == 'true' && '-d opcache.enable_cli=1' || '' }} \
           -d opcache.jit=${{ inputs.jitType }} \

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

@@ -18,6 +18,7 @@ runs:
         export SKIP_IO_CAPTURE_TESTS=1
         export CI_NO_IPV6=1
         export STACK_LIMIT_DEFAULTS_CHECK=1
+        export RUN_RESOURCE_HEAVY_TESTS=1
         sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
           ${{ inputs.enableOpcache == 'true' && '-d opcache.enable_cli=1' || '' }} \
           -d opcache.jit=${{ inputs.jitType }} \

.github/workflows/test-suite.yml

@@ -187,6 +187,7 @@ jobs:
             ${{ matrix.variation && '-d zend_test.observer.enabled=1 -d zend_test.observer.show_output=0' || '' }}
           idleCpu: ${{ matrix.asan && 'true' || 'false' }}
       - name: Test Tracing JIT
+        if: ${{ inputs.all_variations || matrix.asan }}
         uses: ./.github/actions/test-linux
         with:
           enableOpcache: true
@@ -208,7 +209,7 @@ jobs:
       - name: Test Function JIT
         # ASAN frequently timeouts. Each test run takes ~90 minutes, we can
         # avoid running into the 6 hour timeout by skipping the function JIT.
-        if: ${{ inputs.all_variations && !matrix.asan }}
+        if: ${{ !matrix.asan }}
         uses: ./.github/actions/test-linux
         with:
           enableOpcache: true
@@ -1074,8 +1075,8 @@ jobs:
         run: |-
           set -x
           php benchmark/generate_diff.php \
-            ${{ github.event.pull_request.head.sha }} \
-            $(git merge-base ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }}) \
+            ${{ github.sha }} \
+            ${{ github.event.pull_request.base.sha }} \
             > $GITHUB_STEP_SUMMARY
       - uses: actions/upload-artifact@v6
         with:

NEWS

@@ -104,6 +104,9 @@ PHP                                                                        NEWS
   . Fixed GH-20532 (socket_addrinfo_lookup gives the error code with a new
     optional parameter). (David Carlier)
 
+- Sodium:
+  . Added support for libsodium 1.0.21 IPcrypt and XOF APIs. (jedisct1)
+
 - SPL:
   . DirectoryIterator key can now work better with filesystem supporting larger
     directory indexing. (David Carlier)

UPGRADING

@@ -134,6 +134,8 @@ PHP 8.6 UPGRADE NOTES
 
 - Reflection:
   . ReflectionConstant::inNamespace()
+  . ReflectionProperty::isReadable() ReflectionProperty::isWritable() were
+    added.
 
 - Standard:
   . `clamp()` returns the given value if in range, else return the nearest

Zend/tests/bug55509.phpt

@@ -2,6 +2,7 @@
 Bug #55509 (segfault on x86_64 using more than 2G memory)
 --SKIPIF--
 <?php
+if (!getenv('RUN_RESOURCE_HEAVY_TESTS')) die('skip resource-heavy test');
 if (PHP_INT_SIZE == 4) {
   die('skip Not for 32-bits OS');
 }

Zend/tests/bug74093.phpt

@@ -2,6 +2,7 @@
 Bug #74093 (Maximum execution time of n+2 seconds exceed not written in error_log)
 --SKIPIF--
 <?php
+if (!getenv('RUN_RESOURCE_HEAVY_TESTS')) die('skip resource-heavy test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 if (PHP_ZTS) die("skip only for no-zts build");
 if (substr(PHP_OS, 0, 3) == 'WIN') die("skip not for Windows");

Zend/tests/gc/bug78010.phpt

@@ -2,6 +2,7 @@
 Bug #78010: Segmentation fault during GC
 --SKIPIF--
 <?php
+if (!getenv('RUN_RESOURCE_HEAVY_TESTS')) die('skip resource-heavy test');
 if (getenv("SKIP_SLOW_TESTS")) die('skip slow test');
 ?>
 --INI--

ext/bz2/tests/gh20620.phpt

@@ -4,6 +4,7 @@ Bug GH-20620 (bzcompress with large source)
 bz2
 --SKIPIF--
 <?php 
+if (!getenv('RUN_RESOURCE_HEAVY_TESTS')) die('skip resource-heavy test');
 if (PHP_INT_SIZE != 8) die('skip this test is for 64bit platforms only'); 
 if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request');
 ?>

ext/dom/tests/parentnode_childnode_too_long_text.phpt

@@ -6,6 +6,7 @@ dom
 memory_limit=-1
 --SKIPIF--
 <?php
+if (!getenv('RUN_RESOURCE_HEAVY_TESTS')) die('skip resource-heavy test');
 if (PHP_INT_SIZE !== 8) die('skip Only for 64-bit');
 if (getenv('SKIP_SLOW_TESTS')) die('skip slow test');
 // Copied from file_get_contents_file_put_contents_5gb.phpt

ext/gd/tests/bug77270.phpt

@@ -1,7 +1,5 @@
 --TEST--
 Bug #77270 (imagecolormatch Out Of Bounds Write on Heap)
---INI--
-memory_limit=-1
 --EXTENSIONS--
 gd
 --SKIPIF--

ext/gd/tests/bug77272.phpt

@@ -6,6 +6,7 @@ memory_limit=-1
 gd
 --SKIPIF--
 <?php
+if (!getenv('RUN_RESOURCE_HEAVY_TESTS')) die('skip resource-heavy test');
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.5', '<=')) die('skip upstream fix not yet released');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 if (substr(PHP_OS, 0, 3) == 'WIN' && PHP_INT_SIZE === 4) die("skip not for Windows x86");

ext/gd/tests/bug77479.phpt

@@ -4,6 +4,7 @@ Bug #77479 (imagewbmp() segfaults with very large image)
 gd
 --SKIPIF--
 <?php
+if (!getenv('RUN_RESOURCE_HEAVY_TESTS')) die('skip resource-heavy test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 ?>
 --INI--

ext/gd/tests/gh16322.phpt

@@ -2,8 +2,6 @@
 GH-16322 (imageaffine overflow/underflow on affine matrix)
 --EXTENSIONS--
 gd
---INI--
-memory_limit=-1
 --FILE--
 <?php
 $matrix = [INF, 1, 1, 1, 1, 1];

ext/ldap/tests/GHSA-g665-fm4p-vhff-1.phpt

@@ -6,6 +6,7 @@ ldap
 memory_limit=-1
 --SKIPIF--
 <?php
+if (!getenv('RUN_RESOURCE_HEAVY_TESTS')) die('skip resource-heavy test');
 if (PHP_INT_SIZE !== 4) die("skip only for 32-bit");
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 ?>

ext/ldap/tests/GHSA-g665-fm4p-vhff-2.phpt

@@ -6,6 +6,7 @@ ldap
 memory_limit=-1
 --SKIPIF--
 <?php
+if (!getenv('RUN_RESOURCE_HEAVY_TESTS')) die('skip resource-heavy test');
 if (PHP_INT_SIZE !== 4) die("skip only for 32-bit");
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 ?>

ext/pdo_dblib/tests/GHSA-5hqh-c84r-qjcv.phpt

@@ -4,6 +4,7 @@ GHSA-5hqh-c84r-qjcv (Integer overflow in the dblib quoter causing OOB writes)
 pdo_dblib
 --SKIPIF--
 <?php
+if (!getenv('RUN_RESOURCE_HEAVY_TESTS')) die('skip resource-heavy test');
 if (PHP_INT_SIZE != 4) die("skip for 32bit platforms only");
 if (PHP_OS_FAMILY === "Windows") die("skip not for Windows because the virtual address space for application is only 2GiB");
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");

ext/pdo_sqlite/tests/bug81740.phpt

@@ -5,6 +5,7 @@ pdo
 pdo_sqlite
 --SKIPIF--
 <?php
+if (!getenv('RUN_RESOURCE_HEAVY_TESTS')) die('skip resource-heavy test');
 if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platforms only");
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 ?>