Skip to content

Commit ab449d6

Browse files
marinesovitchmarinesovitch
committed
Merge remote-tracking branch 'remotes/origin/wl-10740-bugs-and-refactorings' into master-itch
2 parents a61a37d + 27df729 commit ab449d6

39 files changed

+679
-258
lines changed

‎messages/mysqlx_connection.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_connection, connect)
9898
enum_func_status ret{FAIL};
9999

100100
DBG_ENTER("mysqlx_connection::connect");
101-
if (FAILURE == zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os|l",
101+
if (FAILURE == util::zend::parse_method_parameters(execute_data, getThis(), "Os|l",
102102
&connection_zv, mysqlx_connection_class_entry,
103103
&(hostname.s), &(hostname.l),
104104
&port))
@@ -146,7 +146,7 @@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_connection, send)
146146
size_t ret{0};
147147

148148
DBG_ENTER("mysqlx_connection::send");
149-
if (FAILURE == zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os",
149+
if (FAILURE == util::zend::parse_method_parameters(execute_data, getThis(), "Os",
150150
&connection_zv, mysqlx_connection_class_entry,
151151
&(payload.s), &(payload.l)))
152152
{
@@ -178,7 +178,7 @@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_connection, receive)
178178
enum_func_status ret;
179179

180180
DBG_ENTER("mysqlx_connection::receive");
181-
if (FAILURE == zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Ol",
181+
if (FAILURE == util::zend::parse_method_parameters(execute_data, getThis(), "Ol",
182182
&connection_zv, mysqlx_connection_class_entry,
183183
&how_many))
184184
{

‎messages/mysqlx_message__auth_continue.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ extern "C" {
4040
#include "mysqlx_message__auth_ok.h"
4141

4242
#include "util/object.h"
43+
#include "util/zend_utils.h"
4344

4445
namespace mysqlx {
4546

@@ -102,7 +103,7 @@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_message__auth_continue, send)
102103
size_t schema_len{0};
103104

104105
DBG_ENTER("mysqlx_message__auth_continue::send");
105-
if (FAILURE == zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OsssOO",
106+
if (FAILURE == util::zend::parse_method_parameters(execute_data, getThis(), "OsssOO",
106107
&object_zv, mysqlx_message__auth_continue_class_entry,
107108
&user, &user_len,
108109
&password, &password_len,
@@ -151,7 +152,7 @@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_message__auth_continue, read_response)
151152
size_t ret{0};
152153

153154
DBG_ENTER("mysqlx_message__auth_continue::read_response");
154-
if (FAILURE == zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OOO",
155+
if (FAILURE == util::zend::parse_method_parameters(execute_data, getThis(), "OOO",
155156
&object_zv, mysqlx_message__auth_continue_class_entry,
156157
&codec_zv, mysqlx_pfc_class_entry,
157158
&connection_zv, mysqlx_connection_class_entry))

‎messages/mysqlx_message__auth_ok.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ extern "C" {
3737
#include "mysqlx_message__auth_ok.h"
3838

3939
#include "util/object.h"
40+
#include "util/zend_utils.h"
4041

4142
namespace mysqlx {
4243

@@ -77,7 +78,7 @@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_message__auth_ok, response)
7778
st_mysqlx_message__auth_ok* object{nullptr};
7879

7980
DBG_ENTER("mysqlx_message__auth_ok::response");
80-
if (FAILURE == zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O",
81+
if (FAILURE == util::zend::parse_method_parameters(execute_data, getThis(), "O",
8182
&object_zv, mysqlx_message__auth_ok_class_entry))
8283
{
8384
DBG_VOID_RETURN;

‎messages/mysqlx_message__auth_start.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ extern "C" {
3939
#include "mysqlx_message__auth_ok.h"
4040

4141
#include "util/object.h"
42+
#include "util/zend_utils.h"
4243

4344
namespace mysqlx {
4445

@@ -97,7 +98,7 @@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_message__auth_start, send)
9798
st_mysqlx_pfc* codec{nullptr};
9899

99100
DBG_ENTER("mysqlx_message__auth_start::send");
100-
if (FAILURE == zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OssOO",
101+
if (FAILURE == util::zend::parse_method_parameters(execute_data, getThis(), "OssOO",
101102
&object_zv, mysqlx_message__auth_start_class_entry,
102103
&auth_mech_name, &auth_mech_name_len,
103104
&auth_data, &auth_data_len,
@@ -135,7 +136,7 @@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_message__auth_start, read_response)
135136
st_mysqlx_pfc* codec{nullptr};
136137

137138
DBG_ENTER("mysqlx_message__auth_start::read_response");
138-
if (FAILURE == zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OOO",
139+
if (FAILURE == util::zend::parse_method_parameters(execute_data, getThis(), "OOO",
139140
&object_zv, mysqlx_message__auth_start_class_entry,
140141
&codec_zv, mysqlx_pfc_class_entry,
141142
&connection_zv, mysqlx_connection_class_entry))

‎messages/mysqlx_message__capabilities.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ extern "C" {
3232
#include "mysqlx_message__capabilities.h"
3333

3434
#include "util/object.h"
35+
#include "util/zend_utils.h"
3536

3637
namespace mysqlx {
3738

@@ -57,7 +58,7 @@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_message__capabilities, add)
5758
zval* capability_zv{nullptr};
5859

5960
DBG_ENTER("mysqlx_connection::add");
60-
if (FAILURE == zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OO",
61+
if (FAILURE == util::zend::parse_method_parameters(execute_data, getThis(), "OO",
6162
&capabilities_zv, mysqlx_message__capabilities_class_entry,
6263
&capability_zv, mysqlx_message__capability_class_entry))
6364
{

‎messages/mysqlx_message__capabilities_get.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ extern "C" {
3838
#include "mysqlx_message__error.h"
3939

4040
#include "util/object.h"
41+
#include "util/zend_utils.h"
4142

4243
namespace mysqlx {
4344

@@ -90,7 +91,7 @@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_message__capabilities_get, send)
9091
enum_func_status ret{FAIL};
9192

9293
DBG_ENTER("mysqlx_message__capabilities_get::send");
93-
if (FAILURE == zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OOO",
94+
if (FAILURE == util::zend::parse_method_parameters(execute_data, getThis(), "OOO",
9495
&object_zv, mysqlx_message__capabilities_get_class_entry,
9596
&codec_zv, mysqlx_pfc_class_entry,
9697
&connection_zv, mysqlx_connection_class_entry))
@@ -126,7 +127,7 @@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_message__capabilities_get, read_response)
126127
size_t ret{0};
127128

128129
DBG_ENTER("mysqlx_message__capabilities_get::read_response");
129-
if (FAILURE == zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OOO",
130+
if (FAILURE == util::zend::parse_method_parameters(execute_data, getThis(), "OOO",
130131
&object_zv, mysqlx_message__capabilities_get_class_entry,
131132
&codec_zv, mysqlx_pfc_class_entry,
132133
&connection_zv, mysqlx_connection_class_entry))

‎messages/mysqlx_message__capabilities_set.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ extern "C" {
4242
#include "mysqlx_message__error.h"
4343

4444
#include "util/object.h"
45+
#include "util/zend_utils.h"
4546

4647
namespace mysqlx {
4748

@@ -100,7 +101,7 @@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_message__capabilities_set, send)
100101
st_mysqlx_pfc* codec{nullptr};
101102

102103
DBG_ENTER("mysqlx_message__capabilities_set::send");
103-
if (FAILURE == zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OOOO",
104+
if (FAILURE == util::zend::parse_method_parameters(execute_data, getThis(), "OOOO",
104105
&object_zv, mysqlx_message__capabilities_set_class_entry,
105106
&capabilities_zv, mysqlx_message__capabilities_class_entry,
106107
&codec_zv, mysqlx_pfc_class_entry,
@@ -161,7 +162,7 @@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_message__capabilities_set, read_response)
161162
st_mysqlx_pfc* codec{nullptr};
162163

163164
DBG_ENTER("mysqlx_message__capabilities_set::read_response");
164-
if (FAILURE == zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OOO",
165+
if (FAILURE == util::zend::parse_method_parameters(execute_data, getThis(), "OOO",
165166
&object_zv, mysqlx_message__capabilities_set_class_entry,
166167
&codec_zv, mysqlx_pfc_class_entry,
167168
&connection_zv, mysqlx_connection_class_entry))

‎messages/mysqlx_message__capability.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ extern "C" {
2929
#include "mysqlx_session.h"
3030
#include "mysqlx_message__capability.h"
3131
#include "util/object.h"
32+
#include "util/zend_utils.h"
3233
#include <iostream>
3334

3435
namespace mysqlx {
@@ -56,7 +57,7 @@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_message__capability, __construct)
5657
zval* capability_value{nullptr};
5758

5859
DBG_ENTER("mysqlx_connection::connect");
59-
if (FAILURE == zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Osz",
60+
if (FAILURE == util::zend::parse_method_parameters(execute_data, getThis(), "Osz",
6061
&capability_zv, mysqlx_message__capability_class_entry,
6162
&capability_name, &capability_name_len,
6263
&capability_value))
@@ -80,7 +81,7 @@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_message__capability, echo)
8081
st_mysqlx_message__capability* capability{nullptr};
8182

8283
DBG_ENTER("mysqlx_connection::echo");
83-
if (FAILURE == zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O",
84+
if (FAILURE == util::zend::parse_method_parameters(execute_data, getThis(), "O",
8485
&capability_zv, mysqlx_message__capability_class_entry))
8586
{
8687
DBG_VOID_RETURN;

‎messages/mysqlx_message__ok.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ extern "C" {
2929

3030
#include "mysqlx_message__ok.h"
3131
#include "util/object.h"
32+
#include "util/zend_utils.h"
3233

3334
namespace mysqlx {
3435

@@ -54,7 +55,7 @@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_message__ok, get_message)
5455
st_mysqlx_message__ok* object{nullptr};
5556

5657
DBG_ENTER("mysqlx_message__ok::send");
57-
if (FAILURE == zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O",
58+
if (FAILURE == util::zend::parse_method_parameters(execute_data, getThis(), "O",
5859
&object_zv, mysqlx_message__ok_class_entry))
5960
{
6061
DBG_VOID_RETURN;

‎messages/mysqlx_message__stmt_execute.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ extern "C" {
4141
#include "mysqlx_resultset__data_row.h"
4242
#include "mysqlx_message__data_fetch_done.h"
4343
#include "util/object.h"
44+
#include "util/zend_utils.h"
4445

4546
namespace mysqlx {
4647

@@ -92,7 +93,7 @@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_message__stmt_execute, send)
9293
enum_func_status ret{FAIL};
9394

9495
DBG_ENTER("mysqlx_message__stmt_execute::send");
95-
if (FAILURE == zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OssbOO",
96+
if (FAILURE == util::zend::parse_method_parameters(execute_data, getThis(), "OssbOO",
9697
&object_zv, mysqlx_message__stmt_execute_class_entry,
9798
&namespace_, &namespace_len,
9899
&stmt, &stmt_len,
@@ -141,7 +142,7 @@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_message__stmt_execute, read_response)
141142
st_mysqlx_pfc* codec{nullptr};
142143

143144
DBG_ENTER("mysqlx_message__stmt_execute::read_response");
144-
if (FAILURE == zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OOO",
145+
if (FAILURE == util::zend::parse_method_parameters(execute_data, getThis(), "OOO",
145146
&object_zv, mysqlx_message__stmt_execute_class_entry,
146147
&codec_zv, mysqlx_pfc_class_entry,
147148
&connection_zv, mysqlx_connection_class_entry))

‎messages/mysqlx_pfc.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_pfc, send)
6666
enum_func_status ret{FAIL};
6767

6868
DBG_ENTER("mysqlx_pfc::send");
69-
if (FAILURE == zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OOls",
69+
if (FAILURE == util::zend::parse_method_parameters(execute_data, getThis(), "OOls",
7070
&codec_zv, mysqlx_pfc_class_entry,
7171
&connection_zv, mysqlx_connection_class_entry,
7272
&packet_type,
@@ -99,7 +99,7 @@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_pfc, receive)
9999
st_mysqlx_pfc* codec{nullptr};
100100

101101
DBG_ENTER("mysqlx_pfc::receive");
102-
if (FAILURE == zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OO",
102+
if (FAILURE == util::zend::parse_method_parameters(execute_data, getThis(), "OO",
103103
&codec_zv, mysqlx_pfc_class_entry,
104104
&connection_zv, mysqlx_connection_class_entry))
105105
{

‎messages/mysqlx_resultset__data_row.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ extern "C" {
3535

3636
#include "util/object.h"
3737
#include "util/pb_utils.h"
38+
#include "util/zend_utils.h"
3839

3940
#include "protobuf_api.h"
4041

@@ -84,7 +85,7 @@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_data_row, decode)
8485
st_mysqlx_resultset_metadata* metadata{nullptr};
8586

8687
DBG_ENTER("mysqlx_data_row::decode");
87-
if (FAILURE == zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OO",
88+
if (FAILURE == util::zend::parse_method_parameters(execute_data, getThis(), "OO",
8889
&object_zv, mysqlx_data_row_class_entry,
8990
&metadata_zv, mysqlx_resultset_metadata_class_entry))
9091
{

‎messages/mysqlx_resultset__resultset_metadata.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ extern "C" {
3333
#include "mysqlx_resultset__column_metadata.h"
3434

3535
#include "util/object.h"
36+
#include "util/zend_utils.h"
3637

3738
namespace mysqlx {
3839

@@ -58,7 +59,7 @@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_resultset_metadata, add)
5859
zval* column_metadata_zv{nullptr};
5960

6061
DBG_ENTER("mysqlx_connection::add");
61-
if (FAILURE == zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OO",
62+
if (FAILURE == util::zend::parse_method_parameters(execute_data, getThis(), "OO",
6263
&resultset_metadata_zv, mysqlx_resultset_metadata_class_entry,
6364
&column_metadata_zv, mysqlx_column_metadata_class_entry))
6465
{

0 commit comments

Comments
 (0)