From: Julien Pauli <jpauli@php.net>
Date: Fri, 2 Sep 2016 15:57:09 +0000 (+0200)
Subject: Revert "PHP 7 compat"
X-Git-Tag: php-7.2.0alpha1~1373
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0dbcdceb280bc45553a4b048c7b78c55acee34bb;p=php

Revert "PHP 7 compat"

This reverts commit 24a57ee03b5b8803a2dcffd458b8a56c13ec6293.
---

diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
index 779011a1ac..f7d82df7a5 100644
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
@@ -2123,7 +2123,7 @@ static PHP_METHOD(PDOStatement, debugDumpParams)
 			}
 
 			php_stream_printf(out TSRMLS_CC, "paramno=%ld\nname=[%d] \"%.*s\"\nis_param=%d\nparam_type=%d\nis_input_output=%d\n",
-				param->paramno, ZSTR_LEN(param->name), ZSTR_LEN(param->name), param->name ? ZSTR_VAL(param->name) : "",
+				param->paramno, param->namelen, param->namelen, param->name ? param->name : "",
 				param->is_param,
 				PDO_PARAM_TYPE(param->param_type),
 				(param->param_type & PDO_PARAM_INPUT_OUTPUT) == PDO_PARAM_INPUT_OUTPUT);
@@ -2135,24 +2135,21 @@ static PHP_METHOD(PDOStatement, debugDumpParams)
 			 * PDO::PARAM_INT evaluates to a long
 			 * PDO::PARAM_LOB evaluates to a string
 			 */
-			switch (Z_TYPE(param->parameter)) {
-				case IS_TRUE:
-					php_stream_printf(out, "param_value=true\n");
-					break;
-				case IS_FALSE:
-					php_stream_printf(out, "param_value=false\n");
+			switch (Z_TYPE_P(param->parameter)) {
+				case IS_BOOL:
+					php_stream_printf(out TSRMLS_CC, "param_value=%s\n", Z_BVAL_P(param->parameter)?"true":"false");
 					break;
 				case IS_NULL:
-					php_stream_printf(out, "param_value=null\n");
+					php_stream_printf(out TSRMLS_CC, "param_value=null\n");
 					break;
 				case IS_LONG:
-					php_stream_printf(out, "param_value=%ld\n", Z_LVAL(param->parameter));
+					php_stream_printf(out TSRMLS_CC, "param_value=%ld\n", Z_LVAL_P(param->parameter));
 					break;
 				case IS_STRING:
-					php_stream_printf(out, "param_value=%s\n", Z_STRVAL(param->parameter));
+					php_stream_printf(out TSRMLS_CC, "param_value=%s\n", Z_STRVAL_P(param->parameter));
 					break;
 				default:
-					php_stream_printf(out, "param_value=unknown\n");
+					php_stream_printf(out TSRMLS_CC, "param_value=unknown\n");
 					break;
 			}
 		} ZEND_HASH_FOREACH_END();