Fixes

Author: kocsismate

build/gen_stub.php

@@ -984,7 +984,7 @@ public function getMethodSynopsisFilename(): string {
     }
 
     public function getAttributeName(): string {
-        return $this->name->toString();
+        return strtolower($this->name->toString());
     }
 
     public function __toString(): string {
@@ -1032,7 +1032,7 @@ public function getMethodSynopsisFilename(): string {
     }
 
     public function getAttributeName(): string {
-        return $this->methodName;
+        return strtolower($this->methodName);
     }
 
     public function __toString(): string {
@@ -3598,7 +3598,11 @@ function findEquivalentFuncInfo(array $generatedFuncInfos, FuncInfo $funcInfo):
     return null;
 }
 
-/** @param iterable $infos */
+/**
+ * @template T
+ * @param iterable<T> $infos
+ * @param Closure(T): string|null $codeGenerator
+ */
 function generateCodeWithConditions(
     iterable $infos, string $separator, Closure $codeGenerator): string {
     $code = "";
@@ -3636,7 +3640,7 @@ function generateArgInfoCode(
     $generatedFuncInfos = [];
     $code .= generateCodeWithConditions(
         $fileInfo->getAllFuncInfos(), "\n",
-        function (FuncInfo $funcInfo) use(&$generatedFuncInfos) {
+        static function (FuncInfo $funcInfo) use (&$generatedFuncInfos) {
             /* If there already is an equivalent arginfo structure, only emit a #define */
             if ($generatedFuncInfo = findEquivalentFuncInfo($generatedFuncInfos, $funcInfo)) {
                 $code = sprintf(
@@ -3658,7 +3662,7 @@ function (FuncInfo $funcInfo) use(&$generatedFuncInfos) {
         $generatedFunctionDeclarations = [];
         $code .= generateCodeWithConditions(
             $fileInfo->getAllFuncInfos(), "",
-            function (FuncInfo $funcInfo) use($fileInfo, &$generatedFunctionDeclarations) {
+            static function (FuncInfo $funcInfo) use ($fileInfo, &$generatedFunctionDeclarations) {
                 $key = $funcInfo->getDeclarationKey();
                 if (isset($generatedFunctionDeclarations[$key])) {
                     return null;
@@ -3683,6 +3687,7 @@ function (FuncInfo $funcInfo) use($fileInfo, &$generatedFunctionDeclarations) {
         $attributeInitializationCode = generateAttributeInitialization($fileInfo, $classEntriesWithSensitiveParams);
 
         if ($attributeInitializationCode !== "" || !empty($fileInfo->constInfos)) {
+            $classEntriesWithSensitiveParams = array_unique($classEntriesWithSensitiveParams);
             $code .= "\nstatic void register_{$stubFilenameWithoutExtension}_symbols(int module_number";
             foreach ($classEntriesWithSensitiveParams as $ce) {
                 $code .= ", zend_class_entry *$ce";
@@ -3732,7 +3737,7 @@ function generateFunctionEntries(?Name $className, array $funcInfos): string {
     }
 
     $code .= "\n\nstatic const zend_function_entry {$functionEntryName}[] = {\n";
-    $code .= generateCodeWithConditions($funcInfos, "", function (FuncInfo $funcInfo) {
+    $code .= generateCodeWithConditions($funcInfos, "", static function (FuncInfo $funcInfo) {
         return $funcInfo->getFunctionEntry();
     });
     $code .= "\tZEND_FE_END\n";
@@ -3742,27 +3747,31 @@ function generateFunctionEntries(?Name $className, array $funcInfos): string {
 }
 
 function generateAttributeInitialization(FileInfo $fileInfo, array &$classEntriesWithSensitiveParams): string {
-    $code = "";
+    return generateCodeWithConditions(
+        $fileInfo->getAllFuncInfos(),
+        "",
+        static function (FuncInfo $funcInfo) use (&$classEntriesWithSensitiveParams) {
+            $code = null;
+
+            foreach ($funcInfo->args as $index => $arg) {
+                if (!$arg->isSensitive) {
+                    continue;
+                }
 
-    foreach ($fileInfo->getAllFuncInfos() as $funcInfo) {
-        foreach ($funcInfo->args as $index => $arg) {
-            if (!$arg->isSensitive) {
-                continue;
-            }
+                if ($funcInfo->name instanceof MethodName) {
+                    $classEntry = "class_entry_" . str_replace("\\", "_", $funcInfo->name->className->toString());
+                    $functionTable = "&{$classEntry}->function_table";
+                    $classEntriesWithSensitiveParams[] = $classEntry;
+                } else {
+                    $functionTable = "CG(function_table)";
+                }
 
-            if ($funcInfo->name instanceof MethodName) {
-                $classEntry = "class_entry_" . str_replace("\\", "_", $funcInfo->name->className->toString());
-                $functionTable = "&{$classEntry}->function_table";
-                $classEntriesWithSensitiveParams[] = $classEntry;
-            } else {
-                $functionTable = "CG(function_table)";
+                $code .= "    zend_mark_function_parameter_as_sensitive($functionTable, \"" . $funcInfo->name->getAttributeName() . "\", $index);\n";
             }
 
-            $code .= "    zend_mark_function_parameter_as_sensitive($functionTable, \"" . $funcInfo->name->getAttributeName() . "\", $index);\n";
+            return $code;
         }
-    }
-
-    return $code;
+    );
 }
 
 /** @param FuncInfo<string, FuncInfo> $funcInfos */
@@ -3772,7 +3781,7 @@ function generateOptimizerInfo(array $funcInfos): string {
 
     $code .= "static const func_info_t func_infos[] = {\n";
 
-    $code .= generateCodeWithConditions($funcInfos, "", function (FuncInfo $funcInfo) {
+    $code .= generateCodeWithConditions($funcInfos, "", static function (FuncInfo $funcInfo) {
         return $funcInfo->getOptimizerInfo();
     });
 
@@ -4169,7 +4178,7 @@ function initPhpParser() {
         installPhpParser($version, $phpParserDir);
     }
 
-    spl_autoload_register(function(string $class) use($phpParserDir) {
+    spl_autoload_register(function(string $class) use ($phpParserDir) {
         if (strpos($class, "PhpParser\\") === 0) {
             $fileName = $phpParserDir . "/lib/" . str_replace("\\", "/", $class) . ".php";
             require $fileName;