Merge pull request #21 from php-http/stream_factory

Use DiactorosStreamFactory in MessageFactory, closes #19

Author: sagikazarmark

spec/MessageFactory/DiactorosFactorySpec.php

@@ -40,20 +40,6 @@ function it_creates_a_request_with_empty_body()
         $this->createRequest('POST', '/', [], null, '1.1')->shouldHaveType('Psr\Http\Message\RequestInterface');
     }
 
-    function it_creates_a_request_with_stream_body(StreamInterface $stream)
-    {
-        $stream->rewind()->shouldBeCalled();
-
-        $this->createRequest('POST', '/', [], $stream, '1.1')->shouldHaveType('Psr\Http\Message\RequestInterface');
-    }
-
-    function it_creates_a_request_with_resource_body()
-    {
-        $resource = tmpfile();
-
-        $this->createRequest('POST', '/', [], $resource, '1.1')->shouldHaveType('Psr\Http\Message\RequestInterface');
-    }
-
     function it_creates_a_response()
     {
         $this->createResponse()->shouldHaveType('Psr\Http\Message\ResponseInterface');

src/MessageFactory/DiactorosFactory.php

@@ -11,17 +11,27 @@
 
 namespace Http\Discovery\MessageFactory;
 
+use Http\Discovery\StreamFactory\DiactorosStreamFactory;
 use Http\Message\MessageFactory;
 use Psr\Http\Message\StreamInterface;
 use Zend\Diactoros\Request;
 use Zend\Diactoros\Response;
-use Zend\Diactoros\Stream;
 
 /**
  * @author GeLo <[email protected]>
  */
 class DiactorosFactory implements MessageFactory
 {
+    /**
+     * @var DiactorosStreamFactory
+     */
+    private $streamFactory;
+
+    public function __construct()
+    {
+        $this->streamFactory = new DiactorosStreamFactory();
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -35,7 +45,7 @@ public function createRequest(
         return (new Request(
             $uri,
             $method,
-            $this->createStream($body),
+            $this->streamFactory->createStream($body),
             $headers
         ))->withProtocolVersion($protocolVersion);
     }
@@ -51,39 +61,9 @@ public function createResponse(
         $protocolVersion = '1.1'
     ) {
         return (new Response(
-            $this->createStream($body),
+            $this->streamFactory->createStream($body),
             $statusCode,
             $headers
         ))->withProtocolVersion($protocolVersion);
     }
-
-    /**
-     * Creates a stream
-     *
-     * @param string|resource|StreamInterface|null $body
-     *
-     * @return StreamInterface
-     *
-     * @throws \InvalidArgumentException If the stream body is invalid
-     */
-    protected function createStream($body = null)
-    {
-        if (!$body instanceof StreamInterface) {
-            if (is_resource($body)) {
-                $body = new Stream($body);
-            } else {
-                $stream = new Stream('php://memory', 'rw');
-
-                if (isset($body)) {
-                    $stream->write((string) $body);
-                }
-
-                $body = $stream;
-            }
-        }
-
-        $body->rewind();
-
-        return $body;
-    }
 }