Merge pull request #3 from onliner/update-to-3x

Support new processing options for ImgProxy 3

Author: mohorev

.github/workflows/test.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        php: ['7.2', '7.3', '7.4', '8.0']
+        php: ['8.0', '8.1', '8.2']
     name: PHP ${{ matrix.php }} Test on ${{ matrix.os }}
     steps:
       - name: Checkout

composer.json

@@ -5,7 +5,7 @@
     "keywords": ["imgproxy", "imageproxy", "image", "resize"],
     "license": "MIT",
     "require": {
-        "php": "^7.2 || ^8.0"
+        "php": "^8.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^8.5.8|^9.3.3",

src/Options/AbstractOption.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Onliner\ImgProxy\Options;
+
+abstract class AbstractOption
+{
+    /**
+     * @return string
+     */
+    abstract public function name(): string;
+
+    /**
+     * @return array<mixed>
+     */
+    abstract public function data(): array;
+
+    /**
+     * @return string
+     */
+    public function value(): string
+    {
+        $data = $this->data();
+
+        array_unshift($data, $this->name());
+
+        // Remove empty options from end.
+        return rtrim(implode(':', $data), ':');
+    }
+
+    /**
+     * @return string
+     */
+    public function __toString(): string
+    {
+        return $this->value();
+    }
+}

src/Options/AutoRotate.php

@@ -4,12 +4,9 @@
 
 namespace Onliner\ImgProxy\Options;
 
-final class AutoRotate extends Option
+final class AutoRotate extends AbstractOption
 {
-    /**
-     * @var bool
-     */
-    private $rotate;
+    private bool $rotate;
 
     public function __construct(bool $rotate = true)
     {

src/Options/Background.php

@@ -6,12 +6,9 @@
 
 use Onliner\ImgProxy\Support\Color;
 
-final class Background extends Option
+final class Background extends AbstractOption
 {
-    /**
-     * @var Color
-     */
-    private $color;
+    private Color $color;
 
     public function __construct(string $color)
     {

src/Options/Blur.php

@@ -6,12 +6,9 @@
 
 use InvalidArgumentException;
 
-final class Blur extends Option
+final class Blur extends AbstractOption
 {
-    /**
-     * @var float
-     */
-    private $sigma;
+    private float $sigma;
 
     public function __construct(float $sigma)
     {

src/Options/CacheBuster.php

@@ -6,12 +6,9 @@
 
 use InvalidArgumentException;
 
-final class CacheBuster extends Option
+final class CacheBuster extends AbstractOption
 {
-    /**
-     * @var string
-     */
-    private $value;
+    private string $value;
 
     public function __construct(string $value)
     {

src/Options/Crop.php

@@ -4,22 +4,13 @@
 
 namespace Onliner\ImgProxy\Options;
 
-final class Crop extends Option
+final class Crop extends AbstractOption
 {
-    /**
-     * @var Width
-     */
-    private $width;
-    /**
-     * @var Height
-     */
-    private $height;
-    /**
-     * @var Gravity|null
-     */
-    private $gravity;
+    private Width $width;
+    private Height $height;
+    private ?Gravity $gravity = null;
 
-    public function __construct(int $width, int $height, string $gravity = null)
+    public function __construct(int $width, int $height, ?string $gravity = null)
     {
         $this->width = new Width($width);
         $this->height = new Height($height);

src/Options/Dpr.php

@@ -6,12 +6,9 @@
 
 use InvalidArgumentException;
 
-final class Dpr extends Option
+final class Dpr extends AbstractOption
 {
-    /**
-     * @var int
-     */
-    private $dpr;
+    private int $dpr;
 
     public function __construct(int $dpr)
     {

src/Options/EnforceThumbnail.php

@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Onliner\ImgProxy\Options;
+
+final class EnforceThumbnail extends AbstractOption
+{
+    private ?string $format;
+
+    public function __construct(?string $format = null)
+    {
+        $this->format = $format;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function name(): string
+    {
+        return 'eth';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function data(): array
+    {
+        return [
+            $this->format ?: true,
+        ];
+    }
+}