Remove zend_fcall_info_args_ex() HashTable emulation

Author: Girgias

ext/pdo/pdo_stmt.c

@@ -634,49 +634,6 @@ static bool pdo_do_key_pair_fetch(pdo_stmt_t *stmt, enum pdo_fetch_orientation o
 	return true;
 }
 
-/* Previous the legacy zend_fcall_info_args_ex() function was used to set the
- * constructor arguments. The particularity of this function is to it "wraps" arguments
- * that need to be passed by-ref in a reference.
- * As this API only supported positional args, we don't bother doing this for named arguments. */
-static HashTable* pdo_class_fetch_prepare_constructor_arguments(const zend_function *constructor, HashTable *ctor_args)
-{
-	zend_ulong index;
-	zend_string *arg_name = NULL;
-	zval *arg_value = NULL;
-	bool needs_duplication = false;
-	ZEND_HASH_FOREACH_KEY_VAL(ctor_args, index, arg_name, arg_value) {
-		/* Named param, means we can assume no positional arguments exist after */
-		if (arg_name) {
-			break;
-		}
-		if (!Z_ISREF_P(arg_value) && ARG_SHOULD_BE_SENT_BY_REF(constructor, index+1)) {
-			needs_duplication = true;
-			break;
-		}
-	} ZEND_HASH_FOREACH_END();
-	if (needs_duplication) {
-		HashTable *duplicated = zend_new_array(zend_hash_num_elements(ctor_args));
-		ZEND_HASH_FOREACH_KEY_VAL(ctor_args, index, arg_name, arg_value) {
-			if (arg_name) {
-				zend_hash_add(duplicated, arg_name, arg_value);
-			} else {
-				zval val;
-				if (!Z_ISREF_P(arg_value) && ARG_SHOULD_BE_SENT_BY_REF(constructor, index+1)) {
-					Z_TRY_ADDREF_P(arg_value);
-					ZVAL_NEW_REF(&val, arg_value);
-				} else {
-					ZVAL_COPY_VALUE(&val, arg_value);
-				}
-				zend_hash_index_add(duplicated, index, &val);
-			}
-		} ZEND_HASH_FOREACH_END();
-		return duplicated;
-	} else {
-		GC_TRY_ADDREF(ctor_args);
-		return ctor_args;
-	}
-}
-
 /* Return value MUST be an initialized object */
 static bool pdo_call_fetch_object_constructor(zend_function *constructor, HashTable *ctor_args, zval *return_value)
 {
@@ -1118,7 +1075,8 @@ PHP_METHOD(PDOStatement, fetchObject)
 				zend_argument_value_error(2, "must be empty when class provided in argument #1 ($class) does not have a constructor");
 				goto reset_old_ctor_args;
 			}
-			stmt->fetch.cls.ctor_args = pdo_class_fetch_prepare_constructor_arguments(ce->constructor, ctor_args);
+			GC_TRY_ADDREF(ctor_args);
+			stmt->fetch.cls.ctor_args = ctor_args;
 		}
 	} else {
 		stmt->fetch.cls.ce = zend_standard_class_def;
@@ -1230,7 +1188,8 @@ PHP_METHOD(PDOStatement, fetchAll)
 					zend_argument_value_error(3, "must be empty when class provided in argument #2 ($class) does not have a constructor");
 					goto reset_old_ctor_args;
 				}
-				stmt->fetch.cls.ctor_args = pdo_class_fetch_prepare_constructor_arguments(stmt->fetch.cls.ce->constructor, ctor_args);
+				GC_TRY_ADDREF(ctor_args);
+				stmt->fetch.cls.ctor_args = ctor_args;
 			}
 			break;
 
@@ -1753,7 +1712,8 @@ bool pdo_stmt_setup_fetch_mode(pdo_stmt_t *stmt, zend_long mode, uint32_t mode_a
 							zend_argument_value_error(3, "must be empty when class provided in argument #2 ($class) does not have a constructor");
 							return false;
 						}
-						stmt->fetch.cls.ctor_args = pdo_class_fetch_prepare_constructor_arguments(cep->constructor, Z_ARRVAL(args[1]));
+						GC_TRY_ADDREF(Z_ARRVAL(args[1]));
+						stmt->fetch.cls.ctor_args = Z_ARRVAL(args[1]);
 					}
 				}
 				stmt->fetch.cls.ce = cep;

ext/pdo/tests/pdo_fetch_class_basic.phpt

@@ -48,7 +48,8 @@ $stmt->execute();
 var_dump($stmt->fetchAll(PDO::FETCH_CLASS, 'TestBase'));
 
 $stmt->execute();
-var_dump($stmt->fetchAll(PDO::FETCH_CLASS, 'TestDerived', array(0)));
+$rowCounter = 0;
+var_dump($stmt->fetchAll(PDO::FETCH_CLASS, 'TestDerived', [&$rowCounter]));
 
 ?>
 --CLEAN--

ext/pdo/tests/pdo_fetch_class_by_ref_constructor.phpt

@@ -47,9 +47,14 @@ $db = PDOTest::factory();
 PDOTest::dropTableIfExists($db, "pdo_fetch_class_by_ref_ctor");
 ?>
 --EXPECTF--
+Warning: TestByRefCtor::__construct(): Argument #1 ($str) must be passed by reference, value given in %s on line %d
 TestByRefCtor::__construct(aaaaaaaaaa, 1)
-TestByRefCtor::__construct(aaaaaaaaaaA, 2)
-TestByRefCtor::__construct(aaaaaaaaaaAB, 3)
+
+Warning: TestByRefCtor::__construct(): Argument #1 ($str) must be passed by reference, value given in %s on line %d
+TestByRefCtor::__construct(aaaaaaaaaa, 2)
+
+Warning: TestByRefCtor::__construct(): Argument #1 ($str) must be passed by reference, value given in %s on line %d
+TestByRefCtor::__construct(aaaaaaaaaa, 3)
 array(3) {
   [0]=>
   object(TestByRefCtor)#%d (3) {
@@ -67,7 +72,7 @@ array(3) {
     ["val"]=>
     string(1) "B"
     ["str":"TestByRefCtor":private]=>
-    string(12) "aaaaaaaaaaAB"
+    string(11) "aaaaaaaaaaB"
   }
   [2]=>
   object(TestByRefCtor)#%d (3) {
@@ -76,6 +81,6 @@ array(3) {
     ["val"]=>
     string(1) "C"
     ["str":"TestByRefCtor":private]=>
-    string(13) "aaaaaaaaaaABC"
+    string(11) "aaaaaaaaaaC"
   }
 }