Commit c6ad84fb9e5 for php.net

commit c6ad84fb9e59d9deab7937df359fd8f96e0abd6c
Merge: 49c3bee95f9 3a57b4ced50
Author: Ilija Tovilo <ilija.tovilo@me.com>
Date:   Fri Feb 27 15:04:24 2026 +0100

    Merge branch 'PHP-8.2' into PHP-8.3

    * PHP-8.2:
      Add RUN_RESOURCE_HEAVY_TESTS env var

diff --cc .github/actions/test-linux/action.yml
index d32800622ac,337066ea0df..5c628811b33
--- a/.github/actions/test-linux/action.yml
+++ b/.github/actions/test-linux/action.yml
@@@ -38,12 -38,8 +38,13 @@@ runs
          if [[ -z "$PDO_PGSQL_TEST_DSN" ]]; then
            export PDO_PGSQL_TEST_DSN="pgsql:host=localhost port=5432 dbname=test user=postgres password=postgres"
          fi
 +        export ODBC_TEST_USER="odbc_test"
 +        export ODBC_TEST_PASS="password"
 +        export ODBC_TEST_DSN="Driver={ODBC Driver 17 for SQL Server};Server=127.0.0.1;Database=odbc;uid=$ODBC_TEST_USER;pwd=$ODBC_TEST_PASS"
 +        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 zend_extension=opcache.so -d opcache.enable_cli=1' || '' }} \
            -d opcache.jit=${{ inputs.jitType }} \
diff --cc .github/actions/test-macos/action.yml
index 75e8a7935c0,e0e53a1beb9..930a0a32d19
--- a/.github/actions/test-macos/action.yml
+++ b/.github/actions/test-macos/action.yml
@@@ -17,7 -17,7 +17,8 @@@ runs
          set -x
          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 zend_extension=opcache.so -d opcache.enable_cli=1' || '' }} \
            -d opcache.jit=${{ inputs.jitType }} \
diff --cc ext/bz2/tests/gh20620.phpt
index 351ba488b2b,00000000000..a7ab0a3c843
mode 100644,000000..100644
--- a/ext/bz2/tests/gh20620.phpt
+++ b/ext/bz2/tests/gh20620.phpt
@@@ -1,21 -1,0 +1,22 @@@
 +--TEST--
 +Bug GH-20620 (bzcompress with large source)
 +--EXTENSIONS--
 +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');
 +?>
 +--INI--
 +memory_limit=-1
 +--FILE--
 +<?php
 +try {
 +	bzcompress(str_repeat('1', 4295163906));
 +} catch (\ValueError $e) {
 +	echo $e->getMessage(), PHP_EOL;
 +}
 +?>
 +--EXPECTF--
 +bzcompress(): Argument #1 ($data) must have a length less than or equal to %d
diff --cc ext/standard/tests/strings/gh18976.phpt
index aa58167f9d4,00000000000..099ff94cc24
mode 100644,000000..100644
--- a/ext/standard/tests/strings/gh18976.phpt
+++ b/ext/standard/tests/strings/gh18976.phpt
@@@ -1,14 -1,0 +1,18 @@@
 +--TEST--
 +GH-18976 (pack overflow with h/H format)
 +--INI--
 +memory_limit=-1
++--SKIPIF--
++<?php
++if (!getenv('RUN_RESOURCE_HEAVY_TESTS')) die('skip resource-heavy test');
++?>
 +--FILE--
 +<?php
 +pack('h2147483647', 1);
 +pack('H2147483647', 1);
 +?>
 +--EXPECTF--
 +
 +Warning: pack(): Type h: not enough characters in string in %s on line %d
 +
 +Warning: pack(): Type H: not enough characters in string in %s on line %d