Merge pull request #79 from younes0/master

handle getimagesizefromstring errors, embbeded images + request exceptions for guzzle5

Author: oscarotero

src/ImageInfo/Guzzle5.php

@@ -3,12 +3,15 @@
 namespace Embed\ImageInfo;
 
 use GuzzleHttp\Pool;
+use GuzzleHttp\Exception\RequestException;
 
 /**
  * Class to retrieve the size and mimetype of images using Guzzle5.
  */
 class Guzzle5 implements ImageInfoInterface
 {
+    use UtilsTrait;
+
     /**
      * {@inheritdoc}
      */
@@ -23,6 +26,13 @@ public static function getImagesInfo(array $urls, array $config = null)
         // Build parallel requests
         $requests = [];
         foreach ($urls as $url) {
+            if (strpos($url['value'], 'data:') === 0) {
+                if ($info = static::getEmbeddedImageInfo($url['value'])) {
+                    $result[] = array_merge($url, $info);
+                }
+                continue;
+            }
+
             $requests[] = $client->createRequest('GET', $url['value']);
         }
 
@@ -32,6 +42,10 @@ public static function getImagesInfo(array $urls, array $config = null)
         // Build result set
         $result = [];
         foreach ($responses as $i => $response) {
+            if ($response instanceof RequestException) {
+                continue;
+            }
+
             if (($size = @getimagesizefromstring($response->getBody())) !== false) {
                 $result[] = [
                     'width' => $size[0],

src/ImageInfo/UtilsTrait.php

@@ -19,13 +19,15 @@ protected static function getEmbeddedImageInfo($content)
             return false;
         }
 
-        $info = getimagesizefromstring(base64_decode(substr($pieces[1], 7)));
+        if (($info = @getimagesizefromstring(base64_decode(substr($pieces[1], 7)))) !== false) {
+            return [
+                'width' => $info[0],
+                'height' => $info[1],
+                'size' => $info[0] * $info[1],
+                'mime' => $info['mime'],
+            ];
+        }
 
-        return [
-            'width' => $info[0],
-            'height' => $info[1],
-            'size' => $info[0] * $info[1],
-            'mime' => $info['mime'],
-        ];
+        return false;
     }
-}
+}