[6.x] Driver based image manipulation with render tag

composer.json

@@ -13,6 +13,7 @@
         "ajthinking/archetype": "^1.0.3 || ^2.0",
         "composer/semver": "^3.4",
         "guzzlehttp/guzzle": "^6.3 || ^7.0",
+        "imgix/imgix-php": "^4.1",
         "james-heinrich/getid3": "^1.9.21",
         "laravel/framework": "^10.40 || ^11.0",
         "laravel/prompts": "^0.1.16",

config/image_manipulation.php

@@ -0,0 +1,18 @@
+<?php
+
+return [
+    'default' => 'glide',
+
+    'manipulators' => [
+        'glide' => [
+            'driver' => 'glide',
+            'cache' => public_path('img'),
+            'url' => 'img',
+        ],
+
+        'imgix' => [
+            'driver' => 'imgix',
+            'domain' => 'example.imgix.net',
+        ],
+    ],
+];

routes/routes.php

@@ -27,6 +27,7 @@
     });
 }
 
+/* @deprecated The new Glide implementation does not use the HTTP API. */
 if (Glide::shouldServeByHttp()) {
     require __DIR__.'/glide.php';
 }

src/Assets/AssetContainer.php

@@ -45,6 +45,7 @@ class AssetContainer implements Arrayable, ArrayAccess, AssetContainerContract,
     protected $sourcePreset;
     protected $warmPresets;
     protected $searchIndex;
+    protected $imageManipulator;
     protected $afterSaveCallbacks = [];
     protected $withEvents = true;
     protected $sortField;
@@ -675,6 +676,14 @@ public function searchIndex($index = null)
             ->args(func_get_args());
     }
 
+    public function imageManipulator($manipulator = null)
+    {
+        return $this
+            ->fluentlyGetOrSet('imageManipulator')
+            ->getter(fn ($manipulator) => Image::driver($manipulator))
+            ->args(func_get_args());
+    }
+
     public static function __callStatic($method, $parameters)
     {
         return Facades\AssetContainer::{$method}(...$parameters);

src/Contracts/Imaging/ImageManipulator.php

@@ -4,6 +4,10 @@
 
 use Statamic\Contracts\Assets\Asset;
 
+/**
+ * @deprecated New image manipulation methods have been introduced.
+ * @see Manipulator
+ */
 interface ImageManipulator
 {
     /**

src/Contracts/Imaging/Manipulator.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace Statamic\Contracts\Imaging;
+
+use Statamic\Imaging\Manipulators\Sources\Source;
+
+interface Manipulator
+{
+    /**
+     * Sets the source image to be manipulated.
+     */
+    public function setSource(Source $source): self;
+
+    /**
+     * Adds manipulations to be performed.
+     */
+    public function addParams(array $params): self;
+
+    /**
+     * Adds the appropriate params that would control focal point cropping.
+     */
+    public function addFocalPointParams(float $x, float $y, float $z): self;
+
+    /**
+     * Gets the manipulations to be performed.
+     */
+    public function getParams(): array;
+
+    /**
+     * Gets the available manipulation parameters.
+     */
+    public function getAvailableParams(): array;
+
+    /**
+     * Gets the URL of the manipulated image.
+     */
+    public function getUrl(): string;
+
+    /**
+     * Reads the manipulated image and returns it as a data URL.
+     */
+    public function getDataUrl(): string;
+
+    /**
+     * Get attributes about the image (e.g. width, height)
+     */
+    public function getAttributes(): array;
+}

src/Contracts/Imaging/UrlBuilder.php

@@ -2,6 +2,10 @@
 
 namespace Statamic\Contracts\Imaging;
 
+/**
+ * @deprecated New image manipulation methods have been introduced.
+ * @see Manipulator
+ */
 interface UrlBuilder
 {
     /**

src/Facades/Glide.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Support\Facades\Facade;
 use Statamic\Imaging\GlideManager;
+use Statamic\Imaging\Manipulators\GlideManipulator;
 
 /**
  * @method static \League\Glide\Server server(array $config = [])
@@ -17,7 +18,9 @@
  * @method static array normalizeParameters($params)
  * @method static void generateHashUsing(\Closure $callback)
  *
- * @see \Statamic\Imaging\GlideManager
+ * @deprecated Glide should be accessed through its manipulation class.
+ * @see GlideManipulator
+ * @see GlideManager
  */
 class Glide extends Facade
 {

src/Http/Controllers/CP/Assets/ThumbnailController.php

@@ -4,27 +4,16 @@
 
 use Illuminate\Support\Facades\Cache;
 use League\Flysystem\UnableToReadFile;
-use League\Glide\Server;
 use Statamic\Exceptions\NotFoundHttpException;
 use Statamic\Facades\Asset;
 use Statamic\Facades\Config;
 use Statamic\Facades\Image;
 use Statamic\Http\Controllers\Controller;
-use Statamic\Imaging\ImageGenerator;
+use Statamic\Imaging\Manipulators\Sources\Source;
 use Statamic\Statamic;
 
 class ThumbnailController extends Controller
 {
-    /**
-     * @var Server
-     */
-    protected $server;
-
-    /**
-     * @var ImageGenerator
-     */
-    protected $generator;
-
     /**
      * @var \Statamic\Contracts\Assets\Asset
      */
@@ -45,12 +34,6 @@ class ThumbnailController extends Controller
      */
     protected $mutex;
 
-    public function __construct(Server $server, ImageGenerator $generator)
-    {
-        $this->server = $server;
-        $this->generator = $generator;
-    }
-
     /**
      * Display the thumbnail.
      *
@@ -69,10 +52,7 @@ public function show($asset, $size = null, $orientation = null)
             return $placeholder;
         }
 
-        return $this->server->getResponseFactory()->create(
-            $this->server->getCache(),
-            $this->generate()
-        );
+        return redirect($this->generate());
     }
 
     /**
@@ -108,10 +88,10 @@ private function generate()
                 throw new \Exception('Invalid preset');
             }
 
-            $path = $this->generator->generateByAsset(
-                $this->asset,
-                $preset ? ['p' => $preset] : []
-            );
+            $path = $this->asset->container()->imageManipulator()
+                ->setSource(Source::from($this->asset))
+                ->setParams($preset ? ['p' => $preset] : [])
+                ->getUrl();
         } catch (UnableToReadFile $e) {
             throw new NotFoundHttpException;
         } finally {

src/Http/Controllers/GlideController.php

@@ -15,6 +15,9 @@
 use Statamic\Imaging\ImageGenerator;
 use Statamic\Support\Str;
 
+/**
+ * @deprecated The new Glide implementation does not use the HTTP API.
+ */
 class GlideController extends Controller
 {
     /**

src/Imaging/AssetNotFoundException.php

@@ -2,6 +2,10 @@
 
 namespace Statamic\Imaging;
 
+/**
+ * @deprecated
+ * @see \Statamic\Exceptions\AssetNotFoundException
+ */
 class AssetNotFoundException extends \Exception
 {
 }

src/Imaging/GlideImageManipulator.php

@@ -7,7 +7,12 @@
 use Statamic\Contracts\Imaging\ImageManipulator;
 use Statamic\Contracts\Imaging\UrlBuilder;
 use Statamic\Facades\Asset as AssetAPI;
+use Statamic\Imaging\Manipulators\GlideManipulator;
 
+/**
+ * @deprecated New image manipulation methods have been introduced.
+ * @see GlideManipulator
+ */
 class GlideImageManipulator implements ImageManipulator
 {
     /**

src/Imaging/GlideManager.php

@@ -8,9 +8,14 @@
 use League\Glide\ServerFactory;
 use Statamic\Facades\Config;
 use Statamic\Facades\Image;
+use Statamic\Imaging\Manipulators\GlideManipulator;
 use Statamic\Imaging\ResponseFactory as LaravelResponseFactory;
 use Statamic\Support\Str;
 
+/**
+ * @deprecated Glide should be accessed through its manipulation class.
+ * @see GlideManipulator
+ */
 class GlideManager
 {
     private Closure $customHashCallable;

src/Imaging/GlideUrlBuilder.php

@@ -6,8 +6,13 @@
 use League\Glide\Urls\UrlBuilderFactory;
 use Statamic\Contracts\Assets\Asset;
 use Statamic\Facades\URL;
+use Statamic\Imaging\Manipulators\GlideManipulator;
 use Statamic\Support\Str;
 
+/**
+ * @deprecated URL building is now done in dedicated manipulator classes.
+ * @see GlideManipulator
+ */
 class GlideUrlBuilder extends ImageUrlBuilder
 {
     /**