Small improvements

- Memory leak is fixed in vendor, see:
Intervention/image#426
- Loading time is still very long (previous commit did not fix it)

public/js/imagesweserv.js

@@ -222,7 +222,6 @@ $(function() {
     $('a[rel="lightbox"]').featherlight({
         root: 'section#body'
     });
-    $('.lazy').lazy();
 });
 
 jQuery.extend({

src/Api/Api.php

@@ -6,6 +6,7 @@
 use AndriesLouw\imagesweserv\Exception\ImageTooLargeException;
 use AndriesLouw\imagesweserv\Manipulators\ManipulatorInterface;
 use GuzzleHttp\Exception\RequestException;
+use ImagickException;
 use Intervention\Image\Exception\InvalidArgumentException;
 use Intervention\Image\Exception\NotReadableException;
 use Intervention\Image\Exception\RuntimeException;
@@ -117,7 +118,8 @@ public function setManipulators(array $manipulators)
      * @throws NotReadableException if the provided file can not be read
      * @throws ImageTooLargeException if the provided image is too large for processing.
      * @throws RequestException for errors that occur during a transfer or during the on_headers event
-     * @return \Intervention\Image\Image
+     * @throws ImagickException for errors that occur during image manipulation
+     * @return string Manipulated image binary data.
      */
     public function run($url, array $params)
     {
@@ -144,9 +146,17 @@ public function run($url, array $params)
                 trigger_error($e->getMessage() . ' URL: ' . $url . ' Params: ' . implode(', ', $params),
                     E_USER_WARNING);
                 throw $e;
+            } catch (ImagickException $e) {
+                trigger_error($e->getMessage() . ' URL: ' . $url . ' Params: ' . implode(', ', $params),
+                    E_USER_WARNING);
+                throw $e;
             }
+
+            //gc_collect_cycles();
         }
 
-        return $image;
+        $image->destroy();
+
+        return $image->getEncoded();
     }
 }

src/Api/ApiInterface.php

@@ -6,9 +6,9 @@ interface ApiInterface
 {
     /**
      * Perform image manipulations.
-     * @param  string $source Source image binary data.
+     * @param  string $url Source URL
      * @param  array $params The manipulation params.
      * @return string Manipulated image binary data.
      */
-    public function run($source, array $params);
+    public function run($url, array $params);
 }

src/Client.php

@@ -126,7 +126,6 @@ public function getFileName()
     /**
      * @param string $url
      * @throws RequestException for errors that occur during a transfer or during the on_headers event
-     * @internal param \GuzzleHttp\Client
      *
      * @return string File name
      */

src/Manipulators/BaseManipulator.php

@@ -19,8 +19,6 @@ abstract class BaseManipulator implements ManipulatorInterface
     public function setParams(array $params)
     {
         $this->params = $params;
-
-        return $this;
     }
 
     /**
@@ -31,7 +29,7 @@ public function setParams(array $params)
     public function __get($name)
     {
         if (array_key_exists($name, $this->params)) {
-            return ($this->params[$name] != null) ? $this->params[$name] : 'null';
+            return ($this->params[$name] != null) ? $this->params[$name]: '';
         }
     }
 

src/Manipulators/Encode.php

@@ -5,7 +5,7 @@
 use Intervention\Image\Image;
 
 /**
- * @property string $fm
+ * @property string $output
  * @property string $q
  */
 class Encode extends BaseManipulator
@@ -30,6 +30,7 @@ public function run(Image $image)
             $image->interlace();
         }
 
+        // Memory leak, see: https://github.com/Intervention/image/issues/426
         return $image->encode($format, $quality);
     }
 

src/Manipulators/Size.php

@@ -7,7 +7,8 @@
 
 /**
  * @property string $dpr
- * @property string $fit
+ * @property string $t
+ * @property string $a
  * @property string $h
  * @property string $w
  */

src/Manipulators/Trim.php

@@ -31,7 +31,7 @@ public function run(Image $image)
      */
     public function getTrim()
     {
-        if ($this->trim === 'null') {
+        if ($this->trim === '') {
             return 10;
         }
 

src/Server.php

@@ -5,6 +5,7 @@
 use AndriesLouw\imagesweserv\Api\ApiInterface;
 use AndriesLouw\imagesweserv\Exception\ImageTooLargeException;
 use GuzzleHttp\Exception\RequestException;
+use ImagickException;
 use Intervention\Image\Exception\NotReadableException;
 
 class Server
@@ -97,13 +98,34 @@ public function setPresets(array $presets)
      * @throws NotReadableException if the provided file can not be read
      * @throws ImageTooLargeException if the provided image is too large for processing.
      * @throws RequestException for errors that occur during a transfer or during the on_headers event
-     * @return \Intervention\Image\Image
+     * @throws ImagickException for errors that occur during image manipulation
+     * @return string Manipulated image binary data.
      */
     public function outputImage($url, array $params)
     {
         return $this->api->run($url, $this->getAllParams($params));
     }
 
+    /**
+     * Get all image manipulations params, including defaults and presets.
+     * @param  array $params Image manipulation params.
+     * @return array All image manipulation params.
+     */
+    public function getAllParams(array $params)
+    {
+        $all = $this->defaults;
+
+        if (isset($params['p'])) {
+            foreach (explode(',', $params['p']) as $preset) {
+                if (isset($this->presets[$preset])) {
+                    $all = array_merge($all, $this->presets[$preset]);
+                }
+            }
+        }
+
+        return array_merge($all, $params);
+    }
+
     /**
      * Get the current mime type after encoding
      * we cannot use directly $image->mime() because
@@ -112,15 +134,18 @@ public function outputImage($url, array $params)
      *
      * @param  string $mimeType the mime which the user wants to format to
      * @param  string $mimeTypeImage the initial mime type before encoding
+     * @param  array $allowed allowed extensions
      * @return string
      */
-    public function getCurrentMimeType($mimeType, $mimeTypeImage)
+    public function getCurrentMimeType($mimeType, $mimeTypeImage, $allowed = null)
     {
-        $allowed = [
-            'gif' => 'image/gif',
-            'jpg' => 'image/jpeg',
-            'png' => 'image/png',
-        ];
+        if (is_null($allowed)) {
+            $allowed = [
+                'gif' => 'image/gif',
+                'jpg' => 'image/jpeg',
+                'png' => 'image/png',
+            ];
+        }
 
         if (array_key_exists($mimeType, $allowed)) {
             return $allowed[$mimeType];
@@ -132,24 +157,4 @@ public function getCurrentMimeType($mimeType, $mimeTypeImage)
 
         return 'image/jpeg';
     }
-
-    /**
-     * Get all image manipulations params, including defaults and presets.
-     * @param  array $params Image manipulation params.
-     * @return array All image manipulation params.
-     */
-    public function getAllParams(array $params)
-    {
-        $all = $this->defaults;
-
-        if (isset($params['p'])) {
-            foreach (explode(',', $params['p']) as $preset) {
-                if (isset($this->presets[$preset])) {
-                    $all = array_merge($all, $this->presets[$preset]);
-                }
-            }
-        }
-
-        return array_merge($all, $params);
-    }
 }