summaryrefslogtreecommitdiffstats
path: root/protobuf-php81.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-09-18 12:55:08 +0200
committerRemi Collet <remi@remirepo.net>2021-09-18 12:55:08 +0200
commit79f188a39c68e9d83f37b908c5f81c454f5b9430 (patch)
tree065bc7c7ec9c2353197472a24f9243bf8a502e81 /protobuf-php81.patch
parent8d8f84b2bebd02ffc2e16335dad17e401f98b157 (diff)
update to 3.18.0
Diffstat (limited to 'protobuf-php81.patch')
-rw-r--r--protobuf-php81.patch49
1 files changed, 0 insertions, 49 deletions
diff --git a/protobuf-php81.patch b/protobuf-php81.patch
deleted file mode 100644
index 2eef0dc..0000000
--- a/protobuf-php81.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 5e89bfbb99ea2e20a0875c6feb3a61977d711511 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Tue, 8 Jun 2021 17:36:45 +0200
-Subject: [PATCH] fix for PHP 8.1
-
----
- php/ext/google/protobuf/array.c | 5 +++++
- php/ext/google/protobuf/map.c | 5 +++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/php/ext/google/protobuf/array.c b/php/ext/google/protobuf/array.c
-index 765e90297..2736f1a22 100644
---- a/php/ext/google/protobuf/array.c
-+++ b/php/ext/google/protobuf/array.c
-@@ -640,8 +640,13 @@ void Array_ModuleInit() {
- repeated_field_methods);
-
- RepeatedField_class_entry = zend_register_internal_class(&tmp_ce);
-+#if PHP_VERSION_ID < 70200
- zend_class_implements(RepeatedField_class_entry, 3, spl_ce_ArrayAccess,
- zend_ce_aggregate, spl_ce_Countable);
-+#else
-+ zend_class_implements(RepeatedField_class_entry, 3, zend_ce_arrayaccess,
-+ zend_ce_aggregate, zend_ce_countable);
-+#endif
- RepeatedField_class_entry->ce_flags |= ZEND_ACC_FINAL;
- RepeatedField_class_entry->create_object = RepeatedField_create;
-
-diff --git a/php/ext/google/protobuf/map.c b/php/ext/google/protobuf/map.c
-index f5890d99e..74f25e5bc 100644
---- a/php/ext/google/protobuf/map.c
-+++ b/php/ext/google/protobuf/map.c
-@@ -636,8 +636,13 @@ void Map_ModuleInit() {
- MapField_methods);
-
- MapField_class_entry = zend_register_internal_class(&tmp_ce);
-+#if PHP_VERSION_ID < 70200
- zend_class_implements(MapField_class_entry, 3, spl_ce_ArrayAccess,
- zend_ce_aggregate, spl_ce_Countable);
-+#else
-+ zend_class_implements(MapField_class_entry, 3, zend_ce_arrayaccess,
-+ zend_ce_aggregate, zend_ce_countable);
-+#endif
- MapField_class_entry->ce_flags |= ZEND_ACC_FINAL;
- MapField_class_entry->create_object = MapField_create;
-
---
-2.31.1
-