add compatibility for tentative-return-type

Author: remicollet

build/gen_stub.php

@@ -3769,12 +3769,16 @@ protected function pName_FullyQualified(Name\FullyQualified $node) {
     return $fileInfo;
 }
 
-function funcInfoToCode(FuncInfo $funcInfo): string {
+function funcInfoToCode(FileInfo $fileInfo, FuncInfo $funcInfo): string {
     $code = '';
     $returnType = $funcInfo->return->type;
     $isTentativeReturnType = $funcInfo->return->tentativeReturnType;
+    $php81MinimumCompatibility = $fileInfo->generateLegacyArginfoForPhpVersionId === null || $fileInfo->generateLegacyArginfoForPhpVersionId >= PHP_81_VERSION_ID;
 
     if ($returnType !== null) {
+        if ($isTentativeReturnType && !$php81MinimumCompatibility) {
+            $code .= "#if (PHP_VERSION_ID >= " . PHP_81_VERSION_ID . ")\n";
+        }
         if (null !== $simpleReturnType = $returnType->tryToSimpleType()) {
             if ($simpleReturnType->isBuiltin) {
                 $code .= sprintf(
@@ -3813,6 +3817,12 @@ function funcInfoToCode(FuncInfo $funcInfo): string {
                 );
             }
         }
+        if ($isTentativeReturnType && !$php81MinimumCompatibility) {
+            $code .= sprintf(
+                "#else\nZEND_BEGIN_ARG_INFO_EX(%s, 0, %d, %d)\n#endif\n",
+                $funcInfo->getArgInfoName(), $funcInfo->return->byRef, $funcInfo->numRequiredArgs
+            );
+        }
     } else {
         $code .= sprintf(
             "ZEND_BEGIN_ARG_INFO_EX(%s, 0, %d, %d)\n",
@@ -3925,15 +3935,15 @@ function generateArgInfoCode(
     $generatedFuncInfos = [];
     $code .= generateCodeWithConditions(
         $fileInfo->getAllFuncInfos(), "\n",
-        static function (FuncInfo $funcInfo) use (&$generatedFuncInfos) {
+        static function (FuncInfo $funcInfo) use (&$generatedFuncInfos, $fileInfo) {
             /* If there already is an equivalent arginfo structure, only emit a #define */
             if ($generatedFuncInfo = findEquivalentFuncInfo($generatedFuncInfos, $funcInfo)) {
                 $code = sprintf(
                     "#define %s %s\n",
                     $funcInfo->getArgInfoName(), $generatedFuncInfo->getArgInfoName()
                 );
             } else {
-                $code = funcInfoToCode($funcInfo);
+                $code = funcInfoToCode($fileInfo, $funcInfo);
             }
 
             $generatedFuncInfos[] = $funcInfo;

ext/zend_test/test.c

@@ -531,6 +531,8 @@ static ZEND_METHOD(_ZendTestTrait, testMethod)
 static ZEND_METHOD(ZendTestNS_Foo, method)
 {
 	ZEND_PARSE_PARAMETERS_NONE();
+
+	RETURN_LONG(0);
 }
 
 static ZEND_METHOD(ZendTestNS2_Foo, method)

ext/zend_test/test.stub.php

@@ -1,7 +1,9 @@
 <?php
 
-/** @generate-class-entries static */
-
+/**
+ * @generate-class-entries static
+ * @generate-legacy-arginfo 80000
+ */
 namespace {
 
     require "Zend/zend_attributes.stub.php";
@@ -137,7 +139,8 @@ function zend_test_zend_ini_parse_uquantity(string $str): int {}
 namespace ZendTestNS {
 
     class Foo {
-        public function method(): void {}
+        /** @tentative-return-type */
+        public function method(): int {}
     }
 
 }