Merge branch 'PHP-8.0'

* PHP-8.0:
  Remove PHP 5 mysqli tests
  Fix typos in mysql tests

Author: nikic

ext/mysqli/tests/061.phpt

@@ -1,5 +1,5 @@
 --TEST--
-mysqli_chararcter_set_name(), mysql_client_encoding() [alias]
+mysqli_character_set_name(), mysql_client_encoding() [alias]
 --SKIPIF--
 <?php
 require_once('skipif.inc');

ext/mysqli/tests/mysqli_character_set_name.phpt

@@ -1,9 +1,9 @@
 --TEST--
-mysqli_chararcter_set_name(), mysql_client_encoding() [alias]
+mysqli_character_set_name(), mysql_client_encoding() [alias]
 --SKIPIF--
 <?php
-    require_once('skipif.inc');
-    require_once('skipifconnectfailure.inc');
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php

ext/mysqli/tests/mysqli_character_set_name_oo.phpt

@@ -27,8 +27,8 @@ $stmt = $db->query("
 ");
 var_dump($stmt->debugDumpParams());
 ?>
---EXPECT--
-SQL: [834] 
+--EXPECTF--
+SQL: [%d] 
     SELECT '
         Dumps the information contained by a prepared statement directly on the output. It will provide the SQL query in use, the number of parameters used (Params), the list of parameters, with their name, type (paramtype) as an integer, their key name or position, and the position in the query (if this is supported by the PDO driver, otherwise, it will be -1).
         This is a debug function, which dump directly the data on the normal output.