Allow providing Gravity object directly (#8)

Author: oprypkhantc

src/Options/Crop.php

@@ -10,14 +10,11 @@ final class Crop extends AbstractOption
     private Height $height;
     private ?Gravity $gravity = null;
 
-    public function __construct(int $width, int $height, ?string $gravity = null)
+    public function __construct(int $width, int $height, Gravity|string|null $gravity = null)
     {
         $this->width = new Width($width);
         $this->height = new Height($height);
-
-        if ($gravity !== null) {
-            $this->gravity = Gravity::fromString($gravity);
-        }
+        $this->gravity = is_string($gravity) ? Gravity::fromString($gravity) : $gravity;
     }
 
     /**

src/Options/Extend.php

@@ -9,13 +9,10 @@ final class Extend extends AbstractOption
     private bool $extend;
     private ?Gravity $gravity = null;
 
-    public function __construct(bool $extend = true, ?string $gravity = null)
+    public function __construct(bool $extend = true, Gravity|string|null $gravity = null)
     {
         $this->extend = $extend;
-
-        if ($gravity !== null) {
-            $this->gravity = Gravity::fromString($gravity);
-        }
+        $this->gravity = is_string($gravity) ? Gravity::fromString($gravity) : $gravity;
     }
 
     /**

tests/Options/CropTest.php

@@ -4,14 +4,15 @@
 
 namespace Onliner\ImgProxy\Options;
 
+use Onliner\ImgProxy\Support\GravityType;
 use PHPUnit\Framework\TestCase;
 
 class CropTest extends TestCase
 {
     /**
      * @dataProvider validData
      */
-    public function testCreate(int $width, int $height, ?string $gravity, string $expected): void
+    public function testCreate(int $width, int $height, Gravity|string|null $gravity, string $expected): void
     {
         $opt = new Crop($width, $height, $gravity);
         $this->assertSame($expected, (string) $opt);
@@ -61,8 +62,10 @@ public function validData(): array
             [100, 200, null, 'c:100:200'],
             [100, 0, 'ce', 'c:100:0:ce'],
             [100, 200, 'ce', 'c:100:200:ce'],
+            [100, 200, new Gravity(GravityType::CENTER), 'c:100:200:ce'],
             [100, 200, 'ce:0:0', 'c:100:200:ce:0:0'],
             [100, 200, 'ce:200:250', 'c:100:200:ce:200:250'],
+            [100, 200, new Gravity(GravityType::CENTER, 200, 250), 'c:100:200:ce:200:250'],
         ];
     }
 

tests/Options/ExtendTest.php

@@ -4,14 +4,15 @@
 
 namespace Onliner\ImgProxy\Options;
 
+use Onliner\ImgProxy\Support\GravityType;
 use PHPUnit\Framework\TestCase;
 
 class ExtendTest extends TestCase
 {
     /**
      * @dataProvider exampleData
      */
-    public function testCreate(bool $extend, ?string $gravity, string $expected): void
+    public function testCreate(bool $extend, Gravity|string|null $gravity, string $expected): void
     {
         $opt = new Extend($extend, $gravity);
 
@@ -45,8 +46,10 @@ public function exampleData(): array
             [true, null, 'ex:1'],
             [false, null, 'ex:0'],
             [true, 'ce', 'ex:1:ce'],
+            [true, new Gravity(GravityType::CENTER), 'ex:1:ce'],
             [false, 'ce:0:0', 'ex:0:ce:0:0'],
             [false, 'ce:200:250', 'ex:0:ce:200:250'],
+            [false, new Gravity(GravityType::CENTER, 200, 250), 'ex:0:ce:200:250'],
         ];
     }