gen_stub: Improve output for ce_flags compatibility

Author: TimWolla

build/gen_stub.php

@@ -3282,26 +3282,13 @@ public function getRegistration(array $allConstInfos): string
 
         $code .= "{\n";
 
-        $flagCodes = generateVersionDependentFlagCode("%s", $this->getFlagsByPhpVersion(), $this->phpVersionIdMinimumCompatibility);
-        if (count($flagCodes) > 1) {
-            // If we have more than one entry, there will be preprocessor conditions,
-            // thus we need to start with a newline.
-            $flags = "\n" . implode("\n", $flagCodes);
-        } else if (count($flagCodes) === 1) {
-            $flags = " " . $flagCodes[0];
-        } else {
-            $flags = "";
-        }
-
         $classMethods = ($this->funcInfos === []) ? 'NULL' : "class_{$escapedName}_methods";
         if ($this->type === "enum") {
             $name = addslashes((string) $this->name);
             $backingType = $this->enumBackingType
                 ? $this->enumBackingType->toTypeCode() : "IS_UNDEF";
             $code .= "\tzend_class_entry *class_entry = zend_register_internal_enum(\"$name\", $backingType, $classMethods);\n";
-            if ($flags !== "") {
-                $code .= "\tclass_entry->ce_flags |=$flags\n";
-            }
+            $code .= implode("", generateVersionDependentFlagCode("\tclass_entry->ce_flags = %s;\n", $this->getFlagsByPhpVersion(), $this->phpVersionIdMinimumCompatibility));
         } else {
             $code .= "\tzend_class_entry ce, *class_entry;\n\n";
             if (count($this->name->getParts()) > 1) {
@@ -3318,22 +3305,25 @@ public function getRegistration(array $allConstInfos): string
                     $code .= "#if (PHP_VERSION_ID >= " . PHP_84_VERSION_ID . ")\n";
                 }
 
-                $code .= "\tclass_entry = zend_register_internal_class_with_flags(&ce, " . (isset($this->extends[0]) ? "class_entry_" . str_replace("\\", "_", $this->extends[0]->toString()) : "NULL") . "," . ($flags ?: " 0") . ");\n";
+                $template = "\tclass_entry = zend_register_internal_class_with_flags(&ce, " . (isset($this->extends[0]) ? "class_entry_" . str_replace("\\", "_", $this->extends[0]->toString()) : "NULL") . ", %s);\n";
+                $entries = generateVersionDependentFlagCode($template, $this->getFlagsByPhpVersion(), $this->phpVersionIdMinimumCompatibility ? max($this->phpVersionIdMinimumCompatibility, PHP_84_VERSION_ID) : null);
+                if ($entries !== []) {
+                    $code .= implode("", $entries);
+                } else {
+                    $code .= sprintf($template, "0");
+                }
 
                 if (!$php84MinimumCompatibility) {
                     $code .= "#else\n";
 
                     $code .= "\tclass_entry = zend_register_internal_class_ex(&ce, " . (isset($this->extends[0]) ? "class_entry_" . str_replace("\\", "_", $this->extends[0]->toString()) : "NULL") . ");\n";
-                    if ($flags !== "") {
-                        $code .= "\tclass_entry->ce_flags |=$flags;\n";
-                    }
+                    $code .= implode("", generateVersionDependentFlagCode("\tclass_entry->ce_flags |= %s;\n", $this->getFlagsByPhpVersion(), $this->phpVersionIdMinimumCompatibility));
                     $code .= "#endif\n";
                 }
             } else {
                 $code .= "\tclass_entry = zend_register_internal_interface(&ce);\n";
-                if ($flags !== "") {
-                    $code .= "\tclass_entry->ce_flags |=$flags\n";
-                }
+                $code .= implode("", generateVersionDependentFlagCode("\tclass_entry->ce_flags |= %s;\n", $this->getFlagsByPhpVersion(), $this->phpVersionIdMinimumCompatibility));
+
             }
         }
 
@@ -5399,16 +5389,12 @@ static function (array $value): bool {
         $code = "";
 
         $if = $i === 0 ? "#if" : "#elif";
+        $endif = $i === $flagCount - 1 ? "#endif\n" : "";
 
         $code .= "$if (PHP_VERSION_ID >= $version)\n";
 
         $code .= sprintf($codeTemplate, implode("|", $versionFlags));
-        if ($i === $flagCount - 1) {
-            if (!str_ends_with($code, "\n")) {
-                $code .= "\n";
-            }
-            $code .= "#endif\n";
-        }
+        $code .= $endif;
 
         $result[] = $code;
         $i++;