Skip to content

Commit 798e272

Browse files
committed
Merge branch 'PHP-8.4'
* PHP-8.4: Fix mysql test date flakiness
2 parents e4be679 + 45fc03c commit 798e272

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

ext/mysqli/tests/fetch/mysqli_fetch_all_data_types_variation.phpt

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -122,22 +122,27 @@ func_mysqli_fetch_all($link, $engine, "DECIMAL(10,2)", "99999999.99", "99999999.
122122
func_mysqli_fetch_all($link, $engine, "DECIMAL(10,2)", NULL, NULL, 400);
123123

124124
// don't care about date() strict TZ warnings...
125-
func_mysqli_fetch_all($link, $engine, "DATE", @date('Y-m-d'), @date('Y-m-d'), 410);
126-
func_mysqli_fetch_all($link, $engine, "DATE NOT NULL", @date('Y-m-d'), @date('Y-m-d'), 420);
125+
$date = @date('Y-m-d');
126+
$datetime = @date('Y-m-d H:i:s');
127+
$time = @date('H:i:s');
128+
$year = @date('Y');
129+
130+
func_mysqli_fetch_all($link, $engine, "DATE", $date, $date, 410);
131+
func_mysqli_fetch_all($link, $engine, "DATE NOT NULL", $date, $date, 420);
127132
func_mysqli_fetch_all($link, $engine, "DATE", NULL, NULL, 430);
128133

129-
func_mysqli_fetch_all($link, $engine, "DATETIME", @date('Y-m-d H:i:s'), @date('Y-m-d H:i:s'), 440);
130-
func_mysqli_fetch_all($link, $engine, "DATETIME NOT NULL", @date('Y-m-d H:i:s'), @date('Y-m-d H:i:s'), 450);
134+
func_mysqli_fetch_all($link, $engine, "DATETIME", $datetime, $datetime, 440);
135+
func_mysqli_fetch_all($link, $engine, "DATETIME NOT NULL", $datetime, $datetime, 450);
131136
func_mysqli_fetch_all($link, $engine, "DATETIME", NULL, NULL, 460);
132137

133-
func_mysqli_fetch_all($link, $engine, "TIMESTAMP", @date('Y-m-d H:i:s'), @date('Y-m-d H:i:s'), 470);
138+
func_mysqli_fetch_all($link, $engine, "TIMESTAMP", $datetime, $datetime, 470);
134139

135-
func_mysqli_fetch_all($link, $engine, "TIME", @date('H:i:s'), @date('H:i:s'), 480);
136-
func_mysqli_fetch_all($link, $engine, "TIME NOT NULL", @date('H:i:s'), @date('H:i:s'), 490);
140+
func_mysqli_fetch_all($link, $engine, "TIME", $time, $time, 480);
141+
func_mysqli_fetch_all($link, $engine, "TIME NOT NULL", $time, $time, 490);
137142
func_mysqli_fetch_all($link, $engine, "TIME", NULL, NULL, 500);
138143

139-
func_mysqli_fetch_all($link, $engine, "YEAR", @date('Y'), @date('Y'), 510);
140-
func_mysqli_fetch_all($link, $engine, "YEAR NOT NULL", @date('Y'), @date('Y'), 520);
144+
func_mysqli_fetch_all($link, $engine, "YEAR", $year, $year, 510);
145+
func_mysqli_fetch_all($link, $engine, "YEAR NOT NULL", $year, $year, 520);
141146
func_mysqli_fetch_all($link, $engine, "YEAR", NULL, NULL, 530);
142147

143148
$string255 = func_mysqli_fetch_array_make_string(255);

0 commit comments

Comments
 (0)