Merge branch 'PHP-7.4'

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

diff --cc ext/mysqli/tests/mysqli_store_result_buffered_c.phpt
index f6856179155c49a523493209929bcf995db14e46,548b9719d272b6fd4d72a57cd144d6ac3a8b9313..31645b026c54f7d420a2ef31f4fa2eb09c260130
--- 1/ext/mysqli/tests/mysqli_store_result_buffered_c.phpt
--- 2/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

diff --cc ext/mysqli/tests/mysqli_store_result_copy.phpt
Simple merge

diff --cc ext/session/tests/bug32330.phpt
Simple merge

diff --cc ext/session/tests/session_set_save_handler_sid_002.phpt
Simple merge