fixes in export

klkvsk · Feb 24, 2023 · e5eb59f · e5eb59f
1 parent ddae3c4
commit e5eb59f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/Generator/Builder/Class/ExportMethodsBuilder.php b/src/Generator/Builder/Class/ExportMethodsBuilder.php
@@ -48,9 +48,10 @@ public function build(Dto $object, PhpNamespace $ns, ClassType $class): void
             $class->addImplement('\\JsonSerializable');
             $jsonSerializeMethod = $class->addMethod('jsonSerialize')
                 ->setPublic()
+                ->setReturnType('array')
                 ->addBody('$array = [];')
                 ->addBody('foreach (get_mangled_object_vars($this) as $var => $value) {')
-                ->addBody('    $var = preg_replace("/.+\0/", "", $var);');
+                ->addBody('    $var = substr($var, strrpos($var, "\\0") ?: 0);');
 
             if ($this->dateFormat) {
                 $jsonSerializeMethod
@@ -65,8 +66,7 @@ public function build(Dto $object, PhpNamespace $ns, ClassType $class): void
                 ->addBody('    }')
                 ->addBody('    $array[$var] = $value;')
                 ->addBody('}')
-                ->addBody('return $array;')
-                ->addAttribute('ReturnTypeWillChange');
+                ->addBody('return $array;');
         }
     }
 }

diff --git a/src/Generator/Builder/EnumLegacyBuilder.php b/src/Generator/Builder/EnumLegacyBuilder.php
@@ -89,7 +89,11 @@ public function build(Enum $enum, PhpNamespace $ns): EnumType|ClassType
 
         $class->addImplement('\\JsonSerializable');
         $class->addMethod('jsonSerialize')
-            ->addAttribute('ReturnTypeWillChange')
+            ->setReturnType('array')
+            ->addBody('return $this->value;');
+
+        $class->addMethod('__toString')
+            ->setPublic()
             ->addBody('return $this->value;');
 
         return $class;