Deprecate calling dba_fetch() with $dba at the 3rd parameter

Author: kocsismate

ext/dba/dba.c

@@ -966,6 +966,11 @@ PHP_FUNCTION(dba_fetch)
 			Z_PARAM_LONG(skip)
 			Z_PARAM_RESOURCE(id);
 		ZEND_PARSE_PARAMETERS_END_EX(goto standard;);
+
+		zend_error(E_DEPRECATED, "Calling dba_fetch() with $dba at the 3rd parameter is deprecated");
+		if (UNEXPECTED(EG(exception))) {
+			RETURN_THROWS();
+		}
 	} else {
 		standard:
 		ZEND_PARSE_PARAMETERS_START(2, 3)

ext/dba/tests/bug70825.phpt

@@ -14,39 +14,39 @@ $db = dba_open($filename, 'n', 'inifile');
 dba_insert('foo', 23, $db);
 dba_insert('foo', 42, $db);
 dba_insert('foo', 1337, $db);
-var_dump(dba_fetch('foo', -1, $db));
-var_dump(dba_fetch('foo', -1, $db));
-var_dump(dba_fetch('foo', -1, $db));
+var_dump(dba_fetch('foo', $db, -1));
+var_dump(dba_fetch('foo', $db, -1));
+var_dump(dba_fetch('foo', $db, -1));
 dba_close($db);
 unlink($filename);
 
 $db = dba_open($filename, 'n', 'inifile');
 dba_insert(['foo', 'bar'], 23, $db);
 dba_insert(['foo', 'bar'], 42, $db);
 dba_insert(['foo', 'bar'], 1337, $db);
-var_dump(dba_fetch(['foo', 'bar'], -1, $db));
-var_dump(dba_fetch(['foo', 'bar'], -1, $db));
-var_dump(dba_fetch(['foo', 'bar'], -1, $db));
+var_dump(dba_fetch(['foo', 'bar'], $db, -1));
+var_dump(dba_fetch(['foo', 'bar'], $db, -1));
+var_dump(dba_fetch(['foo', 'bar'], $db, -1));
 dba_close($db);
 unlink($filename);
 
 $db = dba_open($filename, 'n', 'inifile');
 dba_insert('[foo]bar', 23, $db);
 dba_insert('[foo]bar', 42, $db);
 dba_insert('[foo]bar', 1337, $db);
-var_dump(dba_fetch('[foo]bar', -1, $db));
-var_dump(dba_fetch('[foo]bar', -1, $db));
-var_dump(dba_fetch('[foo]bar', -1, $db));
+var_dump(dba_fetch('[foo]bar', $db, -1));
+var_dump(dba_fetch('[foo]bar', $db, -1));
+var_dump(dba_fetch('[foo]bar', $db, -1));
 dba_close($db);
 unlink($filename);
 
 $db = dba_open($filename, 'n', 'inifile');
 dba_insert('[foo]bar', 23, $db);
 dba_insert('[foo]bar', 42, $db);
 dba_insert('[foo]bar', 1337, $db);
-var_dump(dba_fetch('[foo]bar', 0, $db));
-var_dump(dba_fetch('[foo]bar', 1, $db));
-var_dump(dba_fetch('[foo]bar', 2, $db));
+var_dump(dba_fetch('[foo]bar', $db, 0));
+var_dump(dba_fetch('[foo]bar', $db, 1));
+var_dump(dba_fetch('[foo]bar', $db, 2));
 dba_close($db);
 unlink($filename);
 ?>

ext/dba/tests/dba_cdb_read.phpt

@@ -51,7 +51,7 @@ test.cdb
         echo "\n=";
         for ($i=0; $i < strlen($keys); $i++) {
             $key = substr($keys, $i, 1);
-            echo dba_fetch($key, $skip[$key], $db_file);
+            echo dba_fetch($key, $db_file, $skip[$key]);
             $skip[$key]++;
         }
         dba_close($db_file);

ext/dba/tests/dba_fetch_legacy_signature.phpt

@@ -15,7 +15,17 @@ $name = 'legacy_fetch_signature.db';
 $db = get_any_db($name);
 
 dba_insert("key1", "This is a test insert", $db);
-echo dba_fetch("key1", 0, $db), \PHP_EOL, dba_fetch("key1", $db, 0);
+echo dba_fetch("key1", 0, $db), \PHP_EOL, dba_fetch("key1", $db, 0), \PHP_EOL;
+
+set_error_handler(function ($severity, $message, $file, $line) {
+    throw new Exception($message);
+});
+
+try {
+    dba_fetch("key1", 0, $db);
+} catch (Exception $e) {
+    echo $e->getMessage() . "\n";
+}
 dba_close($db);
 
 ?>
@@ -27,5 +37,8 @@ cleanup_standard_db($db_name);
 ?>
 --EXPECTF--
 Using handler: "%s"
+
+Deprecated: Calling dba_fetch() with $dba at the 3rd parameter is deprecated in %s on line %d
 This is a test insert
 This is a test insert
+Calling dba_fetch() with $dba at the 3rd parameter is deprecated