@@ -1833,9 +1833,6 @@ static void php_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, zend_long result_
1833
1833
1834
1834
if (into_object ) {
1835
1835
zval dataset ;
1836
- zend_fcall_info fci ;
1837
- zend_fcall_info_cache fcc ;
1838
- zval retval ;
1839
1836
1840
1837
ZVAL_COPY_VALUE (& dataset , return_value );
1841
1838
object_init_ex (return_value , ce );
@@ -1847,23 +1844,8 @@ static void php_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, zend_long result_
1847
1844
}
1848
1845
1849
1846
if (ce -> constructor ) {
1850
- fci .size = sizeof (fci );
1851
- ZVAL_UNDEF (& fci .function_name );
1852
- fci .object = Z_OBJ_P (return_value );
1853
- fci .retval = & retval ;
1854
- fci .params = NULL ;
1855
- fci .param_count = 0 ;
1856
- fci .named_params = ctor_params ;
1857
-
1858
- fcc .function_handler = ce -> constructor ;
1859
- fcc .called_scope = Z_OBJCE_P (return_value );
1860
- fcc .object = Z_OBJ_P (return_value );
1861
-
1862
- if (zend_call_function (& fci , & fcc ) == FAILURE ) {
1863
- zend_throw_exception_ex (zend_ce_exception , 0 , "Could not execute %s::%s()" , ZSTR_VAL (ce -> name ), ZSTR_VAL (ce -> constructor -> common .function_name ));
1864
- } else {
1865
- zval_ptr_dtor (& retval );
1866
- }
1847
+ zend_call_known_function (ce -> constructor , Z_OBJ_P (return_value ), Z_OBJCE_P (return_value ),
1848
+ /* retval */ NULL , /* argc */ 0 , /* params */ NULL , ctor_params );
1867
1849
} else if (ctor_params && zend_hash_num_elements (ctor_params ) > 0 ) {
1868
1850
/* TODO Convert this to a ValueError */
1869
1851
zend_argument_error (zend_ce_exception , 3 ,
0 commit comments