From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Mon, 9 Mar 2020 21:53:23 +0000 (+0100)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b31f73b1c8c967de73a82598415c467755d35a89;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Enclose INI values containing {TMP} in quotes
---

b31f73b1c8c967de73a82598415c467755d35a89
diff --cc ext/mysqli/tests/mysqli_store_result_buffered_c.phpt
index f685617915,548b9719d2..31645b026c
--- a/ext/mysqli/tests/mysqli_store_result_buffered_c.phpt
+++ b/ext/mysqli/tests/mysqli_store_result_buffered_c.phpt
@@@ -7,31 -7,31 +7,31 @@@ require_once('skipifemb.inc')
  require_once('skipifconnectfailure.inc');
  ?>
  --INI--
- mysqlnd.debug=d:t:O,{TMP}/mysqlnd.trace
+ mysqlnd.debug="d:t:O,{TMP}/mysqlnd.trace"
  --FILE--
  <?php
 -	require_once("connect.inc");
 +    require_once("connect.inc");
  
 -	$tmp    = NULL;
 -	$link   = NULL;
 +    $tmp    = NULL;
 +    $link   = NULL;
  
  
 -	require('table.inc');
 +    require('table.inc');
  
 -	if (!$res = mysqli_real_query($link, "SELECT id, label FROM test ORDER BY id"))
 -		printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 +    if (!$res = mysqli_real_query($link, "SELECT id, label FROM test ORDER BY id"))
 +        printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
  
 -	if (!is_object($res = mysqli_store_result($link, MYSQLI_STORE_RESULT_COPY_DATA)))
 -		printf("[004] Expecting object, got %s/%s. [%d] %s\n",
 -			gettype($res), $res, mysqli_errno($link), mysqli_error($link));
 +    if (!is_object($res = mysqli_store_result($link, MYSQLI_STORE_RESULT_COPY_DATA)))
 +        printf("[004] Expecting object, got %s/%s. [%d] %s\n",
 +            gettype($res), $res, mysqli_errno($link), mysqli_error($link));
  
 -	if (true !== ($tmp = mysqli_data_seek($res, 2)))
 -		printf("[005] Expecting boolean/true, got %s/%s. [%d] %s\n",
 -			gettype($tmp), $tmp, mysqli_errno($link), mysqli_error($link));
 +    if (true !== ($tmp = mysqli_data_seek($res, 2)))
 +        printf("[005] Expecting boolean/true, got %s/%s. [%d] %s\n",
 +            gettype($tmp), $tmp, mysqli_errno($link), mysqli_error($link));
  
 -	mysqli_free_result($res);
 +    mysqli_free_result($res);
  
 -	print "done!";
 +    print "done!";
  ?>
  --CLEAN--
  <?php