bugfixes

klkvsk · Feb 22, 2023 · 6a0ead3 · 6a0ead3
1 parent e26d0d8
commit 6a0ead3
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 14 deletions.
diff --git a/example/php7.4/Author.php b/example/php7.4/Author.php
@@ -72,7 +72,7 @@ protected static function processors(string $key): \Generator
     public static function create(array $data): self
     {
         // check required
-        if ($diff = array_diff(array_keys($data), static::required())) {
+        if ($diff = array_diff(static::required(), array_keys($data))) {
             throw new \InvalidArgumentException("missing keys: " . implode(", ", $diff));
         }
 

diff --git a/example/php7.4/Book.php b/example/php7.4/Book.php
@@ -121,7 +121,7 @@ public static function create(array $data): self
         $data += static::defaults();
 
         // check required
-        if ($diff = array_diff(array_keys($data), static::required())) {
+        if ($diff = array_diff(static::required(), array_keys($data))) {
             throw new \InvalidArgumentException("missing keys: " . implode(", ", $diff));
         }
 

diff --git a/example/php7.4/Genre.php b/example/php7.4/Genre.php
@@ -29,7 +29,7 @@ private function __construct(string $name, $value)
      */
     public static function cases(): array
     {
-        return self::$map = self::$map ?: [
+        return self::$map = self::$map ?? [
             'romance' => new self('ROMANCE', 'romance'),
             'comedy' => new self('COMEDY', 'comedy'),
             'drama' => new self('DRAMA', 'drama'),

diff --git a/example/php7.4/ScienceBook.php b/example/php7.4/ScienceBook.php
@@ -79,7 +79,7 @@ public static function create(array $data): self
         $data += static::defaults();
 
         // check required
-        if ($diff = array_diff(array_keys($data), static::required())) {
+        if ($diff = array_diff(static::required(), array_keys($data))) {
             throw new \InvalidArgumentException("missing keys: " . implode(", ", $diff));
         }
 

diff --git a/example/php8.0/Author.php b/example/php8.0/Author.php
@@ -68,7 +68,7 @@ protected static function processors(string $key): \Generator
     public static function create(array $data): self
     {
         // check required
-        if ($diff = array_diff(array_keys($data), static::required())) {
+        if ($diff = array_diff(static::required(), array_keys($data))) {
             throw new \InvalidArgumentException("missing keys: " . implode(", ", $diff));
         }
 

diff --git a/example/php8.0/Book.php b/example/php8.0/Book.php
@@ -109,7 +109,7 @@ public static function create(array $data): self
         $data += static::defaults();
 
         // check required
-        if ($diff = array_diff(array_keys($data), static::required())) {
+        if ($diff = array_diff(static::required(), array_keys($data))) {
             throw new \InvalidArgumentException("missing keys: " . implode(", ", $diff));
         }
 

diff --git a/example/php8.0/ScienceBook.php b/example/php8.0/ScienceBook.php
@@ -79,7 +79,7 @@ public static function create(array $data): self
         $data += static::defaults();
 
         // check required
-        if ($diff = array_diff(array_keys($data), static::required())) {
+        if ($diff = array_diff(static::required(), array_keys($data))) {
             throw new \InvalidArgumentException("missing keys: " . implode(", ", $diff));
         }
 

diff --git a/example/php8.1/Author.php b/example/php8.1/Author.php
@@ -53,7 +53,7 @@ protected static function processors(string $key): \Generator
     public static function create(array $data): self
     {
         // check required
-        if ($diff = array_diff(array_keys($data), static::required())) {
+        if ($diff = array_diff(static::required(), array_keys($data))) {
             throw new \InvalidArgumentException("missing keys: " . implode(", ", $diff));
         }
 

diff --git a/example/php8.1/Book.php b/example/php8.1/Book.php
@@ -76,7 +76,7 @@ public static function create(array $data): self
         $data += static::defaults();
 
         // check required
-        if ($diff = array_diff(array_keys($data), static::required())) {
+        if ($diff = array_diff(static::required(), array_keys($data))) {
             throw new \InvalidArgumentException("missing keys: " . implode(", ", $diff));
         }
 

diff --git a/example/php8.1/ScienceBook.php b/example/php8.1/ScienceBook.php
@@ -71,7 +71,7 @@ public static function create(array $data): self
         $data += static::defaults();
 
         // check required
-        if ($diff = array_diff(array_keys($data), static::required())) {
+        if ($diff = array_diff(static::required(), array_keys($data))) {
             throw new \InvalidArgumentException("missing keys: " . implode(", ", $diff));
         }
 

diff --git a/src/Generator/Builder/Class/CreateMethodBuilder.php b/src/Generator/Builder/Class/CreateMethodBuilder.php
@@ -40,7 +40,7 @@ public function build(Dto $object, PhpNamespace $ns, ClassType $class): void
         if ($class->hasMethod(RequiredMethodBuilder::METHOD_NAME)) {
             $creator
                 ->addBody('// check required')
-                ->addBody('if ($diff = array_diff(array_keys($data), static::?())) {', [RequiredMethodBuilder::METHOD_NAME])
+                ->addBody('if ($diff = array_diff(static::?(), array_keys($data))) {', [RequiredMethodBuilder::METHOD_NAME])
                 ->addBody('    throw new \\InvalidArgumentException("missing keys: " . implode(", ", $diff));')
                 ->addBody('}')
                 ->addBody('');

diff --git a/src/Generator/Builder/EnumLegacyBuilder.php b/src/Generator/Builder/EnumLegacyBuilder.php
@@ -85,9 +85,7 @@ public function build(Enum $enum, PhpNamespace $ns): EnumType|ClassType
             $casesMap[$value] = new Literal('new self(?, ?)', [$case, $value]);
         }
 
-        $casesMethod->addBody('return self::$map = self::$map \?: ?;', [
-            $casesMap,
-        ]);
+        $casesMethod->addBody('return self::$map = self::$map \?\? ?;', [$casesMap]);
 
         $class->addImplement('\\JsonSerializable');
         $class->addMethod('jsonSerialize')