summaryrefslogtreecommitdiffstats
path: root/upstream.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2022-12-20 16:51:26 +0100
committerRemi Collet <remi@php.net>2022-12-20 16:51:26 +0100
commit1edd8c0d680fc7db859cc18738822b18d4713450 (patch)
tree6e6500c118a20003a1b24c284c0c081a921205c5 /upstream.patch
parenta2c63c8845e5ecfc10f120fbfc139ae2d8ad5aee (diff)
add upstream patch for failing test
Diffstat (limited to 'upstream.patch')
-rw-r--r--upstream.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/upstream.patch b/upstream.patch
new file mode 100644
index 0000000..ffd13b6
--- /dev/null
+++ b/upstream.patch
@@ -0,0 +1,22 @@
+From bfa56cf62bfdb07afa93c63ec263ce24a591261d Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Tue, 20 Dec 2022 15:24:15 +0100
+Subject: [PATCH] Fix #10133 set variables_order en ensure $ENV is set
+
+---
+ Zend/tests/traits/constant_016.phpt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Zend/tests/traits/constant_016.phpt b/Zend/tests/traits/constant_016.phpt
+index 9cb2b29bcc09..0754c1571637 100644
+--- a/Zend/tests/traits/constant_016.phpt
++++ b/Zend/tests/traits/constant_016.phpt
+@@ -2,6 +2,8 @@
+ Compatibility of values of same name trait constants is checked after their constant expressions are evaluated
+ --ENV--
+ ENSURE_CONSTANT_IS_DEFINED_AT_RUNTIME=1
++--INI--
++variables_order=EGPCS
+ --FILE--
+ <?php
+