Merge branch 'PHP-7.0'

* PHP-7.0:
  Updated NEWS
  Updated NEWS
  Revert "Fixes #52384: Adds parameter value to dumped output. Also adds output flag indicating presence of PDO::PARAM_INPUT_OUTPUT."
  Revert "Fix test for #52384"

Conflicts:
	ext/pdo/pdo_stmt.c

diff --cc ext/pdo/pdo_stmt.c
index 07e7957f8a4ba9223846d761915dbf262574f4ad,8d1d909acc9929034f126495611df2516be1b0ac..b2e7620306e5e244c6c5a643425af5f87c2ea007
--- 1/ext/pdo/pdo_stmt.c
--- 2/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
@@@ -2126,48 -2125,14 +2125,14 @@@ static PHP_METHOD(PDOStatement, debugDu
                                php_stream_printf(out, "Key: Name: [%zd] %.*s\n",
                                        ZSTR_LEN(key), (int) ZSTR_LEN(key), ZSTR_VAL(key));
                        } else {
 -                              php_stream_printf(out, "Key: Position #%pd:\n", num);
 +                              php_stream_printf(out, "Key: Position #" ZEND_ULONG_FMT ":\n", num);
                        }
  
-                       php_stream_printf(out, "paramno=" ZEND_LONG_FMT "\nname=[%zd] \"%.*s\"\nis_param=%d\nparam_type=%d\nis_input_output=%d\n",
-                                       param->paramno, param->name ? ZSTR_LEN(param->name) : 0, param->name ? (int) ZSTR_LEN(param->name) : 0,
-                                       param->name ? ZSTR_VAL(param->name) : "",
-                                       param->is_param,
-                                       PDO_PARAM_TYPE(param->param_type),
-                                       (param->param_type & PDO_PARAM_INPUT_OUTPUT) == PDO_PARAM_INPUT_OUTPUT);
- 
-                       /*
-                        * Check the type of the parameter and print out the value.
-                        *
-                        * Most are self explanatory with the following exceptions:
-                        * PDO::PARAM_INT evaluates to a long
-                        * PDO::PARAM_LOB evaluates to a string
-                        */
-                       parameter = param->parameter;
- again:
-                       switch (Z_TYPE(parameter)) {
-                               case IS_REFERENCE:
-                                       parameter = *Z_REFVAL(parameter);
-                                       goto again;
-                               case IS_TRUE:
-                                       php_stream_printf(out, "param_value=true\n");
-                                       break;
-                               case IS_FALSE:
-                                       php_stream_printf(out, "param_value=false\n");
-                                       break;
-                               case IS_NULL:
-                                       php_stream_printf(out, "param_value=null\n");
-                                       break;
-                               case IS_LONG:
-                                       php_stream_printf(out, "param_value=%ld\n", Z_LVAL(parameter));
-                                       break;
-                               case IS_STRING:
-                                       php_stream_printf(out, "param_value=%s\n", Z_STRVAL(parameter));
-                                       break;
-                               default:
-                                       php_stream_printf(out, "param_value=unknown\n");
-                                       break;
-                       }
+                       php_stream_printf(out, "paramno=%pd\nname=[%zd] \"%.*s\"\nis_param=%d\nparam_type=%d\n",
+                                                       param->paramno, param->name ? ZSTR_LEN(param->name) : 0, param->name ? (int) ZSTR_LEN(param->name) : 0,
+                                                       param->name ? ZSTR_VAL(param->name) : "",
+                                                       param->is_param,
+                                                       param->param_type);
  
                } ZEND_HASH_FOREACH_END();
        }