[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pecl-cvs
Subject:    [PECL-CVS] com =?UTF-8?Q?pecl/search=5Fengine/solr=3A=20Bug=20=23=37=33=36=37=31=20Z?= =?UTF-8?Q?end
From:       Omar Shaban <omars () php ! net>
Date:       2016-12-15 10:32:11
Message-ID: php-mail-ee6fd1b3d25ccb4056b3bc0a06df9cc1526739906 () git ! php ! net
[Download RAW message or body]

Commit:    e1cd59aae729ac23b3dc208b60a5c9448f84b213
Author:    Omar Shaban <omars@php.net>         Thu, 15 Dec 2016 11:32:11 +0100
Parents:   ed850dadff910bc50731a2866eb572c50c89515a
Branches:  master

Link:       http://git.php.net/?p=pecl/search_engine/solr.git;a=commitdiff;h=e1cd59aae729ac23b3dc208b60a5c9448f84b213


Log:
Bug #73671 Zend assertion error in `make test when php 7.1

Bugs:
https://bugs.php.net/73671

Changed paths:
  M  NEWS
  M  src/php7/php_solr.c


["diff_e1cd59aae729ac23b3dc208b60a5c9448f84b213.txt" (text/plain)]

diff --git a/NEWS b/NEWS
index 6e69fdf..e046ace 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+Bug #73671: Zend assertion error in `make test` when php 7.1 is built with \
--enable-debug  Bug #72033: Real Time Get requests fails if it wasn't the first \
request  Bug #72740: addQueryField return wrong query
 Feature #71360: Atomic Update
diff --git a/src/php7/php_solr.c b/src/php7/php_solr.c
index 4963ab0..568b7c5 100644
--- a/src/php7/php_solr.c
+++ b/src/php7/php_solr.c
@@ -149,10 +149,10 @@ ZEND_ARG_OBJ_INFO(SOLR_ARG_PASS_BY_REF_TRUE, sourceDoc, \
SolrDocument, SOLR_ARG_A  ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, overwrite)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrDocument_current_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_TRUE, 0) \
+ZEND_BEGIN_ARG_INFO_EX(SolrDocument_current_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 0)  \
ZEND_END_ARG_INFO()  
-ZEND_BEGIN_ARG_INFO_EX(SolrDocument_getInputDocument_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_TRUE, 0) \
+ZEND_BEGIN_ARG_INFO_EX(SolrDocument_getInputDocument_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 0)  \
ZEND_END_ARG_INFO()  
 ZEND_BEGIN_ARG_INFO(SolrDocument_unserialize_args, 0)
@@ -209,17 +209,17 @@ ZEND_BEGIN_ARG_INFO_EX(SolrInputDocument_addChildDocument_args, \
SOLR_ARG_PASS_RE  ZEND_ARG_OBJ_INFO(SOLR_ARG_PASS_BY_REF_TRUE, child, \
SolrInputDocument, SOLR_ARG_ALLOW_NULL_FALSE)  ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrInputDocument_addChildDocuments_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_TRUE, 1) \
+ZEND_BEGIN_ARG_INFO_EX(SolrInputDocument_addChildDocuments_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 1)  \
ZEND_ARG_ARRAY_INFO(SOLR_ARG_PASS_BY_REF_TRUE, docs, SOLR_ARG_ALLOW_NULL_FALSE)  \
ZEND_END_ARG_INFO()  
-ZEND_BEGIN_ARG_INFO_EX(SolrInputDocument_updateField_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_TRUE, 3) \
+ZEND_BEGIN_ARG_INFO_EX(SolrInputDocument_updateField_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 3)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, fieldName)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, modifier)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, value)  ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrInputDocument_setVersion_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_TRUE, 1) \
+ZEND_BEGIN_ARG_INFO_EX(SolrInputDocument_setVersion_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 1)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, version)  ZEND_END_ARG_INFO()
 /* }}} */
@@ -229,68 +229,68 @@ ZEND_BEGIN_ARG_INFO_EX(SolrClient_constructor_args, \
SOLR_ARG_PASS_REMAINING_BY_R  ZEND_ARG_ARRAY_INFO(SOLR_ARG_PASS_BY_REF_FALSE, \
clientOptions, SOLR_ARG_ALLOW_NULL_FALSE)  ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrClient_query_args, SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, \
SOLR_METHOD_RETURN_REFERENCE_TRUE, 1) +ZEND_BEGIN_ARG_INFO_EX(SolrClient_query_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 1)  \
ZEND_ARG_OBJ_INFO(SOLR_ARG_PASS_BY_REF_TRUE, query, SolrParams, \
SOLR_ARG_ALLOW_NULL_FALSE)  ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrClient_addDocument_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_TRUE, 1) \
+ZEND_BEGIN_ARG_INFO_EX(SolrClient_addDocument_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 1)  \
ZEND_ARG_OBJ_INFO(SOLR_ARG_PASS_BY_REF_TRUE, doc, SolrInputDocument, \
SOLR_ARG_ALLOW_NULL_FALSE)  ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, overwrite)
 ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, commitWithin)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrClient_addDocuments_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_TRUE, 1) \
+ZEND_BEGIN_ARG_INFO_EX(SolrClient_addDocuments_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 1)  \
ZEND_ARG_ARRAY_INFO(SOLR_ARG_PASS_BY_REF_TRUE, docs, SOLR_ARG_ALLOW_NULL_FALSE)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, overwrite)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, commitWithin)  ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrClient_request_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_TRUE, 1) \
+ZEND_BEGIN_ARG_INFO_EX(SolrClient_request_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 1)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, raw_request)  ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrClient_setResponseWriter_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_TRUE, 1) \
+ZEND_BEGIN_ARG_INFO_EX(SolrClient_setResponseWriter_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 1)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, responseWriter)  ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrClient_commit_args, SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, \
SOLR_METHOD_RETURN_REFERENCE_TRUE, 0) +ZEND_BEGIN_ARG_INFO_EX(SolrClient_commit_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 0)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, softCommit)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, waitSearcher)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, expungeDeletes)  ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrClient_optimize_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_TRUE, 0) \
+ZEND_BEGIN_ARG_INFO_EX(SolrClient_optimize_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 0)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, maxSegments)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, softCommit)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, waitSearcher)  ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrClient_rollback_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_TRUE, 0) \
+ZEND_BEGIN_ARG_INFO_EX(SolrClient_rollback_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 0)  \
ZEND_END_ARG_INFO()  
-ZEND_BEGIN_ARG_INFO_EX(SolrClient_deleteById_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_TRUE, 1) \
+ZEND_BEGIN_ARG_INFO_EX(SolrClient_deleteById_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 1)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, id)  ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrClient_deleteByIds_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_TRUE, 1) \
+ZEND_BEGIN_ARG_INFO_EX(SolrClient_deleteByIds_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 1)  \
ZEND_ARG_ARRAY_INFO(SOLR_ARG_PASS_BY_REF_FALSE, ids, SOLR_ARG_ALLOW_NULL_FALSE)  \
ZEND_END_ARG_INFO()  
-ZEND_BEGIN_ARG_INFO_EX(SolrClient_deleteByQuery_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_TRUE, 1) \
+ZEND_BEGIN_ARG_INFO_EX(SolrClient_deleteByQuery_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 1)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, query)  ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrClient_deleteByQueries_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_TRUE, 1) \
+ZEND_BEGIN_ARG_INFO_EX(SolrClient_deleteByQueries_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 1)  \
ZEND_ARG_ARRAY_INFO(SOLR_ARG_PASS_BY_REF_FALSE, queries, SOLR_ARG_ALLOW_NULL_FALSE)  \
ZEND_END_ARG_INFO()  
-ZEND_BEGIN_ARG_INFO_EX(SolrClient_ping_args, SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, \
SOLR_METHOD_RETURN_REFERENCE_TRUE, 0) +ZEND_BEGIN_ARG_INFO_EX(SolrClient_ping_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 0)  \
ZEND_END_ARG_INFO()  
-ZEND_BEGIN_ARG_INFO_EX(SolrClient_threads_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_TRUE, 0) \
+ZEND_BEGIN_ARG_INFO_EX(SolrClient_threads_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 0)  \
ZEND_END_ARG_INFO()  
-ZEND_BEGIN_ARG_INFO_EX(SolrClient_info_args, SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, \
SOLR_METHOD_RETURN_REFERENCE_TRUE, 0) +ZEND_BEGIN_ARG_INFO_EX(SolrClient_info_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 0)  \
ZEND_END_ARG_INFO()  
 ZEND_BEGIN_ARG_INFO_EX(SolrClient_setServlet_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 2) @@ \
-300,12 +300,12 @@ ZEND_END_ARG_INFO()  /* }}} */
 
 /* {{{ SolrParams arguments */
-ZEND_BEGIN_ARG_INFO_EX(SolrParams_setParam_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_TRUE, 2) \
+ZEND_BEGIN_ARG_INFO_EX(SolrParams_setParam_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 2)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, name)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, value)  ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrParams_addParam_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_TRUE, 2) \
+ZEND_BEGIN_ARG_INFO_EX(SolrParams_addParam_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 2)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, name)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, value)  ZEND_END_ARG_INFO()
@@ -328,52 +328,52 @@ ZEND_BEGIN_ARG_INFO_EX(SolrQuery_constructor_args, \
SOLR_ARG_PASS_REMAINING_BY_RE  ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, q)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrQuery_setQuery_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_TRUE, 1) \
+ZEND_BEGIN_ARG_INFO_EX(SolrQuery_setQuery_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 1)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, q)  ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrQuery_setStart_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_TRUE, 1) \
+ZEND_BEGIN_ARG_INFO_EX(SolrQuery_setStart_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 1)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, start)  ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrQuery_setRows_args, SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, \
SOLR_METHOD_RETURN_REFERENCE_TRUE, 1) +ZEND_BEGIN_ARG_INFO_EX(SolrQuery_setRows_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 1)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, rows)  ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrQuery_addField_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_TRUE, 1) \
+ZEND_BEGIN_ARG_INFO_EX(SolrQuery_addField_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 1)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, field)  ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrQuery_addSortField_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_TRUE, 1) \
+ZEND_BEGIN_ARG_INFO_EX(SolrQuery_addSortField_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 1)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, field)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, order)  ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrQuery_addFilterQuery_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_TRUE, 1) \
+ZEND_BEGIN_ARG_INFO_EX(SolrQuery_addFilterQuery_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 1)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, fq)  ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrQuery_setShowDebugInfo_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_TRUE, 1) \
+ZEND_BEGIN_ARG_INFO_EX(SolrQuery_setShowDebugInfo_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 1)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, flag)  ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrQuery_setExplainOther_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_TRUE, 1) \
+ZEND_BEGIN_ARG_INFO_EX(SolrQuery_setExplainOther_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 1)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, flag)  ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrQuery_setTimeAllowed_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_TRUE, 1) \
+ZEND_BEGIN_ARG_INFO_EX(SolrQuery_setTimeAllowed_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 1)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, timeAllowed)  ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrQuery_setOmitHeader_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_TRUE, 1) \
+ZEND_BEGIN_ARG_INFO_EX(SolrQuery_setOmitHeader_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 1)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, flag)  ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrQuery_setEchoHandler_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_TRUE, 1) \
+ZEND_BEGIN_ARG_INFO_EX(SolrQuery_setEchoHandler_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 1)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, flag)  ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrQuery_setEchoParams_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_TRUE, 1) \
+ZEND_BEGIN_ARG_INFO_EX(SolrQuery_setEchoParams_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 1)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, type)  ZEND_END_ARG_INFO()
 
@@ -381,16 +381,16 @@ ZEND_BEGIN_ARG_INFO_EX(SolrQuery_facet_get_1_0_args, \
SOLR_ARG_PASS_REMAINING_BY_  ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, \
field_override)  ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrQuery_facet_1_1_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_TRUE, 1) \
+ZEND_BEGIN_ARG_INFO_EX(SolrQuery_facet_1_1_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 1)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, value)  ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrQuery_facet_2_1_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_TRUE, 1) \
+ZEND_BEGIN_ARG_INFO_EX(SolrQuery_facet_2_1_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 1)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, value)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, field_override)  ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrQuery_group_1_1_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_TRUE, 1) \
+ZEND_BEGIN_ARG_INFO_EX(SolrQuery_group_1_1_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 1)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, value)  ZEND_END_ARG_INFO()
 
@@ -398,37 +398,37 @@ ZEND_BEGIN_ARG_INFO_EX(SolrQuery_hl_get_1_0_args, \
SOLR_ARG_PASS_REMAINING_BY_REF  ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, \
field_override)  ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrQuery_hl_1_1_args, SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, \
SOLR_METHOD_RETURN_REFERENCE_TRUE, 1) +ZEND_BEGIN_ARG_INFO_EX(SolrQuery_hl_1_1_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 1)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, value)  ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrQuery_hl_2_1_args, SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, \
SOLR_METHOD_RETURN_REFERENCE_TRUE, 1) +ZEND_BEGIN_ARG_INFO_EX(SolrQuery_hl_2_1_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 1)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, value)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, field_override)  ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrQuery_stats_1_1_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_TRUE, 1) \
+ZEND_BEGIN_ARG_INFO_EX(SolrQuery_stats_1_1_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 1)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, value)  ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrQuery_mlt_1_1_args, SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, \
SOLR_METHOD_RETURN_REFERENCE_TRUE, 1) +ZEND_BEGIN_ARG_INFO_EX(SolrQuery_mlt_1_1_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 1)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, value)  ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrQuery_mlt_2_2_args, SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, \
SOLR_METHOD_RETURN_REFERENCE_TRUE, 2) +ZEND_BEGIN_ARG_INFO_EX(SolrQuery_mlt_2_2_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 2)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, field)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, boost)  ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrQuery_terms_1_1_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_TRUE, 1) \
+ZEND_BEGIN_ARG_INFO_EX(SolrQuery_terms_1_1_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 1)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, value)  ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrQuery_setGroupCachePct_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_TRUE, 1) \
+ZEND_BEGIN_ARG_INFO_EX(SolrQuery_setGroupCachePct_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 1)  \
ZEND_ARG_INFO(SOLR_ARG_PASS_BY_REF_FALSE, percent)  ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(SolrQuery_collapse_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_TRUE, 1) \
+ZEND_BEGIN_ARG_INFO_EX(SolrQuery_collapse_args, \
SOLR_ARG_PASS_REMAINING_BY_REF_FALSE, SOLR_METHOD_RETURN_REFERENCE_FALSE, 1)  \
ZEND_ARG_OBJ_INFO(SOLR_ARG_PASS_BY_REF_TRUE, collapseFunction, SolrCollapseFunction, \
SOLR_ARG_ALLOW_NULL_FALSE)  ZEND_END_ARG_INFO()



-- 
PECL CVS Mailing List 
To unsubscribe, visit: http://www.php.net/unsub.php

[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic