Merge pull request #32 from rollun-com/iliya

fix bug enum. allow type array value

Author: misha-rollun

docker-compose.yml

@@ -28,7 +28,7 @@ services:
     volumes:
       - ./:/var/www/app
 
-  rollun-openapi-logstash:
-    image: docker.elastic.co/logstash/logstash:7.7.0
-    volumes:
-      - ./docker/logstash/config/:/usr/share/logstash/config/
+#  rollun-openapi-logstash:
+#    image: docker.elastic.co/logstash/logstash:7.7.0
+#    volumes:
+#      - ./docker/logstash/config/:/usr/share/logstash/config/

src/OpenAPI/Server/Validator/Enum.php

@@ -68,11 +68,29 @@ protected function castToType($item)
     }
 
     public function isValid($value): bool
+    {
+        if (is_array($value)) {
+            return $this->validateArray($value);
+        }
+
+        return $this->isInArray($value);
+    }
+
+    protected function isInArray($value): bool
     {
         if (!$result = in_array($value, $this->allowed, true)) {
             $this->error(self::INVALID, $value);
         }
-
         return $result;
     }
+
+    protected function validateArray(array $value): bool
+    {
+        foreach ($value as $item) {
+            if (!$this->isInArray($item)) {
+                return false;
+            }
+        }
+        return true;
+    }
 }

test/unit/Server/Validator/EnumTest.php

@@ -22,7 +22,7 @@ public function testStringBoolNotValid(): void
         // false converts to empty string since we use implode
         self::assertEquals([
             Enum::INVALID => "The value 'false' not in enum list."
-        ],$messages);
+        ], $messages);
     }
 
     public function testStringCastsToInt()
@@ -46,7 +46,7 @@ public function testStringWithQuotes()
         self::assertNotEmpty($messages = $validator->getMessages());
         self::assertEquals([
             Enum::INVALID => "The value 'another' not in enum list."
-        ],$messages);
+        ], $messages);
     }
 
     public function testString()
@@ -59,6 +59,78 @@ public function testString()
         self::assertNotEmpty($messages = $validator->getMessages());
         self::assertEquals([
             Enum::INVALID => "The value 'another' not in enum list."
-        ],$messages);
+        ], $messages);
     }
-}
+
+    public function testArrayInt()
+    {
+        $validator = new Enum(['allowed' => [
+            "random",
+            "anotherRandom",
+        ]]);
+
+        self::assertFalse($validator->isValid([1]));
+        self::assertNotEmpty($messages = $validator->getMessages());
+        self::assertEquals([
+            Enum::INVALID => "The value '1' not in enum list."
+        ], $messages);
+    }
+
+    public function testArrayEmpty()
+    {
+        $validator = new Enum(['allowed' => [
+            "random",
+            "anotherRandom",
+        ]]);
+
+        self::assertTrue($validator->isValid([]));
+        self::assertEmpty($validator->getMessages());
+    }
+
+    public function testValidArrayOneItem()
+    {
+        $validator = new Enum(['allowed' => [
+            "random",
+            "anotherRandom",
+        ]]);
+        self::assertTrue($validator->isValid(["random"]));
+        self::assertEmpty($validator->getMessages());
+    }
+
+    public function testValidArraySeveralItems()
+    {
+        $validator = new Enum(['allowed' => [
+            "random",
+            "anotherRandom",
+            "anotherRandomWord",
+        ]]);
+        self::assertTrue($validator->isValid(["random", "anotherRandom"]));
+        self::assertEmpty($validator->getMessages());
+    }
+
+    public function testInvalidArrayOneItem()
+    {
+        $validator = new Enum(['allowed' => [
+            "random",
+            "anotherRandom",
+        ]]);
+        self::assertFalse($validator->isValid(["anotherRandomWord"]));
+        self::assertNotEmpty($messages = $validator->getMessages());
+        self::assertEquals([
+            Enum::INVALID => "The value 'anotherRandomWord' not in enum list."
+        ], $messages);
+    }
+
+    public function testInvalidArraySeveralItems()
+    {
+        $validator = new Enum(['allowed' => [
+            "random",
+            "anotherRandom",
+        ]]);
+        self::assertFalse($validator->isValid(["anotherRandomWord", "sameRandomWord"]));
+        self::assertNotEmpty($messages = $validator->getMessages());
+        self::assertEquals([
+            Enum::INVALID => "The value 'anotherRandomWord' not in enum list."
+        ], $messages);
+    }
+}