summaryrefslogtreecommitdiffstats
path: root/998a115360e9713c5d2da959dcde3ff49dc1a4fc.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-08-25 08:35:33 +0200
committerRemi Collet <remi@remirepo.net>2019-08-25 08:35:33 +0200
commitdc10827b6792763cce8d79d9b270744d5af483f4 (patch)
treef06b267c2cddb448b9d32fda57524597c83a8813 /998a115360e9713c5d2da959dcde3ff49dc1a4fc.patch
parent06fc5518f40141d137e0181bfb2425f00c1f057e (diff)
add upstream patches for 7.4
Diffstat (limited to '998a115360e9713c5d2da959dcde3ff49dc1a4fc.patch')
-rw-r--r--998a115360e9713c5d2da959dcde3ff49dc1a4fc.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/998a115360e9713c5d2da959dcde3ff49dc1a4fc.patch b/998a115360e9713c5d2da959dcde3ff49dc1a4fc.patch
new file mode 100644
index 0000000..9eca301
--- /dev/null
+++ b/998a115360e9713c5d2da959dcde3ff49dc1a4fc.patch
@@ -0,0 +1,22 @@
+From 998a115360e9713c5d2da959dcde3ff49dc1a4fc Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Sat, 24 Aug 2019 07:37:17 +0200
+Subject: [PATCH] fix #177 build with recent 7.4 changes
+
+---
+ src/class.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/class.c b/src/class.c
+index fd1e195..1973545 100644
+--- a/src/class.c
++++ b/src/class.c
+@@ -173,7 +173,7 @@ zend_bool uopz_extend(zend_class_entry *clazz, zend_class_entry *parent) {
+ clazz->ce_flags &= ~ZEND_ACC_TRAIT;
+ parent->ce_flags &= ~ZEND_ACC_TRAIT;
+ }
+- zend_do_link_class(clazz, parent);
++ zend_do_inheritance(clazz, parent);
+ if (is_trait) {
+ clazz->ce_flags |= ZEND_ACC_TRAIT;
+ parent->ce_flags |= ZEND_ACC_TRAIT;