Merge pull request #114 from netglue/113-fix-null-image-dimensions

Fix Image Constraints
netglue · Jun 28, 2022 · 5a22c7a · 5a22c7a
2 parents da53dd0 + 594db8d
commit 5a22c7a
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 4 deletions.
diff --git a/src/TypeBuilder.php b/src/TypeBuilder.php
@@ -291,10 +291,10 @@ public static function img(string $label, ?string $placeholder = null, ?int $x =
             'config' => array_filter([
                 'label' => $label,
                 'placeholder' => $placeholder,
-                'constraint' => array_filter([
+                'constraint' => [
                     'width' => $x,
                     'height' => $y,
-                ]),
+                ],
                 'thumbnails' => $views,
             ]),
         ];
@@ -303,11 +303,11 @@ public static function img(string $label, ?string $placeholder = null, ?int $x =
     /** @return array<string, mixed> */
     public static function imgView(string $name, ?int $x = null, ?int $y = null): array
     {
-        return array_filter([
+        return [
             'name' => $name,
             'width' => $x,
             'height' => $y,
-        ]);
+        ];
     }
 
     /** @param array<array-key, string> $types */

diff --git a/test/Unit/TypeBuilderTest.php b/test/Unit/TypeBuilderTest.php
@@ -71,4 +71,31 @@ public function testImageConstraintIsAbsentInRichTextWhenNeitherXNorYAreProvided
         self::assertIsArray($config);
         self::assertArrayNotHasKey('imageConstraint', $config);
     }
+
+    public function testImageSpecDeclaresNullOnConstraintsWhenGivenNull(): void
+    {
+        $data = T::img('Foo', null, 100, null, []);
+        $expect = [
+            'type' => 'Image',
+            'config' => [
+                'label' => 'Foo',
+                'constraint' => [
+                    'width' => 100,
+                    'height' => null,
+                ],
+            ],
+        ];
+        self::assertEquals($expect, $data);
+    }
+
+    public function testThatImageViewsContainNullConstraintsWhenNullIsGiven(): void
+    {
+        $data = T::imgView('Foo', null, 100);
+        $expect = [
+            'name' => 'Foo',
+            'width' => null,
+            'height' => 100,
+        ];
+        self::assertEquals($expect, $data);
+    }
 }