A few cleanup changes for gen_stub.php

kocsismate · kocsismate · commit b2ed625de163 · 2022-06-06T07:43:56.000+02:00
diff --git a/build/gen_stub.php b/build/gen_stub.php
@@ -937,7 +937,7 @@ interface FunctionOrMethodName {
     public function getDeclaration(): string;
     public function getArgInfoName(): string;
     public function getMethodSynopsisFilename(): string;
-    public function getAttributeName(): string;
+    public function getNameForAttributes(): string;
     public function __toString(): string;
     public function isMethod(): bool;
     public function isConstructor(): bool;
@@ -983,7 +983,7 @@ public function getMethodSynopsisFilename(): string {
         return implode('_', $this->name->parts);
     }
 
-    public function getAttributeName(): string {
+    public function getNameForAttributes(): string {
         return strtolower($this->name->toString());
     }
 
@@ -1031,7 +1031,7 @@ public function getMethodSynopsisFilename(): string {
         return $this->getDeclarationClassName() . "_{$this->methodName}";
     }
 
-    public function getAttributeName(): string {
+    public function getNameForAttributes(): string {
         return strtolower($this->methodName);
     }
 
@@ -3766,7 +3766,7 @@ static function (FuncInfo $funcInfo) use (&$classEntriesWithSensitiveParams) {
                     $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->getNameForAttributes() . "\", $index);\n";
             }
 
             return $code;
@@ -4178,7 +4178,7 @@ function initPhpParser() {
         installPhpParser($version, $phpParserDir);
     }
 
-    spl_autoload_register(function(string $class) use ($phpParserDir) {
+    spl_autoload_register(static function(string $class) use ($phpParserDir) {
         if (strpos($class, "PhpParser\\") === 0) {
             $fileName = $phpParserDir . "/lib/" . str_replace("\\", "/", $class) . ".php";
             require $fileName;

Original file line number	Diff line number	Diff line change
`@@ -937,7 +937,7 @@ interface FunctionOrMethodName {`
`937`	`937`	`public function getDeclaration(): string;`
`938`	`938`	`public function getArgInfoName(): string;`
`939`	`939`	`public function getMethodSynopsisFilename(): string;`
`940`		`- public function getAttributeName(): string;`
	`940`	`+ public function getNameForAttributes(): string;`
`941`	`941`	`public function __toString(): string;`
`942`	`942`	`public function isMethod(): bool;`
`943`	`943`	`public function isConstructor(): bool;`
`@@ -983,7 +983,7 @@ public function getMethodSynopsisFilename(): string {`
`983`	`983`	`return implode('_', $this->name->parts);`
`984`	`984`	`}`
`985`	`985`
`986`		`- public function getAttributeName(): string {`
	`986`	`+ public function getNameForAttributes(): string {`
`987`	`987`	`return strtolower($this->name->toString());`
`988`	`988`	`}`
`989`	`989`
`@@ -1031,7 +1031,7 @@ public function getMethodSynopsisFilename(): string {`
`1031`	`1031`	`return $this->getDeclarationClassName() . "_{$this->methodName}";`
`1032`	`1032`	`}`
`1033`	`1033`
`1034`		`- public function getAttributeName(): string {`
	`1034`	`+ public function getNameForAttributes(): string {`
`1035`	`1035`	`return strtolower($this->methodName);`
`1036`	`1036`	`}`
`1037`	`1037`
`@@ -3766,7 +3766,7 @@ static function (FuncInfo $funcInfo) use (&$classEntriesWithSensitiveParams) {`
`3766`	`3766`	`$functionTable = "CG(function_table)";`
`3767`	`3767`	`}`
`3768`	`3768`
`3769`		`- $code .= " zend_mark_function_parameter_as_sensitive($functionTable, \"" . $funcInfo->name->getAttributeName() . "\", $index);\n";`
	`3769`	`+ $code .= " zend_mark_function_parameter_as_sensitive($functionTable, \"" . $funcInfo->name->getNameForAttributes() . "\", $index);\n";`
`3770`	`3770`	`}`
`3771`	`3771`
`3772`	`3772`	`return $code;`
`@@ -4178,7 +4178,7 @@ function initPhpParser() {`
`4178`	`4178`	`installPhpParser($version, $phpParserDir);`
`4179`	`4179`	`}`
`4180`	`4180`
`4181`		`- spl_autoload_register(function(string $class) use ($phpParserDir) {`
	`4181`	`+ spl_autoload_register(static function(string $class) use ($phpParserDir) {`
`4182`	`4182`	`if (strpos($class, "PhpParser\\") === 0) {`
`4183`	`4183`	`$fileName = $phpParserDir . "/lib/" . str_replace("\\", "/", $class) . ".php";`
`4184`	`4184`	`require $fileName;`