Generated arginfo headers: combine preprocessor conditional blocks (2)

build/gen_stub.php

@@ -2742,23 +2742,15 @@ public function getDeclaration(array $allConstInfos): string
             throw new Exception("Constant " . $this->name->__toString() . " must have a @cvalue annotation");
         }
 
-        $code = "";
-
-        if ($this->cond) {
-            $code .= "#if {$this->cond}\n";
-        }
+        // Condition will be added by generateCodeWithConditions()
 
         if ($this->name->isClassConst()) {
-            $code .= $this->getClassConstDeclaration($value, $allConstInfos);
+            $code = $this->getClassConstDeclaration($value, $allConstInfos);
         } else {
-            $code .= $this->getGlobalConstDeclaration($value);
+            $code = $this->getGlobalConstDeclaration($value);
         }
         $code .= $this->getValueAssertion($value);
 
-        if ($this->cond) {
-            $code .= "#endif\n";
-        }
-
         return $code;
     }
 
@@ -3553,9 +3545,11 @@ function (Name $item) {
             $code .= "\tzend_register_class_alias(\"" . str_replace("\\", "\\\\", $this->alias) . "\", class_entry);\n";
         }
 
-        foreach ($this->constInfos as $const) {
-            $code .= $const->getDeclaration($allConstInfos);
-        }
+        $code .= generateCodeWithConditions(
+            $this->constInfos,
+            '',
+            static fn ( $const ) => $const->getDeclaration($allConstInfos)
+        );
 
         foreach ($this->enumCaseInfos as $enumCase) {
             $code .= $enumCase->getDeclaration($allConstInfos);
@@ -5187,9 +5181,11 @@ static function (FuncInfo $funcInfo) use ($fileInfo, &$generatedFunctionDeclarat
             $code .= "\nstatic void register_{$stubFilenameWithoutExtension}_symbols(int module_number)\n";
             $code .= "{\n";
 
-            foreach ($fileInfo->constInfos as $constInfo) {
-                $code .= $constInfo->getDeclaration($allConstInfos);
-            }
+            $code .= generateCodeWithConditions(
+                $fileInfo->constInfos,
+                '',
+                static fn ( $constInfo ) => $constInfo->getDeclaration($allConstInfos)
+            );
 
             if ($attributeInitializationCode !== "" && $fileInfo->constInfos) {
                 $code .= "\n";