Revert "Fixed bug #71820 pg_fetch_object bind parameters before call constructor"

This reverts commit b4eedd128ba9f61be08a50c94afd72837d7cf70b.

This fixed bug #72151, and reverts the fix for bug #71820.
See also bug #50636 and #49521 for the history.

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index a7d81757a781dbccf10f415f515a336e85d88cbd..594dd0da35e7444bbdf939ccc0ddbdbb5565010b 100644 (file)
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -1278,13 +1278,15 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags
                zval dataset, retval;
                zend_fcall_info fci;
                zend_fcall_info_cache fcc;
-               zend_bool props_handled = 0;
 
                ZVAL_COPY_VALUE(&dataset, return_value);
+
                object_and_properties_init(return_value, ce, NULL);
                if (!ce->default_properties_count && !ce->__set) {
                        Z_OBJ_P(return_value)->properties = Z_ARR(dataset);
-                       props_handled = 1;
+               } else {
+                       zend_merge_properties(return_value, Z_ARRVAL(dataset));
+                       zval_ptr_dtor(&dataset);
                }
 
                if (ce->constructor) {
@@ -1306,9 +1308,6 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags
                                         * single value is an array. Also we'd have to make that one
                                         * argument passed by reference.
                                         */
-                                       if (!props_handled) {
-                                               zval_ptr_dtor(&dataset);
-                                       }
                                        zend_throw_exception(zend_ce_exception, "Parameter ctor_params must be an array", 0);
                                        return;
                                }
@@ -1321,14 +1320,7 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags
                        fcc.object = Z_OBJ_P(return_value);
 
                        if (zend_call_function(&fci, &fcc) == FAILURE) {
-                               if (fci.params) {
-                                       efree(fci.params);
-                               }
-                               if (!props_handled) {
-                                       zval_ptr_dtor(&dataset);
-                               }
                                zend_throw_exception_ex(zend_ce_exception, 0, "Could not execute %s::%s()", ZSTR_VAL(ce->name), ZSTR_VAL(ce->constructor->common.function_name));
-                               return;
                        } else {
                                zval_ptr_dtor(&retval);
                        }
@@ -1336,16 +1328,7 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags
                                efree(fci.params);
                        }
                } else if (ctor_params) {
-                       if (!props_handled) {
-                               zval_ptr_dtor(&dataset);
-                       }
                        zend_throw_exception_ex(zend_ce_exception, 0, "Class %s does not have a constructor hence you cannot use ctor_params", ZSTR_VAL(ce->name));
-                       return;
-               }
-
-               if (!props_handled) {
-                       zend_merge_properties(return_value, Z_ARRVAL(dataset));
-                       zval_ptr_dtor(&dataset);
                }
        }
 }

diff --git a/ext/mysqli/tests/bug71820.phpt b/ext/mysqli/tests/bug71820.phpt
deleted file mode 100644 (file)
index 02a2593..0000000
--- a/ext/mysqli/tests/bug71820.phpt
+++ /dev/null
@@ -1,104 +0,0 @@
---TEST--
-Bug #71820 __set has to be called after constructor, mysqli part
---SKIPIF--
-<?php
-require_once('skipif.inc');
-require_once('skipifconnectfailure.inc');
-require_once("connect.inc");
-?>
---FILE--
-<?php
-
-include "connect.inc";
-
-$tableName = 'test_mysqli_fetch_object';
-
-class TestRow
-{
-
-       private $set_from_constructor;
-       private $data;
-       private $hello = "world";
-
-       public function __construct($set_from_constructor)
-       {
-               $this->set_from_constructor = $set_from_constructor;
-       }
-
-       public function __set($name, $value)
-       {
-               if (!isset($this->data[$name])) {
-                       /* $this->set_from_constructor has an expected value */
-                       $this->data[$name] = 42 == $this->set_from_constructor ? $value : -1;
-                       return;
-               }
-               throw new \Exception('Duplicity column name.');
-       }
-
-}
-
-
-if (!($connection = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))) {
-       printf("[001] Cannot connect to the server");
-}
-       
-$rc = mysqli_query($connection, "DROP TABLE IF EXISTS $tableName");
-if (!$rc)
-       printf("[002] [%d] %s\n", mysqli_errno($connection), mysqli_error($connection));
-
-$table = <<<SQL
-CREATE TABLE $tableName (
-  id int NOT NULL auto_increment primary key,
-  name varchar(255) NOT NULL
-);
-SQL;
-
-$rc = mysqli_query($connection, $table);
-if (!$rc)
-       printf("[003] [%d] %s\n", mysqli_errno($connection), mysqli_error($connection));
-
-$rc = mysqli_query($connection, "INSERT INTO " . $tableName . " (name) VALUES ('Doe'), ('Joe')");
-if (!$rc)
-       printf("[004] [%d] %s\n", mysqli_errno($connection), mysqli_error($connection));
-
-$result = mysqli_query($connection, 'SELECT * FROM ' . $tableName . ' LIMIT 10');
-if (!$result)
-       printf("[005] [%d] %s\n", mysqli_errno($result), mysqli_error($result));
-
-
-while ($row = mysqli_fetch_object($result, 'TestRow', [42])) {
-       var_dump($row);
-}
-
-mysqli_close($connection);
-
-?>
-==DONE==
---EXPECTF--
-object(TestRow)#%d (3) {
-  ["set_from_constructor":"TestRow":private]=>
-  int(42)
-  ["data":"TestRow":private]=>
-  array(2) {
-    ["id"]=>
-    string(1) "1"
-    ["name"]=>
-    string(3) "Doe"
-  }
-  ["hello":"TestRow":private]=>
-  string(5) "world"
-}
-object(TestRow)#%d (3) {
-  ["set_from_constructor":"TestRow":private]=>
-  int(42)
-  ["data":"TestRow":private]=>
-  array(2) {
-    ["id"]=>
-    string(1) "2"
-    ["name"]=>
-    string(3) "Joe"
-  }
-  ["hello":"TestRow":private]=>
-  string(5) "world"
-}
-==DONE==

diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index ad643a98ca995ea6855828d5bb4f054ddd76dddf..c196c97ee71b2b0ec81ff99c2f169e5959eed241 100644 (file)
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -2777,13 +2777,14 @@ static void php_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, zend_long result_
                zend_fcall_info fci;
                zend_fcall_info_cache fcc;
                zval retval;
-               zend_bool props_handled = 0;
 
                ZVAL_COPY_VALUE(&dataset, return_value);
                object_and_properties_init(return_value, ce, NULL);
                if (!ce->default_properties_count && !ce->__set) {
                        Z_OBJ_P(return_value)->properties = Z_ARR(dataset);
-                       props_handled = 1;
+               } else {
+                       zend_merge_properties(return_value, Z_ARRVAL(dataset));
+                       zval_ptr_dtor(&dataset);
                }
 
                if (ce->constructor) {
@@ -2806,9 +2807,6 @@ static void php_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, zend_long result_
                                         * argument passed by reference.
                                         */
                                        zend_throw_exception(zend_ce_exception, "Parameter ctor_params must be an array", 0);
-                                       if (!props_handled) {
-                                               zval_ptr_dtor(&dataset);
-                                       }
                                        return;
                                }
                        }
@@ -2821,13 +2819,6 @@ static void php_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, zend_long result_
 
                        if (zend_call_function(&fci, &fcc) == FAILURE) {
                                zend_throw_exception_ex(zend_ce_exception, 0, "Could not execute %s::%s()", ce->name, ce->constructor->common.function_name);
-                               if (fci.params) {
-                                       efree(fci.params);
-                               }
-                               if (!props_handled) {
-                                       zval_ptr_dtor(&dataset);
-                               }
-                               return;
                        } else {
                                zval_ptr_dtor(&retval);
                        }
@@ -2836,15 +2827,6 @@ static void php_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, zend_long result_
                        }
                } else if (ctor_params) {
                        zend_throw_exception_ex(zend_ce_exception, 0, "Class %s does not have a constructor hence you cannot use ctor_params", ce->name);
-                       if (!props_handled) {
-                               zval_ptr_dtor(&dataset);
-                       }
-                       return;
-               }
-
-               if (!props_handled) {
-                       zend_merge_properties(return_value, Z_ARRVAL(dataset));
-                       zval_ptr_dtor(&dataset);
                }
        }
 }

diff --git a/ext/pgsql/tests/bug71820.phpt b/ext/pgsql/tests/bug71820.phpt
deleted file mode 100644 (file)
index 4d99e34..0000000
--- a/ext/pgsql/tests/bug71820.phpt
+++ /dev/null
@@ -1,93 +0,0 @@
---TEST--
-Bug #71820 pg_fetch_object bind parameters before call constructor
---SKIPIF--
-<?php
-require_once('skipif.inc');
-?>
---FILE--
-<?php
-
-require_once('config.inc');
-
-$tableName = 'test_pg_fetch_object';
-
-class TestRow
-{
-
-       private $set_from_constructor;
-       private $data;
-       private $hello = 42;
-
-       public function __construct($set_from_constructor)
-       {
-               $this->set_from_constructor = $set_from_constructor;
-       }
-
-       public function __set($name, $value)
-       {
-               if (!isset($this->data[$name])) {
-                       /* $this->set_from_constructor has an expected value */
-                       $this->data[$name] = 42 == $this->set_from_constructor ? $value : -1;
-                       return;
-               }
-               throw new \Exception('Duplicity column name.');
-       }
-
-}
-
-$connection = pg_connect($conn_str);
-
-if (!$connection) {
-       die('Connection faild.');
-}
-
-$table = <<<SQL
-CREATE TABLE IF NOT EXISTS $tableName (
-  id serial NOT NULL,
-  name character varying NOT NULL
-);
-SQL;
-pg_query($connection, $table);
-
-pg_query_params('INSERT INTO ' . $tableName . ' (name) VALUES ($1), ($2);', ['$1' => 'Doe', '$2' => 'Joe']);
-
-$result = pg_query('SELECT * FROM ' . $tableName . ' LIMIT 10;');
-
-while ($row = pg_fetch_object($result, NULL, 'TestRow', [42])) {
-       var_dump($row);
-}
-
-pg_query($connection, "DROP TABLE $tableName");
-
-pg_close($connection);
-
-?>
-==DONE==
---EXPECTF--
-object(TestRow)#%d (3) {
-  ["set_from_constructor":"TestRow":private]=>
-  int(42)
-  ["data":"TestRow":private]=>
-  array(2) {
-    ["id"]=>
-    string(1) "1"
-    ["name"]=>
-    string(3) "Doe"
-  }
-  ["hello":"TestRow":private]=>
-  int(42)
-}
-object(TestRow)#%d (3) {
-  ["set_from_constructor":"TestRow":private]=>
-  int(42)
-  ["data":"TestRow":private]=>
-  array(2) {
-    ["id"]=>
-    string(1) "2"
-    ["name"]=>
-    string(3) "Joe"
-  }
-  ["hello":"TestRow":private]=>
-  int(42)
-}
-==DONE==