Simplify object notation for single-filter usage (#27)

Author: wol-soft

src/PropertyProcessor/Filter/FilterProcessor.php

@@ -43,7 +43,7 @@ public function process(
         GeneratorConfiguration $generatorConfiguration,
         Schema $schema
     ): void {
-        if (is_string($filterList)) {
+        if (is_string($filterList) || (is_array($filterList) && isset($filterList['filter']))) {
             $filterList = [$filterList];
         }
 

tests/Basic/FilterTest.php

@@ -465,14 +465,15 @@ public function testFilterExceptionsAreCaught(): void
     }
 
     /**
-     * @dataProvider namespaceDataProvider
+     * @dataProvider additionalFilterOptionsDataProvider
      *
      * @param string $namespace
+     * @param string $schemaFile
      */
-    public function testAdditionalFilterOptions(string $namespace): void
+    public function testAdditionalFilterOptions(string $namespace, string $schemaFile): void
     {
         $className = $this->generateClassFromFile(
-            'FilterOptions.json',
+            $schemaFile,
             (new GeneratorConfiguration())->setSerialization(true)->setNamespacePrefix($namespace)
         );
 
@@ -486,6 +487,17 @@ public function testAdditionalFilterOptions(string $namespace): void
         $this->assertSame(json_encode($expectedSerialization), $object->toJSON());
     }
 
+    public function additionalFilterOptionsDataProvider(): array
+    {
+        return $this->combineDataProvider(
+            $this->namespaceDataProvider(),
+            [
+                'Chain notation' => ['FilterOptionsChainNotation.json'],
+                'Single filter notation' => ['FilterOptions.json'],
+            ]
+        );
+    }
+
     public function testTransformingFilterAppliedToAnArrayPropertyThrowsAnException(): void
     {
         $this->expectException(SchemaException::class);

tests/Schema/FilterTest/FilterOptions.json

@@ -3,13 +3,11 @@
   "properties": {
     "created": {
       "type": "string",
-      "filter": [
-        {
-          "filter": "dateTime",
-          "createFromFormat": "!dmY",
-          "outputFormat": "Ymd"
-        }
-      ]
+      "filter": {
+        "filter": "dateTime",
+        "createFromFormat": "!dmY",
+        "outputFormat": "Ymd"
+      }
     }
   }
 }

tests/Schema/FilterTest/FilterOptionsChainNotation.json

@@ -0,0 +1,15 @@
+{
+  "type": "object",
+  "properties": {
+    "created": {
+      "type": "string",
+      "filter": [
+        {
+          "filter": "dateTime",
+          "createFromFormat": "!dmY",
+          "outputFormat": "Ymd"
+        }
+      ]
+    }
+  }
+}