Address another round of review comments + fix tests

kocsismate · kocsismate · commit f695ad3d7fe1 · 2020-10-14T20:20:53.000+02:00
diff --git a/build/gen_stub.php b/build/gen_stub.php
@@ -778,7 +778,7 @@ function parseFunctionLike(
                     $paramMeta[$varName] = [];
                 }
                 $paramMeta[$varName]['preferRef'] = true;
-            } else if ($tag->name === 'alias' || $tag->name === 'implementation-alias') {
+            } else if ($tag->name === 'alias' || $tag->name === 'implementation-alias' || $tag->name === 'static-method-alias') {
                 $aliasType = $tag->name;
                 $aliasParts = explode("::", $tag->getValue());
                 if (count($aliasParts) === 1) {
@@ -1342,7 +1342,7 @@ function initPhpParser() {
             /** @var FuncInfo $funcInfo */
             $funcMap[$funcInfo->name->__toString()] = $funcInfo;
 
-            if ($funcInfo->aliasType === "alias") {
+            if ($funcInfo->aliasType === "alias" || $funcInfo->aliasType === "static-method-alias") {
                 $aliases[] = $funcInfo;
             }
         }
@@ -1358,7 +1358,7 @@ function initPhpParser() {
         $aliasedArgs = $aliasedFunc->args;
         $aliasArgs = $aliasFunc->args;
 
-        if ($aliasFunc->isInstanceMethod() !== $aliasedFunc->isInstanceMethod()) {
+        if ($aliasFunc->isInstanceMethod() !== $aliasedFunc->isInstanceMethod() && $aliasFunc->aliasType !== "static-method-alias") {
             if ($aliasFunc->isInstanceMethod()) {
                 $aliasedArgs = array_slice($aliasedArgs, 1);
             }
diff --git a/ext/date/tests/68062.phpt b/ext/date/tests/68062.phpt
@@ -15,4 +15,4 @@ try {
 ?>
 --EXPECT--
 3600
-DateTimeZone::getOffset(): Argument #1 ($object) must be of type DateTimeInterface, int given
+DateTimeZone::getOffset(): Argument #1 ($datetime) must be of type DateTimeInterface, int given
diff --git a/ext/mysqli/mysqli.stub.php b/ext/mysqli/mysqli.stub.php
@@ -55,9 +55,9 @@ public function commit(int $flags = -1, ?string $name = null) {}
 
     /**
      * @return mysqli|null|false
-     * @alias mysqli_connect
+     * @static-method-alias mysqli_connect
      */
-    public static function connect(
+    public function connect(
         ?string $hostname = null,
         ?string $username = null,
         ?string $password = null,
diff --git a/ext/mysqli/mysqli_arginfo.h b/ext/mysqli/mysqli_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 200fdd7f3ae0ded20b43486f162d207b7fd09712 */
+ * Stub hash: b156847f2617389de5381e5bd5e2fedb27bd7eed */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mysqli_affected_rows, 0, 1, MAY_BE_LONG|MAY_BE_STRING)
 	ZEND_ARG_OBJ_INFO(0, mysql, mysqli, 0)
@@ -957,7 +957,7 @@ static const zend_function_entry class_mysqli_methods[] = {
 	ZEND_ME_MAPPING(character_set_name, mysqli_character_set_name, arginfo_class_mysqli_character_set_name, ZEND_ACC_PUBLIC)
 	ZEND_ME_MAPPING(close, mysqli_close, arginfo_class_mysqli_close, ZEND_ACC_PUBLIC)
 	ZEND_ME_MAPPING(commit, mysqli_commit, arginfo_class_mysqli_commit, ZEND_ACC_PUBLIC)
-	ZEND_ME_MAPPING(connect, mysqli_connect, arginfo_class_mysqli_connect, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+	ZEND_ME_MAPPING(connect, mysqli_connect, arginfo_class_mysqli_connect, ZEND_ACC_PUBLIC)
 	ZEND_ME_MAPPING(dump_debug_info, mysqli_dump_debug_info, arginfo_class_mysqli_dump_debug_info, ZEND_ACC_PUBLIC)
 	ZEND_ME_MAPPING(debug, mysqli_debug, arginfo_class_mysqli_debug, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	ZEND_ME_MAPPING(get_charset, mysqli_get_charset, arginfo_class_mysqli_get_charset, ZEND_ACC_PUBLIC)
diff --git a/ext/oci8/oci8.stub.php b/ext/oci8/oci8.stub.php
@@ -89,10 +89,6 @@ function oci_lob_is_equal(OCILob $lob1, OCILob $lob2): bool {}
 
 function oci_lob_export(OCILob $lob, string $filename, ?int $offset = null, ?int $length = null): bool {}
 
-function oci_lob_write_temporary(OCILob $lob, string $data, int $type = OCI_TEMP_CLOB): bool {}
-
-function oci_lob_close(OCILob $lob): bool {}
-
 /**
  * @alias oci_lob_export
  * @deprecated
@@ -658,16 +654,10 @@ public function writetofile(string $filename, ?int $offset = null, ?int $length
      */
     public function export(string $filename, ?int $offset = null, ?int $length = null) {}
 
-    /**
-     * @alias oci_lob_write_temporary
-     * @return bool
-     */
+    /** @return bool */
     public function writetemporary(string $data, int $type = OCI_TEMP_CLOB) {}
 
-    /**
-     * @alias oci_lob_close
-     * @return bool
-     */
+    /** @return bool */
     public function close() {}
 
     /**
diff --git a/ext/oci8/oci8_arginfo.h b/ext/oci8/oci8_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 7fc2631cb9b0ec3c50c895e2789774dec45adf15 */
+ * Stub hash: e7a7a9402b2668136f9f47d6e547e3af46a78a50 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_define_by_name, 0, 3, _IS_BOOL, 0)
 	ZEND_ARG_INFO(0, statement)
@@ -129,14 +129,6 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_lob_export, 0, 2, _IS_BOOL,
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, length, IS_LONG, 1, "null")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_lob_write_temporary, 0, 2, _IS_BOOL, 0)
-	ZEND_ARG_OBJ_INFO(0, lob, OCILob, 0)
-	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "OCI_TEMP_CLOB")
-ZEND_END_ARG_INFO()
-
-#define arginfo_oci_lob_close arginfo_oci_free_descriptor
-
 #define arginfo_ociwritelobtofile arginfo_oci_lob_export
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_oci_new_descriptor, 0, 1, OCILob, 1)
@@ -573,8 +565,6 @@ ZEND_FUNCTION(ocigetbufferinglob);
 ZEND_FUNCTION(oci_lob_copy);
 ZEND_FUNCTION(oci_lob_is_equal);
 ZEND_FUNCTION(oci_lob_export);
-ZEND_FUNCTION(oci_lob_write_temporary);
-ZEND_FUNCTION(oci_lob_close);
 ZEND_FUNCTION(oci_new_descriptor);
 ZEND_FUNCTION(oci_rollback);
 ZEND_FUNCTION(oci_commit);
@@ -629,6 +619,8 @@ ZEND_FUNCTION(oci_collection_trim);
 ZEND_FUNCTION(oci_new_collection);
 ZEND_FUNCTION(oci_register_taf_callback);
 ZEND_FUNCTION(oci_unregister_taf_callback);
+ZEND_METHOD(OCILob, writetemporary);
+ZEND_METHOD(OCILob, close);
 
 
 static const zend_function_entry ext_functions[] = {
@@ -661,8 +653,6 @@ static const zend_function_entry ext_functions[] = {
 	ZEND_FE(oci_lob_copy, arginfo_oci_lob_copy)
 	ZEND_FE(oci_lob_is_equal, arginfo_oci_lob_is_equal)
 	ZEND_FE(oci_lob_export, arginfo_oci_lob_export)
-	ZEND_FE(oci_lob_write_temporary, arginfo_oci_lob_write_temporary)
-	ZEND_FE(oci_lob_close, arginfo_oci_lob_close)
 	ZEND_DEP_FALIAS(ociwritelobtofile, oci_lob_export, arginfo_ociwritelobtofile)
 	ZEND_FE(oci_new_descriptor, arginfo_oci_new_descriptor)
 	ZEND_DEP_FALIAS(ocinewdescriptor, oci_new_descriptor, arginfo_ocinewdescriptor)
@@ -781,8 +771,8 @@ static const zend_function_entry class_OCILob_methods[] = {
 	ZEND_ME_MAPPING(getbuffering, ocigetbufferinglob, arginfo_class_OCILob_getbuffering, ZEND_ACC_PUBLIC)
 	ZEND_ME_MAPPING(writetofile, oci_lob_export, arginfo_class_OCILob_writetofile, ZEND_ACC_PUBLIC)
 	ZEND_ME_MAPPING(export, oci_lob_export, arginfo_class_OCILob_export, ZEND_ACC_PUBLIC)
-	ZEND_ME_MAPPING(writetemporary, oci_lob_write_temporary, arginfo_class_OCILob_writetemporary, ZEND_ACC_PUBLIC)
-	ZEND_ME_MAPPING(close, oci_lob_close, arginfo_class_OCILob_close, ZEND_ACC_PUBLIC)
+	ZEND_ME(OCILob, writetemporary, arginfo_class_OCILob_writetemporary, ZEND_ACC_PUBLIC)
+	ZEND_ME(OCILob, close, arginfo_class_OCILob_close, ZEND_ACC_PUBLIC)
 	ZEND_ME_MAPPING(free, oci_free_descriptor, arginfo_class_OCILob_free, ZEND_ACC_PUBLIC)
 	ZEND_FE_END
 };
diff --git a/ext/oci8/oci8_interface.c b/ext/oci8/oci8_interface.c
@@ -916,7 +916,7 @@ PHP_FUNCTION(oci_lob_export)
 /* }}} */
 
 /* {{{ Writes temporary blob */
-PHP_FUNCTION(oci_lob_write_temporary)
+PHP_METHOD(OCILob, writetemporary)
 {
 	zval *tmp, *z_descriptor;
 	php_oci_descriptor *descriptor;
@@ -943,7 +943,7 @@ PHP_FUNCTION(oci_lob_write_temporary)
 /* }}} */
 
 /* {{{ Closes lob descriptor */
-PHP_FUNCTION(oci_lob_close)
+PHP_METHOD(OCILob, close)
 {
 	zval *tmp, *z_descriptor;
 	php_oci_descriptor *descriptor;
diff --git a/ext/xmlwriter/php_xmlwriter.stub.php b/ext/xmlwriter/php_xmlwriter.stub.php
@@ -90,13 +90,13 @@ class XMLWriter
 {
     /**
      * @return bool
-     * @alias xmlwriter_open_uri
+     * @static-method-alias xmlwriter_open_uri
      */
-    public static function openUri(string $uri) {}
+    public function openUri(string $uri) {}
 
     /**
      * @return bool
-     * @alias xmlwriter_open_memory
+     * @static-method-alias xmlwriter_open_memory
      */
     public function openMemory() {}
 
diff --git a/ext/xmlwriter/php_xmlwriter_arginfo.h b/ext/xmlwriter/php_xmlwriter_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 1dac866f8b92d14862818a3350cc4f902c35dc65 */
+ * Stub hash: 8607fe498af4c678f099231d52c3c8aabf5b7e9e */
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_xmlwriter_open_uri, 0, 1, XMLWriter, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, uri, IS_STRING, 0)
@@ -420,7 +420,7 @@ static const zend_function_entry ext_functions[] = {
 
 
 static const zend_function_entry class_XMLWriter_methods[] = {
-	ZEND_ME_MAPPING(openUri, xmlwriter_open_uri, arginfo_class_XMLWriter_openUri, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+	ZEND_ME_MAPPING(openUri, xmlwriter_open_uri, arginfo_class_XMLWriter_openUri, ZEND_ACC_PUBLIC)
 	ZEND_ME_MAPPING(openMemory, xmlwriter_open_memory, arginfo_class_XMLWriter_openMemory, ZEND_ACC_PUBLIC)
 	ZEND_ME_MAPPING(setIndent, xmlwriter_set_indent, arginfo_class_XMLWriter_setIndent, ZEND_ACC_PUBLIC)
 	ZEND_ME_MAPPING(setIndentString, xmlwriter_set_indent_string, arginfo_class_XMLWriter_setIndentString, ZEND_ACC_PUBLIC)

Original file line number	Diff line number	Diff line change
`@@ -778,7 +778,7 @@ function parseFunctionLike(`
`778`	`778`	`$paramMeta[$varName] = [];`
`779`	`779`	`}`
`780`	`780`	`$paramMeta[$varName]['preferRef'] = true;`
`781`		`- } else if ($tag->name === 'alias' \|\| $tag->name === 'implementation-alias') {`
	`781`	`+ } else if ($tag->name === 'alias' \|\| $tag->name === 'implementation-alias' \|\| $tag->name === 'static-method-alias') {`
`782`	`782`	`$aliasType = $tag->name;`
`783`	`783`	`$aliasParts = explode("::", $tag->getValue());`
`784`	`784`	`if (count($aliasParts) === 1) {`
`@@ -1342,7 +1342,7 @@ function initPhpParser() {`
`1342`	`1342`	`/** @var FuncInfo $funcInfo */`
`1343`	`1343`	`$funcMap[$funcInfo->name->__toString()] = $funcInfo;`
`1344`	`1344`
`1345`		`- if ($funcInfo->aliasType === "alias") {`
	`1345`	`+ if ($funcInfo->aliasType === "alias" \|\| $funcInfo->aliasType === "static-method-alias") {`
`1346`	`1346`	`$aliases[] = $funcInfo;`
`1347`	`1347`	`}`
`1348`	`1348`	`}`
`@@ -1358,7 +1358,7 @@ function initPhpParser() {`
`1358`	`1358`	`$aliasedArgs = $aliasedFunc->args;`
`1359`	`1359`	`$aliasArgs = $aliasFunc->args;`
`1360`	`1360`
`1361`		`- if ($aliasFunc->isInstanceMethod() !== $aliasedFunc->isInstanceMethod()) {`
	`1361`	`+ if ($aliasFunc->isInstanceMethod() !== $aliasedFunc->isInstanceMethod() && $aliasFunc->aliasType !== "static-method-alias") {`
`1362`	`1362`	`if ($aliasFunc->isInstanceMethod()) {`
`1363`	`1363`	`$aliasedArgs = array_slice($aliasedArgs, 1);`
`1364`	`1364`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,4 @@ try {`
`15`	`15`	`?>`
`16`	`16`	`--EXPECT--`
`17`	`17`	`3600`
`18`		`-DateTimeZone::getOffset(): Argument #1 ($object) must be of type DateTimeInterface, int given`
	`18`	`+DateTimeZone::getOffset(): Argument #1 ($datetime) must be of type DateTimeInterface, int given`