Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1:
  Fix mysql tests with non-standard server port

Author: iluuu1994

ext/mysqli/tests/bug73462.phpt

@@ -11,22 +11,22 @@ require_once('skipifconnectfailure.inc');
     require_once("connect.inc");
 
     /* Initial persistent connection */
-    $mysql_1 = new mysqli('p:'.$host, $user, $passwd, $db);
+    $mysql_1 = new mysqli('p:'.$host, $user, $passwd, $db, $port);
     $result = $mysql_1->query("SHOW STATUS LIKE 'Connections'");
     $c1 = $result->fetch_row();
     $result->free();
     $mysql_1->close();
 
     /* Failed connection to invalid host */
-    $mysql_2 = @new mysqli(' !!! invalid !!! ', $user, $passwd, $db);
+    $mysql_2 = @new mysqli(' !!! invalid !!! ', $user, $passwd, $db, $port);
     try {
         $mysql_2->close();
     } catch (Error $exception) {
         echo $exception->getMessage() . "\n";
     }
 
     /* Re-use persistent connection */
-    $mysql_3 = new mysqli('p:'.$host, $user, $passwd, $db);
+    $mysql_3 = new mysqli('p:'.$host, $user, $passwd, $db, $port);
     $error = mysqli_connect_errno();
     $result = $mysql_3->query("SHOW STATUS LIKE 'Connections'");
     $c3 = $result->fetch_row();

ext/mysqli/tests/bug73949.phpt

@@ -14,7 +14,7 @@ class cc{
     function __construct($c=null){
     }
 };
-$i=mysqli_connect('p:'.$host, $user, $passwd, $db);
+$i=mysqli_connect('p:'.$host, $user, $passwd, $db, $port);
 $res=mysqli_query($i, "SHOW STATUS LIKE 'Connections'");
 $t=array(new stdClass);
 while($db= mysqli_fetch_object($res,'cc',$t)){}