Skip to content

Commit 9235de7

Browse files
committed
Replace @deprecated with #[Deprecated]
1 parent 4512d82 commit 9235de7

File tree

6 files changed

+40
-16
lines changed

6 files changed

+40
-16
lines changed

ext/mysqli/mysqli.stub.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -851,10 +851,10 @@ public function get_warnings(): mysqli_warning|false {}
851851
public function init() {}
852852

853853
/**
854-
* @deprecated
855854
* @tentative-return-type
856855
* @alias mysqli_kill
857856
*/
857+
#[\Deprecated(since: '8.4', message: 'use KILL CONNECTION/QUERY SQL statement instead')]
858858
public function kill(int $process_id): bool {}
859859

860860
/**
@@ -1504,7 +1504,7 @@ function mysqli_info(mysqli $mysql): ?string {}
15041504
/** @refcount 1 */
15051505
function mysqli_insert_id(mysqli $mysql): int|string {}
15061506

1507-
/** @deprecated */
1507+
#[\Deprecated(since: '8.4', message: 'use KILL CONNECTION/QUERY SQL statement instead')]
15081508
function mysqli_kill(mysqli $mysql, int $process_id): bool {}
15091509

15101510
function mysqli_more_results(mysqli $mysql): bool {}

ext/mysqli/mysqli_arginfo.h

Lines changed: 25 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ext/mysqli/tests/071.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ require_once 'skipifconnectfailure.inc';
4141
--EXPECTF--
4242
bool(true)
4343

44-
Deprecated: Method mysqli::kill() is deprecated in %s
44+
Deprecated: Method mysqli::kill() is deprecated since 8.4, use KILL CONNECTION/QUERY SQL statement instead in %s
4545
bool(false)
4646
bool(true)
4747

48-
Deprecated: Method mysqli::kill() is deprecated in %s
48+
Deprecated: Method mysqli::kill() is deprecated since 8.4, use KILL CONNECTION/QUERY SQL statement instead in %s
4949
bool(false)
5050
done!

ext/mysqli/tests/mysqli_kill.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ require_once 'skipifconnectfailure.inc';
7373
?>
7474
--EXPECTF--
7575

76-
Deprecated: Function mysqli_kill() is deprecated in %s
76+
Deprecated: Function mysqli_kill() is deprecated since 8.4, use KILL CONNECTION/QUERY SQL statement instead in %s
7777
mysqli_kill(): Argument #2 ($process_id) must be greater than 0
7878

79-
Deprecated: Function mysqli_kill() is deprecated in %s
79+
Deprecated: Function mysqli_kill() is deprecated since 8.4, use KILL CONNECTION/QUERY SQL statement instead in %s
8080
string(%d) "%s"
8181
bool(false)
8282
object(mysqli)#%d (%d) {
@@ -128,13 +128,13 @@ object(mysqli)#%d (%d) {
128128
int(0)
129129
}
130130

131-
Deprecated: Function mysqli_kill() is deprecated in %s
131+
Deprecated: Function mysqli_kill() is deprecated since 8.4, use KILL CONNECTION/QUERY SQL statement instead in %s
132132
mysqli_kill(): Argument #2 ($process_id) must be greater than 0
133133
array(1) {
134134
["id"]=>
135135
string(1) "1"
136136
}
137137

138-
Deprecated: Function mysqli_kill() is deprecated in %s
138+
Deprecated: Function mysqli_kill() is deprecated since 8.4, use KILL CONNECTION/QUERY SQL statement instead in %s
139139
mysqli_kill(): Argument #2 ($process_id) must be greater than 0
140140
done!

ext/mysqli/tests/mysqli_report.phpt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ Warning: mysqli_multi_query(): (%d/%d): You have an error in your SQL syntax; ch
316316

317317
Warning: mysqli_query(): (%d/%d): You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near 'FOO' at line 1 in %s on line %d
318318

319-
Deprecated: Function mysqli_kill() is deprecated in %s
319+
Deprecated: Function mysqli_kill() is deprecated since 8.4, use KILL CONNECTION/QUERY SQL statement instead in %s
320320
mysqli_kill(): Argument #2 ($process_id) must be greater than 0
321321

322322
Warning: mysqli_prepare(): (%d/%d): You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near 'FOO' at line 1 in %s on line %d
@@ -337,16 +337,16 @@ Warning: mysqli_store_result(): (%s/%d): You have an error in your SQL syntax; c
337337

338338
Warning: mysqli_stmt_attr_set(): (%s/%d): Not implemented in %s on line %d
339339

340-
Deprecated: Function mysqli_kill() is deprecated in %s
340+
Deprecated: Function mysqli_kill() is deprecated since 8.4, use KILL CONNECTION/QUERY SQL statement instead in %s
341341
mysqli_kill(): Argument #2 ($process_id) must be greater than 0
342342

343343
Warning: mysqli_stmt_prepare(): (%d/%d): You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near 'FOO' at line 1 in %s on line %d
344344

345-
Deprecated: Function mysqli_kill() is deprecated in %s
345+
Deprecated: Function mysqli_kill() is deprecated since 8.4, use KILL CONNECTION/QUERY SQL statement instead in %s
346346

347-
Deprecated: Function mysqli_kill() is deprecated in %s
347+
Deprecated: Function mysqli_kill() is deprecated since 8.4, use KILL CONNECTION/QUERY SQL statement instead in %s
348348

349-
Deprecated: Function mysqli_kill() is deprecated in %s
349+
Deprecated: Function mysqli_kill() is deprecated since 8.4, use KILL CONNECTION/QUERY SQL statement instead in %s
350350
[013] Access denied for user '%s'@'%s'%r( \(using password: \w+\)){0,1}%r
351351
[016] Access denied for user '%s'@'%s'%r( \(using password: \w+\)){0,1}%r
352352
done!

ext/spl/spl_fixedarray_arginfo.h

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)