extract filter into production lib

Author: Enno Woortmann

composer.json

@@ -11,7 +11,7 @@
         }
     ],
     "require": {
-        "wol-soft/php-json-schema-model-generator-production": "^0.18.0",
+        "wol-soft/php-json-schema-model-generator-production": "dev-enumPostProcessor",
         "wol-soft/php-micro-template": "^1.3.2",
 
         "php": ">=7.2",

src/SchemaProcessor/PostProcessor/EnumFilter.php

@@ -4,7 +4,7 @@
 
 namespace PHPModelGenerator\SchemaProcessor\PostProcessor;
 
-use BackedEnum;
+use PHPModelGenerator\Filter\Enum;
 use PHPModelGenerator\Filter\TransformingFilterInterface;
 
 class EnumFilter implements TransformingFilterInterface
@@ -21,22 +21,11 @@ public function getToken(): string
 
     public function getFilter(): array
     {
-        return [self::class, 'filter'];
+        return [Enum::class, 'filter'];
     }
 
     public function getSerializer(): array
     {
-        return [self::class, 'serialize'];
-    }
-
-// TODO: move to production lib
-    public static function filter($value, $options): ?BackedEnum
-    {
-        return $value === null ? null : $options['fqcn']::from($value);
-    }
-
-    public static function serialize(?BackedEnum $value): null | int | string
-    {
-        return $value?->value;
+        return [Enum::class, 'serialize'];
     }
 }

src/SchemaProcessor/PostProcessor/EnumPostProcessor.php

@@ -124,7 +124,11 @@ private function checkForExistingTransformingFilter(PropertyInterface $property)
             if ($validator instanceof FilterValidator
                 && $validator->getFilter() instanceof TransformingFilterInterface
             ) {
-                throw new SchemaException("Can't apply enum filter to an already transformed value");
+                throw new SchemaException(sprintf(
+                    "Can't apply enum filter to an already transformed value on property %s in file %s",
+                    $property->getName(),
+                    $property->getJsonSchema()->getFile()
+                ));
             }
         }
     }

tests/PostProcessor/EnumPostProcessorTest.php

@@ -5,6 +5,7 @@
 namespace PHPModelGenerator\Tests\PostProcessor;
 
 use PHPModelGenerator\Exception\Generic\EnumException;
+use PHPModelGenerator\Exception\SchemaException;
 use PHPModelGenerator\Model\GeneratorConfiguration;
 use PHPModelGenerator\ModelGenerator;
 use PHPModelGenerator\SchemaProcessor\PostProcessor\EnumPostProcessor;
@@ -25,7 +26,10 @@ protected function addPostProcessor(): void
     {
         $this->modifyModelGenerator = static function (ModelGenerator $generator): void {
             $generator->addPostProcessor(
-                new EnumPostProcessor(join(DIRECTORY_SEPARATOR, [sys_get_temp_dir(), 'PHPModelGeneratorTest', 'Enum']), 'Enum')
+                new EnumPostProcessor(
+                    join(DIRECTORY_SEPARATOR, [sys_get_temp_dir(), 'PHPModelGeneratorTest', 'Enum']),
+                    'Enum'
+                )
             );
         };
     }
@@ -76,4 +80,13 @@ public function testInvalidStringOnlyEnumValue(): void
 
         new $className(['property' => 'Meier']);
     }
+
+    public function testEnumPropertyWithTransformingFilterThrowsAnException(): void
+    {
+        $this->expectException(SchemaException::class);
+        $this->expectExceptionMessage("Can't apply enum filter to an already transformed value");
+
+        $this->addPostProcessor();
+        $this->generateClassFromFile('EnumPropertyWithTransformingFilter.json');
+    }
 }

tests/Schema/EnumPostProcessorTest/EnumPropertyWithTransformingFilter.json

@@ -0,0 +1,9 @@
+{
+  "type": "object",
+  "properties": {
+    "property": {
+      "enum": ["01.01.2000", "01.01.2010"],
+      "filter": "dateTime"
+    }
+  }
+}