TASK: Introduce ScalableImageSourceHelperInterface to make the implem…

…entation of scale optional
sitegeist · Jul 13, 2018 · 6343116 · 6343116
1 parent 7cf7f44
commit 6343116
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 25 deletions.
diff --git a/Classes/EelHelpers/AbstractImageSourceHelper.php b/Classes/EelHelpers/AbstractImageSourceHelper.php
@@ -72,13 +72,18 @@ public function applyPreset(string $name) : ImageSourceHelperInterface
      */
     public function widthSrcset(array $widthSet): string
     {
-        $srcsetArray = [];
-        foreach ($widthSet as $targetWidth) {
-            $scaleFactor = $targetWidth / $this->getWidth();
-            $scaled = $this->scale($scaleFactor);
-            $srcsetArray[] = $scaled->src() . ' ' . $targetWidth . 'w';
+        if ($this instanceof ScalableImageSourceHelperInterface) {
+            $srcsetArray = [];
+            foreach ($widthSet as $targetWidth) {
+                $scaleFactor = $targetWidth / $this->getWidth();
+                $scaled = $this->scale($scaleFactor);
+                $srcsetArray[] = $scaled->src() . ' ' . $targetWidth . 'w';
+            }
+            return implode(', ', $srcsetArray);
+        } else {
+            return $this->src();
         }
-        return implode(', ', $srcsetArray);
+
     }
 
     /**
@@ -89,12 +94,16 @@ public function widthSrcset(array $widthSet): string
      */
     public function resolutionSrcset(array $resolutionSet): string
     {
-        $srcsetArray = [];
-        foreach ($resolutionSet as $scaleFactor) {
-            $scaled = $this->scale($scaleFactor);
-            $srcsetArray[] = $scaled->src() . ' ' . $scaleFactor . 'x';
+        if ($this instanceof ScalableImageSourceHelperInterface) {
+            $srcsetArray = [];
+            foreach ($resolutionSet as $scaleFactor) {
+                $scaled = $this->scale($scaleFactor);
+                $srcsetArray[] = $scaled->src() . ' ' . $scaleFactor . 'x';
+            }
+            return implode(', ', $srcsetArray);
+        } else {
+            return $this->src();
         }
-        return implode(', ', $srcsetArray);
     }
 
     /**

diff --git a/Classes/EelHelpers/AssetImageSourceHelper.php b/Classes/EelHelpers/AssetImageSourceHelper.php
@@ -8,7 +8,7 @@
 use Neos\Media\Domain\Model\ThumbnailConfiguration;
 use Neos\Flow\Mvc\ActionRequest;
 
-class AssetImageSourceHelper extends AbstractImageSourceHelper
+class AssetImageSourceHelper extends AbstractImageSourceHelper implements ScalableImageSourceHelperInterface
 {
 
     /**
@@ -47,6 +47,7 @@ public function __construct(ImageInterface $asset)
         $this->asset = $asset;
     }
 
+
     /**
      * @param bool $async
      */

diff --git a/Classes/EelHelpers/DummyImageSourceHelper.php b/Classes/EelHelpers/DummyImageSourceHelper.php
@@ -3,7 +3,7 @@
 
 use Neos\Flow\Annotations as Flow;
 
-class DummyImageSourceHelper extends AbstractImageSourceHelper
+class DummyImageSourceHelper extends AbstractImageSourceHelper implements ScalableImageSourceHelperInterface
 {
     protected $baseWidth = 600;
 

diff --git a/Classes/EelHelpers/ImageSourceHelperInterface.php b/Classes/EelHelpers/ImageSourceHelperInterface.php
@@ -11,8 +11,6 @@ public function setHeight(int $height = null) : ImageSourceHelperInterface;
 
     public function applyPreset(string $name) : ImageSourceHelperInterface;
 
-    public function scale(float $factor): ImageSourceHelperInterface;
-
     public function src() : string;
 
     public function widthSrcset(array $widthSet) : string;

diff --git a/Classes/EelHelpers/ResourceImageSourceHelper.php b/Classes/EelHelpers/ResourceImageSourceHelper.php
@@ -27,11 +27,6 @@ public function __construct(string $package, string $path)
         $this->path = $path;
     }
 
-    public function scale(float $factor): ImageSourceHelperInterface
-    {
-        return $this;
-    }
-
     public function src(): string
     {
         return $this->resourceManager->getPublicPackageResourceUri($this->package, $this->path);

diff --git a/Classes/EelHelpers/ScalableImageSourceHelperInterface.php b/Classes/EelHelpers/ScalableImageSourceHelperInterface.php
@@ -0,0 +1,7 @@
+<?php
+namespace Sitegeist\Kaleidoscope\EelHelpers;
+
+interface ScalableImageSourceHelperInterface extends ImageSourceHelperInterface
+{
+    public function scale(float $factor): ImageSourceHelperInterface;
+}
diff --git a/Classes/EelHelpers/UriImageSourceHelper.php b/Classes/EelHelpers/UriImageSourceHelper.php
@@ -24,11 +24,6 @@ public function __construct(string $uri)
         $this->uri = $uri;
     }
 
-    public function scale(float $factor): ImageSourceHelperInterface
-    {
-        return $this;
-    }
-
     public function src(): string
     {
         return $this->uri;

diff --git a/README.md b/README.md
@@ -11,6 +11,9 @@ We want to help implementing responsive-images in the context of atomic-fusion
 and enable previewing fusion-components and their full responsive behavior in the
 Sitegeist.Monocle living styleguide.
 
+Sitegeist.Kaleidoscope comes with Fusion-ImageSources for Assets, DummyImages, Resources
+and static Uris.
+
 ### Authors & Sponsors
 
 * Martin Ficzel - [email protected]