Merge branch 'PHP-8.4' into PHP-8.5

Girgias · Girgias · commit 964d08722713 · 2026-01-24T11:39:06.000Z
* PHP-8.4: ext/dba/tests/dba_db4_018.phpt: fix typo (#20938)
diff --git a/ext/dba/tests/dba_db4_018.phpt b/ext/dba/tests/dba_db4_018.phpt
@@ -28,7 +28,7 @@ $db_file2 = dba_popen($db_filename, 'n', 'flatfile');
 if ($db_file1 === $db_file2) {
     echo "objects are the same\n";
 } else {
-    echo "object are different\n";
+    echo "objects are different\n";
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ $db_file2 = dba_popen($db_filename, 'n', 'flatfile');`
`28`	`28`	`if ($db_file1 === $db_file2) {`
`29`	`29`	`echo "objects are the same\n";`
`30`	`30`	`} else {`
`31`		`- echo "object are different\n";`
	`31`	`+ echo "objects are different\n";`
`32`	`32`	`}`
`33`	`33`
`34`	`34`