Deprecate mysqli_ping

php · Aug 9, 2024 · 06a822c · 06a822c
1 parent bd77462
commit 06a822c
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 13 deletions.
diff --git a/ext/mysqli/mysqli.stub.php b/ext/mysqli/mysqli.stub.php
@@ -878,6 +878,7 @@ public function next_result(): bool {}
      * @tentative-return-type
      * @alias mysqli_ping
      */
+    #[\Deprecated(since: '8.4', message: 'because the reconnect feature has been removed in PHP 8.2 and this method is now redundant')]
     public function ping(): bool {}
 
     /**
@@ -1525,6 +1526,7 @@ function mysqli_options(mysqli $mysql, int $option, $value): bool {}
  */
 function mysqli_set_opt(mysqli $mysql, int $option, $value): bool {}
 
+#[\Deprecated(since: '8.4', message: 'because the reconnect feature has been removed in PHP 8.2 and this function is now redundant')]
 function mysqli_ping(mysqli $mysql): bool {}
 
 function mysqli_poll(?array &$read, ?array &$error, array &$reject, int $seconds, int $microseconds = 0): int|false {}

diff --git a/ext/mysqli/mysqli_arginfo.h b/ext/mysqli/mysqli_arginfo.h
diff --git a/ext/mysqli/tests/070.phpt b/ext/mysqli/tests/070.phpt
@@ -15,6 +15,8 @@ require_once 'skipifconnectfailure.inc';
     $mysql->close();
     print "done!";
 ?>
---EXPECT--
+--EXPECTF--
+
+Deprecated: Method mysqli::ping() is deprecated since 8.4, because the reconnect feature has been removed in PHP 8.2 and this method is now redundant in %s
 bool(true)
 done!
diff --git a/ext/mysqli/tests/071.phpt b/ext/mysqli/tests/071.phpt
@@ -13,27 +13,27 @@ require_once 'skipifconnectfailure.inc';
     $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
     $version = $mysql->server_version;
 
-    var_dump($mysql->ping());
+    var_dump($mysql->query('DO 1'));
 
     $ret = $mysql->kill($mysql->thread_id);
     if ($ret !== true){
         printf("[001] Expecting boolean/true got %s/%s\n", gettype($ret), var_export($ret, true));
     }
 
-    var_dump($mysql->ping());
+    var_dump($mysql->query('DO 1'));
 
     $mysql->close();
 
     $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
 
-    var_dump(mysqli_ping($mysql));
+    var_dump($mysql->query('DO 1'));
 
     $ret = $mysql->kill($mysql->thread_id);
     if ($ret !== true){
         printf("[002] Expecting boolean/true got %s/%s\n", gettype($ret), var_export($ret, true));
     }
 
-    var_dump(mysqli_ping($mysql));
+    var_dump($mysql->query('DO 1'));
 
     $mysql->close();
     print "done!";

diff --git a/ext/mysqli/tests/mysqli_insert_id_variation.phpt b/ext/mysqli/tests/mysqli_insert_id_variation.phpt
@@ -100,5 +100,6 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_insert_id_var"))
 
 mysqli_close($link);
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Method mysqli::ping() is deprecated since 8.4, because the reconnect feature has been removed in PHP 8.2 and this method is now redundant in %s
 DONE
diff --git a/ext/mysqli/tests/mysqli_max_links.phpt b/ext/mysqli/tests/mysqli_max_links.phpt
@@ -14,7 +14,7 @@ mysqli.max_links=1
     require_once 'table.inc';
 
     // to make sure we have at least one working connection...
-    var_dump(mysqli_ping($link));
+    var_dump($link->query('DO 1'));
     // to make sure that max_links is really set to one
     var_dump((int)ini_get('mysqli.max_links'));
 

diff --git a/ext/mysqli/tests/mysqli_ping.phpt b/ext/mysqli/tests/mysqli_ping.phpt
@@ -36,8 +36,14 @@ require_once 'skipifconnectfailure.inc';
 
     print "done!";
 ?>
---EXPECT--
+--EXPECTF--
+
+Deprecated: Function mysqli_ping() is deprecated since 8.4, because the reconnect feature has been removed in PHP 8.2 and this function is now redundant in %s
 bool(true)
+
+Deprecated: Function mysqli_ping() is deprecated since 8.4, because the reconnect feature has been removed in PHP 8.2 and this function is now redundant in %s
 bool(true)
+
+Deprecated: Function mysqli_ping() is deprecated since 8.4, because the reconnect feature has been removed in PHP 8.2 and this function is now redundant in %s
 mysqli object is already closed
 done!
diff --git a/ext/mysqli/tests/mysqli_report.phpt b/ext/mysqli/tests/mysqli_report.phpt
@@ -41,7 +41,6 @@ require_once 'skipifconnectfailure.inc';
         echo $e->getMessage() . \PHP_EOL;
     }
 
-    // mysqli_ping() cannot be tested, because one would need to cause an error inside the C function to test it
     mysqli_prepare($link, "FOO");
     mysqli_real_query($link, "FOO");
     if (@mysqli_select_db($link, "Oh lord, let this be an unknown database name"))

diff --git a/ext/mysqli/tests/mysqli_report_wo_ps.phpt b/ext/mysqli/tests/mysqli_report_wo_ps.phpt
@@ -54,7 +54,6 @@ if (mysqli_get_server_version($link) >= 50600)
         echo $e->getMessage() . \PHP_EOL;
     }
 
-    // mysqli_ping() cannot be tested, because one would need to cause an error inside the C function to test it
     mysqli_real_query($link, "FOO");
     if (@mysqli_select_db($link, "Oh lord, let this be an unknown database name"))
         printf("[009] select_db should have failed\n");