summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2021-02-05 14:54:25 +0100
committerChristoph M. Becker <cmbecker69@gmx.de>2021-02-05 14:54:25 +0100
commit95e405023e3e9896f6f47fa2b346499a7adcca08 (patch)
tree0f8e5aac96854a9b840de14dedd71f818334d528
parent4be5b4aa25e17e5ab88e8002d4c5aaacc7fc1cf1 (diff)
parent4ff2665509a0d2172e558fa21ed6718792349e85 (diff)
downloadphp-git-95e405023e3e9896f6f47fa2b346499a7adcca08.tar.gz
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4: Use ST_Y() instead of the deprecated/removed Y() in test
-rw-r--r--ext/mysqli/tests/bug74779.phpt4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysqli/tests/bug74779.phpt b/ext/mysqli/tests/bug74779.phpt
index 88e658ef61..3aa44e9280 100644
--- a/ext/mysqli/tests/bug74779.phpt
+++ b/ext/mysqli/tests/bug74779.phpt
@@ -23,7 +23,7 @@ if (!$link->options(MYSQLI_OPT_INT_AND_FLOAT_NATIVE, true)) {
printf("[003] [%d] %s\n", $link->errno, $link->error);
}
-if (!$result = $link->query("SELECT Y(Point(56.7, 53.34))")) {
+if (!$result = $link->query("SELECT ST_Y(Point(56.7, 53.34))")) {
printf("[004] [%d] %s\n", $link->errno, $link->error);
}
@@ -37,6 +37,6 @@ mysqli_close($link);
?>
--EXPECT--
array(1) {
- ["Y(Point(56.7, 53.34))"]=>
+ ["ST_Y(Point(56.7, 53.34))"]=>
float(53,34)
}