From: Máté Kocsis <kocsismate@woohoolabs.com>
Date: Fri, 10 Apr 2020 16:03:20 +0000 (+0200)
Subject: Fix default value of the $class_name parameter of mysqli_fetch_object()
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ce3b49a8e81bdf4d39ca097e7699fde20998102e;p=php

Fix default value of the $class_name parameter of mysqli_fetch_object()
---

diff --git a/ext/mysqli/mysqli.stub.php b/ext/mysqli/mysqli.stub.php
index 8417225df4..8d3dc75a97 100644
--- a/ext/mysqli/mysqli.stub.php
+++ b/ext/mysqli/mysqli.stub.php
@@ -203,7 +203,7 @@ class mysqli_result
     public function fetch_assoc();
 
     /** @return object|null */
-    public function fetch_object(string $class_name = 'stdClass', array $params = []);
+    public function fetch_object(string $class_name = UNKNOWN, array $params = []);
 
     /** @return array|null */
     public function fetch_row();
@@ -340,7 +340,7 @@ function mysqli_fetch_assoc(mysqli_result $mysql_result): ?array {}
 
 function mysqli_fetch_object(
     mysqli_result $mysqli_result,
-    string $class_name = 'stdClass',
+    string $class_name = UNKNOWN,
     array $params = []
 ): ?object {}
 
diff --git a/ext/mysqli/mysqli_arginfo.h b/ext/mysqli/mysqli_arginfo.h
index e40ba8ea09..a540a8fa23 100644
--- a/ext/mysqli/mysqli_arginfo.h
+++ b/ext/mysqli/mysqli_arginfo.h
@@ -111,7 +111,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_fetch_object, 0, 1, IS_OBJECT, 1)
 	ZEND_ARG_OBJ_INFO(0, mysqli_result, mysqli_result, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, class_name, IS_STRING, 0, "\'stdClass\'")
+	ZEND_ARG_TYPE_INFO(0, class_name, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, params, IS_ARRAY, 0, "[]")
 ZEND_END_ARG_INFO()
 
@@ -601,7 +601,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_mysqli_result_fetch_assoc arginfo_class_mysqli_character_set_name
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_result_fetch_object, 0, 0, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, class_name, IS_STRING, 0, "\'stdClass\'")
+	ZEND_ARG_TYPE_INFO(0, class_name, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, params, IS_ARRAY, 0, "[]")
 ZEND_END_ARG_INFO()