From 3abb79ec386c98c43eaf2681948760ac1774dbe1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 9 Jul 2019 09:17:21 +0200 Subject: - add patch for PHP 7.4 from https://github.com/php/pecl-database-mysql_xdevapi/pull/6 https://github.com/php/pecl-database-mysql_xdevapi/pull/7 --- 6.patch | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 6.patch (limited to '6.patch') diff --git a/6.patch b/6.patch new file mode 100644 index 0000000..a7cbd1f --- /dev/null +++ b/6.patch @@ -0,0 +1,38 @@ +From cdc9220d8585011cf48fbbb82f2d2a6b2b3352ac Mon Sep 17 00:00:00 2001 +From: Peter Kokot +Date: Thu, 27 Jun 2019 00:43:21 +0200 +Subject: [PATCH] Remove HAVE_SPL + +The HAVE_SPL symbol is defined in PHP to indicate the presence of the +spl extension. Since PHP 5.3 the spl extension is always availabe and +since PHP-7.4 the HAVE_SPL symbol has also been removed. +--- + mysqlx_exception.cc | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/mysqlx_exception.cc b/mysqlx_exception.cc +index a2e423d6..5fc2883e 100644 +--- a/mysqlx_exception.cc ++++ b/mysqlx_exception.cc +@@ -19,9 +19,7 @@ + extern "C" { + #include + #include "mysqlnd_api.h" +-#ifdef HAVE_SPL + #include /* spl_ce_RuntimeException */ +-#endif + } + #include "xmysqlnd/xmysqlnd.h" + #include "php_mysqlx.h" +@@ -140,11 +138,7 @@ mysqlx_register_exception_class(UNUSED_INIT_FUNC_ARGS, zend_object_handlers * my + { + zend_class_entry tmp_ce; + INIT_NS_CLASS_ENTRY(tmp_ce, "mysql_xdevapi", "Exception", mysqlx_exception_methods); +-#ifdef HAVE_SPL + mysqlx_exception_class_entry = zend_register_internal_class_ex(&tmp_ce, spl_ce_RuntimeException); +-#else +- mysqlx_exception_class_entry = zend_register_internal_class_ex(&tmp_ce, zend_ce_exception); +-#endif + } + + zend_hash_init(&mysqlx_exception_properties, 0, nullptr, mysqlx_free_property_cb, 1); -- cgit