Skip to content

Commit 24a57ee

Browse files
author
Julien Pauli
committed
PHP 7 compat
1 parent 04115b4 commit 24a57ee

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

ext/pdo/pdo_stmt.c

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2123,7 +2123,7 @@ static PHP_METHOD(PDOStatement, debugDumpParams)
21232123
}
21242124

21252125
php_stream_printf(out TSRMLS_CC, "paramno=%ld\nname=[%d] \"%.*s\"\nis_param=%d\nparam_type=%d\nis_input_output=%d\n",
2126-
param->paramno, param->namelen, param->namelen, param->name ? param->name : "",
2126+
param->paramno, ZSTR_LEN(param->name), ZSTR_LEN(param->name), param->name ? ZSTR_VAL(param->name) : "",
21272127
param->is_param,
21282128
PDO_PARAM_TYPE(param->param_type),
21292129
(param->param_type & PDO_PARAM_INPUT_OUTPUT) == PDO_PARAM_INPUT_OUTPUT);
@@ -2135,21 +2135,24 @@ static PHP_METHOD(PDOStatement, debugDumpParams)
21352135
* PDO::PARAM_INT evaluates to a long
21362136
* PDO::PARAM_LOB evaluates to a string
21372137
*/
2138-
switch (Z_TYPE_P(param->parameter)) {
2139-
case IS_BOOL:
2140-
php_stream_printf(out TSRMLS_CC, "param_value=%s\n", Z_BVAL_P(param->parameter)?"true":"false");
2138+
switch (Z_TYPE(param->parameter)) {
2139+
case IS_TRUE:
2140+
php_stream_printf(out, "param_value=true\n");
2141+
break;
2142+
case IS_FALSE:
2143+
php_stream_printf(out, "param_value=false\n");
21412144
break;
21422145
case IS_NULL:
2143-
php_stream_printf(out TSRMLS_CC, "param_value=null\n");
2146+
php_stream_printf(out, "param_value=null\n");
21442147
break;
21452148
case IS_LONG:
2146-
php_stream_printf(out TSRMLS_CC, "param_value=%ld\n", Z_LVAL_P(param->parameter));
2149+
php_stream_printf(out, "param_value=%ld\n", Z_LVAL(param->parameter));
21472150
break;
21482151
case IS_STRING:
2149-
php_stream_printf(out TSRMLS_CC, "param_value=%s\n", Z_STRVAL_P(param->parameter));
2152+
php_stream_printf(out, "param_value=%s\n", Z_STRVAL(param->parameter));
21502153
break;
21512154
default:
2152-
php_stream_printf(out TSRMLS_CC, "param_value=unknown\n");
2155+
php_stream_printf(out, "param_value=unknown\n");
21532156
break;
21542157
}
21552158
} ZEND_HASH_FOREACH_END();

0 commit comments

Comments
 (0)