Added support for multipart stream created from uri streams

composer.json

@@ -19,7 +19,7 @@
     "require-dev": {
         "phpunit/phpunit": "^4.8 || ^5.4",
         "php-http/message": "^1.0",
-        "zendframework/zend-diactoros": "^1.3.5"
+        "guzzlehttp/psr7": "^1.3.1"
     },
     "autoload": {
         "psr-4": {

src/MultipartStreamBuilder.php

@@ -95,7 +95,14 @@ public function build()
                 $this->getHeaders($data['headers'])."\r\n";
 
             // Convert the stream to string
-            $streams .= (string) $data['contents'];
+            /* @var $contentStream StreamInterface */
+            $contentStream = $data['contents'];
+            if ($contentStream->isSeekable()) {
+                $streams .= (string) $data['contents'];
+            } else {
+                $streams .= $contentStream->getContents();
+            }
+
             $streams .= "\r\n";
         }
 

tests/FunctionTest.php

@@ -3,7 +3,7 @@
 namespace tests\Http\Message\MultipartStream;
 
 use Http\Message\MultipartStream\MultipartStreamBuilder;
-use Zend\Diactoros\Stream;
+
 
 /**
  * @author Tobias Nyholm <[email protected]>
@@ -15,7 +15,7 @@ public function testSupportStreams()
         $body = 'stream contents';
 
         $builder = new MultipartStreamBuilder();
-        $builder->addResource('foobar', $this->createStream($body));
+        $builder->addResource('foobar', $body);
 
         $multipartStream = (string) $builder->build();
         $this->assertTrue(false !== strpos($multipartStream, $body));
@@ -33,6 +33,21 @@ public function testSupportResources()
         $this->assertTrue(false !== strpos($multipartStream, 'Content-Type: image/png'));
     }
 
+    public function testSupportURIResources()
+    {
+        $builder = new MultipartStreamBuilder();
+        $resource = 'https://raw.githubusercontent.com/php-http/multipart-stream-builder/master/tests/Resources/httplug.png';
+        $stream = fopen($resource, 'r');
+        $builder->addResource('image', $stream);
+        $multipartStream = (string) $builder->build();
+
+        $this->assertTrue(false !== strpos($multipartStream, 'Content-Disposition: form-data; name="image"; filename="httplug.png"'));
+        $this->assertTrue(false !== strpos($multipartStream, 'Content-Type: image/png'));
+
+        $uriResourceContents = file_get_contents($resource);
+        $this->assertContains($uriResourceContents, $multipartStream);
+    }
+
     public function testResourceFilenameIsNotLocaleAware()
     {
         // Get current locale
@@ -116,18 +131,4 @@ public function testReset()
         $this->assertNotEquals($boundary, $builder->getBoundary(), 'Stream should have a new boundary after reset()');
         $this->assertNotEmpty($builder->getBoundary());
     }
-
-    /**
-     * @param string $body
-     *
-     * @return Stream
-     */
-    private function createStream($body)
-    {
-        $stream = new Stream('php://memory', 'rw');
-        $stream->write($body);
-        $stream->rewind();
-
-        return $stream;
-    }
 }