Fix conflicts

Author: kocsismate

build/gen_stub.php

@@ -1399,8 +1399,8 @@ function initializeZval(string $zvalName, $value): string
             if ($value === "") {
                 $code .= "\tZVAL_EMPTY_STRING(&$zvalName);\n";
             } else {
-                $strValue = addslashes($value);
-                $code .= "\tzend_string *{$zvalName}_str = zend_string_init(\"$strValue\", sizeof(\"$strValue\") - 1, 1);\n";
+                $value = addslashes($value);
+                $code .= "\tzend_string *{$zvalName}_str = zend_string_init(\"$value\", sizeof(\"$value\") - 1, 1);\n";
                 $code .= "\tZVAL_STR(&$zvalName, {$zvalName}_str);\n";
             }
             break;
@@ -1435,66 +1435,6 @@ abstract protected function getFieldsynopsisLinkend(): string;
 
     abstract protected function getFieldsynopsisValueString(): ?string;
 
-    /**
-     * @param mixed $value
-     */
-    protected function initializeValue(string $type, $value, bool $isTyped): string
-    {
-        $name = $this->getVariableLikeName();
-        $zvalName = $this->getVariableTypeCode() . "_{$name}_value";
-
-        $code = "\tzval $zvalName;\n";
-
-        switch ($type) {
-            case "undefined":
-                if ($isTyped) {
-                    $code .= "\tZVAL_UNDEF(&$zvalName);\n";
-                } else {
-                    $code .= "\tZVAL_NULL(&$zvalName);\n";
-                }
-                break;
-
-            case "NULL":
-                $code .= "\tZVAL_NULL(&$zvalName);\n";
-                break;
-
-            case "boolean":
-                $code .= "\tZVAL_BOOL(&$zvalName, " . ((int) $value) . ");\n";
-                break;
-
-            case "integer":
-                $code .= "\tZVAL_LONG(&$zvalName, $value);\n";
-                break;
-
-            case "double":
-                $code .= "\tZVAL_DOUBLE(&$zvalName, $value);\n";
-                break;
-
-            case "string":
-                if ($value === "") {
-                    $code .= "\tZVAL_EMPTY_STRING(&$zvalName);\n";
-                } else {
-                    $value = addslashes($value);
-                    $code .= "\tzend_string *{$zvalName}_str = zend_string_init(\"$value\", sizeof(\"$value\") - 1, 1);\n";
-                    $code .= "\tZVAL_STR(&$zvalName, {$zvalName}_str);\n";
-                }
-                break;
-
-            case "array":
-                if (empty($value)) {
-                    $code .= "\tZVAL_EMPTY_ARRAY(&$zvalName);\n";
-                } else {
-                    throw new Exception("Unimplemented " . $this->getVariableTypeName() .  " value");
-                }
-                break;
-
-            default:
-                throw new Exception("Invalid " . $this->getVariableTypeName() .  " value");
-        }
-
-        return $code;
-    }
-
     protected function getFlagsAsString(): string
     {
         $flags = "ZEND_ACC_PUBLIC";
@@ -1620,8 +1560,6 @@ protected function getFieldsynopsisValueString(): ?string
 
     public function getDeclaration(): string
     {
-        $constName = $this->name->const;
-
         $constantValue = false;
         $value = $this->evaluateValue($this->value, $constantValue);
         $valueType = gettype($value);
@@ -1678,16 +1616,16 @@ private function getConstDeclaration(string $code, $value, string $valueType): s
         return $code;
     }
 
-    private function getClassConstDeclaration(string $code, mixed $value, string $valueType): string
+    private function getClassConstDeclaration(string $code, mixed $value): string
     {
-        $constName = $this->name;
+        $constName = $this->getVariableLikeName();
 
-        $code .= "\n" . $this->initializeValue($valueType, $value, false);
+        $code .= "\n" . initializeZval("const_{$constName}_value", $value);
 
         $code .= "\tzend_string *const_{$constName}_name = zend_string_init_interned(\"$constName\", sizeof(\"$constName\") - 1, 1);\n";
         $nameCode = "const_{$constName}_name";
 
-        $code .= "\tzend_declare_class_constant_ex(class_entry, $nameCode, &const_{$constName}_value, " . $this->getFlagsAsString($this->isDeprecated) . ", NULL);\n";
+        $code .= "\tzend_declare_class_constant_ex(class_entry, $nameCode, &const_{$constName}_value, " . $this->getFlagsAsString() . ", NULL);\n";
         $code .= "\tzend_string_release(const_{$constName}_name);\n";
 
         return $code;
@@ -1786,7 +1724,7 @@ public function getDeclaration(): string {
         if ($this->defaultValue === null) {
             $defaultValue = null;
         } else {
-            $defaultValue = $this->evaluateValue($defaultValueConstant);
+            $defaultValue = $this->evaluateValue($this->defaultValue, $defaultValueConstant);
         }
 
         if ($defaultValueConstant) {