From 97e518d714b116460e0aa9b878a982aa96da8a44 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 9 Sep 2022 15:40:21 +0200
Subject: add fix from PHP 8.2 from

  https://github.com/php/pecl-search_engine-solr/pull/39
---
 solr-php82.patch | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 solr-php82.patch

(limited to 'solr-php82.patch')

diff --git a/solr-php82.patch b/solr-php82.patch
new file mode 100644
index 0000000..60e2871
--- /dev/null
+++ b/solr-php82.patch
@@ -0,0 +1,48 @@
+diff --git a/src/php7/php_solr.c b/src/php7/php_solr.c
+index 2110296..eb9dd22 100644
+--- a/src/php7/php_solr.c
++++ b/src/php7/php_solr.c
+@@ -542,6 +542,13 @@ ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, mime_type)
+ ZEND_ARG_OBJ_INFO(SOLR_ARG_PASS_BY_REF_TRUE, params, SolrModifiableParams, SOLR_ARG_ALLOW_NULL_FALSE)
+ ZEND_END_ARG_INFO()
+ 
++#if PHP_VERSION_ID >= 80200
++ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(Solr_toString_args, 0, 0, IS_STRING, 0)
++#else
++ZEND_BEGIN_ARG_INFO_EX(Solr_toString_args, 0, 0, 0)
++#endif
++ZEND_END_ARG_INFO();
++
+ 
+ /* }}} */
+ 
+@@ -607,7 +614,7 @@ static zend_function_entry solr_collapse_function_methods[] = {
+ 
+     PHP_ME(SolrCollapseFunction, setNullPolicy, SolrCollapseFunction_set_null_policy_args, ZEND_ACC_PUBLIC)
+     PHP_ME(SolrCollapseFunction, getNullPolicy, Solr_no_args, ZEND_ACC_PUBLIC)
+-    PHP_ME(SolrCollapseFunction, __toString, Solr_no_args, ZEND_ACC_PUBLIC)
++    PHP_ME(SolrCollapseFunction, __toString, Solr_toString_args, ZEND_ACC_PUBLIC)
+     PHP_ME(SolrCollapseFunction, __sleep, Solr_no_args, ZEND_ACC_PUBLIC)
+     PHP_ME(SolrCollapseFunction, __wakeup, Solr_no_args, ZEND_ACC_PUBLIC)
+ 
+@@ -772,7 +779,7 @@ static zend_function_entry solr_illegal_argument_exception_methods[] = {
+ static zend_function_entry solr_params_methods[] = {
+ 	PHP_ME(SolrParams, setParam,  SolrParams_setParam_args, ZEND_ACC_PUBLIC)
+ 	PHP_ME(SolrParams, addParam,  SolrParams_addParam_args, ZEND_ACC_PUBLIC)
+-	PHP_ME(SolrParams, __toString, Solr_no_args, ZEND_ACC_PUBLIC)
++	PHP_ME(SolrParams, __toString, Solr_toString_args, ZEND_ACC_PUBLIC)
+ 	PHP_ME(SolrParams, toString, SolrParams_toString_args, ZEND_ACC_PUBLIC)
+ 	PHP_ME(SolrParams, getParams, Solr_no_args, ZEND_ACC_PUBLIC)
+ 	PHP_ME(SolrParams, getParam, SolrParams_getParam_args, ZEND_ACC_PUBLIC)
+diff --git a/tests/test.config.inc b/tests/test.config.inc
+index 1d61156..1475d76 100644
+--- a/tests/test.config.inc
++++ b/tests/test.config.inc
+@@ -1,6 +1,6 @@
+ <?php
+ 
+-define('SOLR_SERVER_CONFIGURED', true);
++define('SOLR_SERVER_CONFIGURED', false);
+ 
+ define('ROOT_DIRECTORY', dirname(__FILE__));
+ 
-- 
cgit