Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0:
  Fix formatting in the new mysqli test

Author: kamil-tekiela

ext/mysqli/tests/gh7837.phpt

@@ -4,15 +4,14 @@ Bug GH-7837 (large bigints may be truncated)
 mysqli
 --SKIPIF--
 <?php
-require_once("connect.inc");
-if (strpos(mysqli_get_client_info(), "mysqlnd") === false) {
+require_once 'skipifconnectfailure.inc';
+if (!$IS_MYSQLND) {
     die("skip requires mysqlnd");
 }
-require_once("skipifconnectfailure.inc");
 ?>
 --FILE--
 <?php
-require_once("connect.inc");
+require_once "connect.inc";
 
 $mysql = new mysqli($host, $user, $passwd, $db, $port, $socket);
 $mysql->options(MYSQLI_OPT_INT_AND_FLOAT_NATIVE, true);
@@ -24,6 +23,10 @@ $mysql->query("INSERT INTO test (`ubigint`) VALUES (1)");
 $result = $mysql->query("SELECT ubigint FROM test");
 var_dump($result->fetch_all());
 ?>
+--CLEAN--
+<?php
+require_once "clean_table.inc";
+?>
 --EXPECT--
 array(3) {
   [0]=>