summaryrefslogtreecommitdiffstats
path: root/10.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2025-07-17 16:45:18 +0200
committerRemi Collet <remi@php.net>2025-07-17 16:45:18 +0200
commit63f92563150d98285c9f35ce3d3cce9508cec3f3 (patch)
tree6942f5e688848017d3d700cffae7ebb99f09a66a /10.patch
parenteae3da1fe433b284e03ca725b3b4a06a4de522a9 (diff)
add fixes for PHP 8.5.0alpha2 using patch fromHEADmaster
https://github.com/ace411/php-trie-ext/pull/10 re-license spec file to CECILL-2.1
Diffstat (limited to '10.patch')
-rw-r--r--10.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/10.patch b/10.patch
new file mode 100644
index 0000000..ff4a563
--- /dev/null
+++ b/10.patch
@@ -0,0 +1,42 @@
+From 917069332cb88706202ea70fd06f762944271cf9 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Thu, 17 Jul 2025 16:41:44 +0200
+Subject: [PATCH] SPL is always there
+
+---
+ common.cpp | 2 --
+ php_trie.cpp | 5 -----
+ 2 files changed, 7 deletions(-)
+
+diff --git a/common.cpp b/common.cpp
+index 1673811..65e1dfb 100644
+--- a/common.cpp
++++ b/common.cpp
+@@ -23,9 +23,7 @@ using namespace trie;
+ #include "config.h"
+ #endif
+
+-#ifdef HAVE_SPL
+ #include "ext/spl/spl_exceptions.h"
+-#endif
+
+ /* For compatibility with older PHP versions */
+ #ifndef ZEND_PARSE_PARAMETERS_NONE
+diff --git a/php_trie.cpp b/php_trie.cpp
+index c6081bc..2c17f76 100644
+--- a/php_trie.cpp
++++ b/php_trie.cpp
+@@ -530,13 +530,8 @@ PHP_MINIT_FUNCTION(php_trie)
+ sizeof("DEFAULT_BURST_THRESHOLD") - 1,
+ DEFAULT_BURST_THRESHOLD);
+
+-#ifdef HAVE_SPL
+ phptrie_exception_ce = zend_register_internal_class_ex(
+ &exception_ce, spl_ce_RuntimeException);
+-#else
+- phptrie_exception_ce = zend_register_internal_class_ex(
+- &exception_ce, zend_exception_get_default());
+-#endif
+
+ zend_class_implements(phphattrie_ce, 2, zend_ce_arrayaccess, php_json_serializable_ce);
+ zend_class_implements(phptrie_ce, 2, zend_ce_arrayaccess, php_json_serializable_ce);