From 74fad61607479189e9287273f96bbf348751159a Mon Sep 17 00:00:00 2001
From: ndossche <7771979+ndossche@users.noreply.github.com>
Date: Sat, 21 Mar 2026 22:58:48 +0100
Subject: [PATCH 1/4] Add test for array_diff() array maximum

Forgot to commit this in 614b22ab.
---
 .../tests/array/array_diff_max_elements.phpt     | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 ext/standard/tests/array/array_diff_max_elements.phpt

diff --git a/ext/standard/tests/array/array_diff_max_elements.phpt b/ext/standard/tests/array/array_diff_max_elements.phpt
new file mode 100644
index 0000000000000..4c65cd049b334
--- /dev/null
+++ b/ext/standard/tests/array/array_diff_max_elements.phpt
@@ -0,0 +1,16 @@
+--TEST--
+array_diff(): Max elements
+--FILE--
+<?php
+
+$power = 20; // Chosen to be well within a memory_limit
+$arr = range(0, 2**$power);
+try {
+    array_diff(...array_fill(0, 2**(32-$power), $arr));
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+
+?>
+--EXPECTF--
+The total number of elements must be lower than %d

From 9011bd31d7c26b2f255e550171548eb024d1e4ce Mon Sep 17 00:00:00 2001
From: Ilija Tovilo <ilija.tovilo@me.com>
Date: Sat, 21 Mar 2026 23:43:09 +0100
Subject: [PATCH 2/4] [skip ci] Fix CI badge in README

push.yml has been unified with nightly.yml into test.yml.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9a058bb942e2c..545baa720967c 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ web development. Fast, flexible and pragmatic, PHP powers everything from your
 blog to the most popular websites in the world. PHP is distributed under the
 [PHP License v3.01](LICENSE).
 
-[![Push](https://github.com/php/php-src/actions/workflows/push.yml/badge.svg)](https://github.com/php/php-src/actions/workflows/push.yml)
+[![Test](https://github.com/php/php-src/actions/workflows/test.yml/badge.svg)](https://github.com/php/php-src/actions/workflows/test.yml)
 [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/php.svg)](https://issues.oss-fuzz.com/issues?q=project:php)
 
 ## Documentation

From 0f544b04066064ab494d9291564585a34b54d505 Mon Sep 17 00:00:00 2001
From: Ilija Tovilo <ilija.tovilo@me.com>
Date: Sun, 22 Mar 2026 00:41:37 +0100
Subject: [PATCH 3/4] [skip ci] Fix CLEAN for phar_extract2.phpt

extract1/ is not created by this test, but by phar_extract.phpt, which can lead
to a very rare race condition.
---
 ext/phar/tests/phar_extract2.phpt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ext/phar/tests/phar_extract2.phpt b/ext/phar/tests/phar_extract2.phpt
index f57d96ad5e923..b22c009776650 100644
--- a/ext/phar/tests/phar_extract2.phpt
+++ b/ext/phar/tests/phar_extract2.phpt
@@ -46,8 +46,6 @@ $dir = __DIR__ . '/extract2/';
 @rmdir($dir . 'one/level');
 @rmdir($dir . 'one');
 @rmdir($dir);
-$dir = __DIR__ . '/extract1/';
-@rmdir($dir);
 ?>
 --EXPECTF--
 %sextract2%cfile1.txt

From 486c09cd689046c4ef4dc89c6b2eac76995a0017 Mon Sep 17 00:00:00 2001
From: Ilija Tovilo <ilija.tovilo@me.com>
Date: Sun, 22 Mar 2026 01:54:55 +0100
Subject: [PATCH 4/4] [skip ci] Harden bug74093.phpt

Rarely fails with "Maximum execution time of 1 seconds exceeded" due to being
too fast. Increase the compared arrays and mark as FLAKY, given this is
inherently dependent on processing speed.
---
 Zend/tests/bug74093.phpt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Zend/tests/bug74093.phpt b/Zend/tests/bug74093.phpt
index d9adfeefa50e5..d38d6e5109c49 100644
--- a/Zend/tests/bug74093.phpt
+++ b/Zend/tests/bug74093.phpt
@@ -1,5 +1,6 @@
 --TEST--
 Bug #74093 (Maximum execution time of n+2 seconds exceed not written in error_log)
+--FLAKY--
 --SKIPIF--
 <?php
 if (!getenv('RUN_RESOURCE_HEAVY_TESTS')) die('skip resource-heavy test');
@@ -13,8 +14,8 @@ max_execution_time=1
 hard_timeout=1
 --FILE--
 <?php
-$a1 = range(1, 2000000);
-$a2 = range(100000, 2999999);
+$a1 = range(1, 3000000);
+$a2 = range(100000, 3999999);
 array_intersect($a1, $a2);
 ?>
 --EXPECTF--