better entity multiple transformer validation (#205)

troytft · Apr 8, 2022 · 8024b5f · 8024b5f
1 parent df732f6
commit 8024b5f
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -14,7 +14,10 @@
         }
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     },
     "require": {
         "php": ">=8.0",

diff --git a/src/Services/Mapper/Transformer/DoctrineEntityTransformer.php b/src/Services/Mapper/Transformer/DoctrineEntityTransformer.php
@@ -53,13 +53,18 @@ private function transformSingleItem(string $class, string $fieldName, mixed $va
 
     private function transformMultipleItems(string $class, string $fieldName, mixed $value): array
     {
-        $firstCollectionItem = $value[0] ?? null;
-        if ($firstCollectionItem === null) {
+        $columnType = RestApiBundle\Helper\DoctrineHelper::extractColumnType($class, $fieldName);
+        if ($columnType === PropertyInfo\Type::BUILTIN_TYPE_INT && !is_array($value)) {
+            throw new RestApiBundle\Exception\Mapper\Transformer\CollectionOfIntegersRequiredException();
+        } elseif ($columnType === PropertyInfo\Type::BUILTIN_TYPE_STRING && !is_array($value)) {
+            throw new RestApiBundle\Exception\Mapper\Transformer\CollectionOfStringsRequiredException();
+        }
+
+        if (!count($value)) {
             return [];
         }
-
-        $columnType = RestApiBundle\Helper\DoctrineHelper::extractColumnType($class, $fieldName);
 
+        $firstCollectionItem = $value[0] ?? null;
         if ($columnType === PropertyInfo\Type::BUILTIN_TYPE_INT && !is_numeric($firstCollectionItem)) {
             throw new RestApiBundle\Exception\Mapper\Transformer\CollectionOfIntegersRequiredException();
         } elseif ($columnType === PropertyInfo\Type::BUILTIN_TYPE_STRING && (!is_string($firstCollectionItem) && !is_numeric($firstCollectionItem))) {

diff --git a/tests/cases/Mapper/EntityTransformerMultipleTest.php b/tests/cases/Mapper/EntityTransformerMultipleTest.php
@@ -28,18 +28,45 @@ public function testSuccessFetch()
         $this->assertSame(2, $model->bySlug[1]->getId());
     }
 
-    public function testInvalid()
+    public function testInvalidCollection()
     {
         $model = new Tests\Fixture\Mapper\EntityTransformerMultipleTest\Model();
 
         try {
             $this->getMapper()->map($model, [
-                'byId' => 'undefined'
+                'byId' => 13,
             ]);
             $this->fail();
         } catch (RestApiBundle\Exception\Mapper\MappingException $exception) {
             $this->assertSame(['byId' => ['This value should be a collection of integers.']], $exception->getProperties());
         }
+
+        try {
+            $this->getMapper()->map($model, [
+                'byId' => [null,],
+            ]);
+            $this->fail();
+        } catch (RestApiBundle\Exception\Mapper\MappingException $exception) {
+            $this->assertSame(['byId' => ['This value should be a collection of integers.']], $exception->getProperties());
+        }
+
+        try {
+            $this->getMapper()->map($model, [
+                'bySlug' => 'keto-cookbook-beginners-low-carb-homemade',
+            ]);
+            $this->fail();
+        } catch (RestApiBundle\Exception\Mapper\MappingException $exception) {
+            $this->assertSame(['bySlug' => ['This value should be a collection of strings.']], $exception->getProperties());
+        }
+
+        try {
+            $this->getMapper()->map($model, [
+                'bySlug' => [null,],
+            ]);
+            $this->fail();
+        } catch (RestApiBundle\Exception\Mapper\MappingException $exception) {
+            $this->assertSame(['bySlug' => ['This value should be a collection of strings.']], $exception->getProperties());
+        }
     }
 
     public function testOrder()