Neos Media Imagor Support

Neos.Media/Classes/Domain/Model/Adjustment/ImageAdjustmentInterface.php

@@ -26,6 +26,7 @@ interface ImageAdjustmentInterface extends AdjustmentInterface
      *
      * @param ImageInterface $image
      * @return ImageInterface
+     * !!! only called when using Imagine, not called when using Imagor (or other image proxies)
      */
     public function applyToImage(ImageInterface $image);
 
@@ -34,6 +35,7 @@ public function applyToImage(ImageInterface $image);
      *
      * @param ImageVariant $imageVariant
      * @return void
+     *  !!! only called when using Imagine, not called when using Imagor (or other image proxies)
      */
     public function setImageVariant(ImageVariant $imageVariant);
 
@@ -42,6 +44,7 @@ public function setImageVariant(ImageVariant $imageVariant);
      *
      * @param ImageInterface $image
      * @return boolean
+     * !!! only called when using Imagine, not called when using Imagor (or other image proxies)
      */
     public function canBeApplied(ImageInterface $image);
 }

Neos.Media/Classes/Domain/Model/DimensionsTrait.php

@@ -19,21 +19,21 @@
 trait DimensionsTrait
 {
     /**
-     * @var integer
+     * @var integer|null
      * @ORM\Column(nullable=true)
      */
     protected $width = 0;
 
     /**
-     * @var integer
+     * @var integer|null
      * @ORM\Column(nullable=true)
      */
     protected $height = 0;
 
     /**
      * Width of the image in pixels
      *
-     * @return integer
+     * @return integer|null
      */
     public function getWidth()
     {
@@ -43,7 +43,7 @@ public function getWidth()
     /**
      * Height of the image in pixels
      *
-     * @return integer
+     * @return integer|null
      */
     public function getHeight()
     {

Neos.Media/Classes/Domain/Model/ImageInterface.php

@@ -35,14 +35,14 @@ interface ImageInterface extends ResourceBasedInterface
     /**
      * Width of the image in pixels
      *
-     * @return integer
+     * @return integer|null
      */
     public function getWidth();
 
     /**
      * Height of the image in pixels
      *
-     * @return integer
+     * @return integer|null
      */
     public function getHeight();
 

Neos.Media/Classes/Domain/Service/AssetService.php

@@ -33,11 +33,11 @@
 use Neos\Media\Domain\Model\Thumbnail;
 use Neos\Media\Domain\Model\ThumbnailConfiguration;
 use Neos\Media\Domain\Repository\AssetRepository;
+use Neos\Media\Domain\Service\Imagor\ImagorService;
 use Neos\Media\Domain\Strategy\AssetUsageStrategyInterface;
 use Neos\Media\Exception\AssetServiceException;
 use Neos\Media\Exception\AssetVariantGeneratorException;
 use Neos\Media\Exception\ThumbnailServiceException;
-use Neos\RedirectHandler\Storage\RedirectStorageInterface;
 use Neos\Utility\Arrays;
 use Neos\Utility\MediaTypes;
 use Psr\Log\LoggerInterface;
@@ -103,12 +103,22 @@ class AssetService
      */
     protected $imageService;
 
+    /**
+     * @Flow\Inject
+     */
+    protected ImagorService $imagorService;
+
     /**
      * @Flow\Inject
      * @var AssetVariantGenerator
      */
     protected $assetVariantGenerator;
 
+    /**
+     * @Flow\InjectConfiguration("imagor.enabled")
+     */
+    protected bool $isImagorEnabled = false;
+
     /**
      * Returns the repository for an asset
      *
@@ -131,17 +141,21 @@ public function getRepository(AssetInterface $asset): RepositoryInterface
      * Calculates the dimensions of the thumbnail to be generated and returns the thumbnail URI.
      * In case of Images this is a thumbnail of the image, in case of other assets an icon representation.
      *
-     * @param AssetInterface $asset
-     * @param ThumbnailConfiguration $configuration
-     * @param ActionRequest $request Request argument must be provided for asynchronous thumbnails
+     * @param  AssetInterface  $asset
+     * @param  ThumbnailConfiguration  $configuration
+     * @param  ActionRequest|null  $request  Request argument must be provided for asynchronous thumbnails
      * @return array|null Array with keys "width", "height" and "src" if the thumbnail generation work or null
      * @throws AssetServiceException
-     * @throws ThumbnailServiceException
-     * @throws MissingActionNameException
      * @throws HttpException
+     * @throws MissingActionNameException
+     * @throws ThumbnailServiceException
      */
     public function getThumbnailUriAndSizeForAsset(AssetInterface $asset, ThumbnailConfiguration $configuration, ActionRequest $request = null): ?array
     {
+        if($asset instanceof ImageInterface && $this->isImagorEnabled) {
+            return $this->imagorService->getThumbnailUriAndSize($asset, $configuration);
+        }
+
         $thumbnailImage = $this->thumbnailService->getThumbnail($asset, $configuration);
         if (!$thumbnailImage instanceof ImageInterface) {
             return null;

Neos.Media/Classes/Domain/Service/ImageService.php

@@ -294,6 +294,10 @@ protected function applyAdjustments(ImageInterface $image, array $adjustments, &
             if (!$adjustment instanceof ImageAdjustmentInterface) {
                 throw new ImageServiceException(sprintf('Could not apply the %s adjustment to image because it does not implement the ImageAdjustmentInterface.', get_class($adjustment)), 1381400362);
             }
+
+            // TODO this is called when running ./flow site:import!!
+            // $imagineAdjustmentApplier = self::findImagineAdjustmentApplier($adjustment);
+
             if ($adjustment->canBeApplied($image)) {
                 $image = $adjustment->applyToImage($image);
                 $adjustmentsApplied = true;
@@ -303,6 +307,10 @@ protected function applyAdjustments(ImageInterface $image, array $adjustments, &
         return $image;
     }
 
+    private static function findImagineAdjustmentApplier(ImageAdjustmentInterface $adjustment): ImageAdjustmentInterface
+    {
+    }
+
     /**
      * Detects whether the given GIF image data contains more than one frame
      *