Support for Laravel FileSystems

src/Intervention/Image/AbstractDecoder.php

@@ -64,17 +64,17 @@ public function __construct($data = null)
      */
     public function initFromUrl($url)
     {
-        
+
         $options = [
             'http' => [
                 'method'=>"GET",
                 'header'=>"Accept-language: en\r\n".
                 "User-Agent: Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.2 (KHTML, like Gecko) Chrome/22.0.1216.0 Safari/537.2\r\n"
           ]
         ];
-        
+
         $context  = stream_context_create($options);
-        
+
 
         if ($data = @file_get_contents($url, false, $context)) {
             return $this->initFromBinary($data);
@@ -265,6 +265,33 @@ public function isBase64()
         return base64_encode(base64_decode($this->data)) === $this->data;
     }
 
+    /**
+     * Determines if the current source data is a Symfony Storage path
+     *
+     * @return boolean
+     */
+    public function isStorage()
+    {
+        if (is_string($this->data)) {
+            return preg_match('/^\w*:[^\/].*$/', $this->data) ? true : false;
+        }
+
+        return false;
+    }
+
+    /**
+     * Initiates new Image from Symfony Storage
+     *
+     * @param string $path
+     * @return \Intervention\Image\Image
+     */
+    public function initFromStorage($path)
+    {
+        preg_match('/(.*):(.*)/', $path, $matches);
+        list(, $fs, $file) = $matches;
+        return $this->initFromBinary(\Storage::disk($fs)->get($file));
+    }
+
     /**
      * Initiates new Image from Intervention\Image\Image
      *
@@ -341,6 +368,9 @@ public function init($data)
             case $this->isBase64():
                 return $this->initFromBinary(base64_decode($this->data));
 
+            case $this->isStorage():
+                return $this->initFromStorage($this->data);
+
             default:
                 throw new Exception\NotReadableException("Image source not readable");
         }

tests/AbstractDecoderTest.php

@@ -6,7 +6,7 @@ public function tearDown()
     {
         Mockery::close();
     }
-    
+
     public function testIsImagick()
     {
         $source = $this->getTestDecoder(new \Imagick);
@@ -51,6 +51,7 @@ public function testIsUrl()
     {
         $source = $this->getTestDecoder('http://foo.bar');
         $this->assertTrue($source->isUrl());
+        $this->assertFalse($source->isStorage());
 
         $source = $this->getTestDecoder(null);
         $this->assertFalse($source->isUrl());
@@ -144,6 +145,19 @@ public function testIsBase64()
         $this->assertTrue($decoder->isBase64());
     }
 
+    public function testIsStorage()
+    {
+        $decoder = $this->getTestDecoder(null);
+        $this->assertFalse($decoder->isStorage());
+
+        $decoder = $this->getTestDecoder('random');
+        $this->assertFalse($decoder->isStorage());
+
+        $storage = "public:test";
+        $decoder = $this->getTestDecoder($storage);
+        $this->assertTrue($decoder->isStorage());
+    }
+
     public function getTestDecoder($data)
     {
         return $this->getMockForAbstractClass('\Intervention\Image\AbstractDecoder', [$data]);