PHP compatibility to avoid parse errors in supported versions

wol-soft · Oct 6, 2023 · 9884141 · 9884141
1 parent ba50f98
commit 9884141
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/src/SchemaProcessor/PostProcessor/EnumPostProcessor.php b/src/SchemaProcessor/PostProcessor/EnumPostProcessor.php
@@ -138,15 +138,20 @@ public function postProcess(): void
         parent::postProcess();
     }
 
+    /**
+     * @throws SchemaException
+     */
     private function validateEnum(PropertyInterface $property): bool
     {
-        $throw = fn (string $message) => throw new SchemaException(
-            sprintf(
-                $message,
-                $property->getName(),
-                $property->getJsonSchema()->getFile()
-            )
-        );
+        $throw = function (string $message) use ($property): void {
+            throw new SchemaException(
+                sprintf(
+                    $message,
+                    $property->getName(),
+                    $property->getJsonSchema()->getFile()
+                )
+            );
+        };
 
         $json = $property->getJsonSchema()->getJson();
 
@@ -168,7 +173,7 @@ private function validateEnum(PropertyInterface $property): bool
                     || count(array_uintersect(
                             $json['enum-map'],
                             $json['enum'],
-                            fn($a, $b) => $a === $b ? 0 : 1
+                            function ($a, $b): int { return $a === $b ? 0 : 1; }
                         )) !== count($json['enum'])
             )
         ) {
@@ -200,6 +205,12 @@ private function renderEnum(
             $cases[ucfirst($map ? array_search($value, $map) : $value)] = var_export($value, true);
         }
 
+        $backedType = null;
+        switch ($this->getArrayTypes($values)) {
+            case ['string']: $backedType = 'string'; break;
+            case ['integer']: $backedType = 'int'; break;
+        }
+
         file_put_contents(
             $this->targetDirectory . DIRECTORY_SEPARATOR . $name . '.php',
             $this->renderer->renderTemplate(
@@ -208,11 +219,7 @@ private function renderEnum(
                     'namespace' => $this->namespace,
                     'name' => $name,
                     'cases' => $cases,
-                    'backedType' => match ($this->getArrayTypes($values)) {
-                        ['string'] => 'string',
-                        ['integer'] => 'int',
-                        default => null,
-                    },
+                    'backedType' => $backedType,
                 ]
             )
         );

diff --git a/tests/PostProcessor/EnumPostProcessorTest.php b/tests/PostProcessor/EnumPostProcessorTest.php
@@ -14,6 +14,7 @@
 use PHPModelGenerator\Tests\AbstractPHPModelGeneratorTest;
 use ReflectionEnum;
 
+// TODO: mixed enums, multiple enums, enum redirect
 class EnumPostProcessorTest extends AbstractPHPModelGeneratorTest
 {
     /**