Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3: Fix some MariaDB test failures
TimWolla · Dec 2, 2024 · 6753c55 · 6753c55
2 parents c2d3734 + 51e0920
commit 6753c55
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/ext/mysqli/tests/063.phpt b/ext/mysqli/tests/063.phpt
@@ -29,6 +29,6 @@ require_once 'skipifconnectfailure.inc';
 
     $mysql->close();
 ?>
---EXPECT--
+--EXPECTF--
 string(3) "foo"
-Unknown column 'invalid' in 'field list'
+Unknown column 'invalid' in '%r(SELECT|field list)%r'
diff --git a/ext/mysqli/tests/bug71863.phpt b/ext/mysqli/tests/bug71863.phpt
@@ -30,4 +30,4 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bug_71863"))
 mysqli_close($link);
 ?>
 --EXPECTF--
-%AUnknown column 'owner_id' in 'where clause'
+%AUnknown column 'owner_id' in '%r(WHERE|where clause)%r'
diff --git a/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt b/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt
@@ -65,7 +65,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS type_change"))
 
 mysqli_close($link);
 ?>
---EXPECT--
+--EXPECTF--
 bool(true)
 bool(true)
 ---- Row 1
@@ -80,7 +80,7 @@ NULL
 ALTER
 bool(true)
 bool(false)
-string(34) "Unknown column 'a' in 'field list'"
+string(%d) "Unknown column 'a' in '%r(SELECT|field list)%r'"
 ---- Row 1
 bool(false)
 int(2)