Merge pull request #16 from php-http/extract_response_factory

Extract Response factory from Message factory

Author: dbu

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## UNRELEASED
+
+### Added
+
+- Response Factory in order to be reused in Message and Server Message factories
+- Request Factory
+
+### Changed
+
+- Message Factory extends Request and Response factories
+
+
 ## 1.0.0-rc1 - 2015-12-14
 
 ### Added

src/MessageFactory.php

@@ -2,53 +2,11 @@
 
 namespace Http\Message;
 
-use Psr\Http\Message\UriInterface;
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\StreamInterface;
-
 /**
  * Factory for PSR-7 Request and Response.
  *
  * @author Márk Sági-Kazár <[email protected]>
  */
-interface MessageFactory
+interface MessageFactory extends RequestFactory, ResponseFactory
 {
-    /**
-     * Creates a new PSR-7 request.
-     *
-     * @param string                               $method
-     * @param string|UriInterface                  $uri
-     * @param array                                $headers
-     * @param resource|string|StreamInterface|null $body
-     * @param string                               $protocolVersion
-     *
-     * @return RequestInterface
-     */
-    public function createRequest(
-        $method,
-        $uri,
-        array $headers = [],
-        $body = null,
-        $protocolVersion = '1.1'
-    );
-
-    /**
-     * Creates a new PSR-7 response.
-     *
-     * @param int                                  $statusCode
-     * @param string|null                          $reasonPhrase
-     * @param array                                $headers
-     * @param resource|string|StreamInterface|null $body
-     * @param string                               $protocolVersion
-     *
-     * @return ResponseInterface
-     */
-    public function createResponse(
-        $statusCode = 200,
-        $reasonPhrase = null,
-        array $headers = [],
-        $body = null,
-        $protocolVersion = '1.1'
-    );
 }

src/RequestFactory.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Http\Message;
+
+use Psr\Http\Message\UriInterface;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\StreamInterface;
+
+/**
+ * Factory for PSR-7 Request.
+ *
+ * @author Márk Sági-Kazár <[email protected]>
+ */
+interface RequestFactory
+{
+    /**
+     * Creates a new PSR-7 request.
+     *
+     * @param string                               $method
+     * @param string|UriInterface                  $uri
+     * @param array                                $headers
+     * @param resource|string|StreamInterface|null $body
+     * @param string                               $protocolVersion
+     *
+     * @return RequestInterface
+     */
+    public function createRequest(
+        $method,
+        $uri,
+        array $headers = [],
+        $body = null,
+        $protocolVersion = '1.1'
+    );
+}

src/ResponseFactory.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Http\Message;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\StreamInterface;
+
+/**
+ * Factory for PSR-7 Response.
+ *
+ * This factory contract can be reused in Message and Server Message factories.
+ *
+ * @author Márk Sági-Kazár <[email protected]>
+ */
+interface ResponseFactory
+{
+    /**
+     * Creates a new PSR-7 response.
+     *
+     * @param int                                  $statusCode
+     * @param string|null                          $reasonPhrase
+     * @param array                                $headers
+     * @param resource|string|StreamInterface|null $body
+     * @param string                               $protocolVersion
+     *
+     * @return ResponseInterface
+     */
+    public function createResponse(
+        $statusCode = 200,
+        $reasonPhrase = null,
+        array $headers = [],
+        $body = null,
+        $protocolVersion = '1.1'
+    );
+}