Close #190

neomerx · Jan 26, 2018 · 8932469 · 8932469
1 parent 5bbdc91
commit 8932469
Showing 22 changed files with 734 additions and 1,428 deletions.
diff --git a/src/Contracts/Http/Headers/AcceptHeaderInterface.php b/src/Contracts/Http/Headers/AcceptHeaderInterface.php
diff --git a/src/Contracts/Http/Headers/HeaderInterface.php b/src/Contracts/Http/Headers/HeaderInterface.php
diff --git a/src/Contracts/Http/Headers/HeaderParametersInterface.php b/src/Contracts/Http/Headers/HeaderParametersInterface.php
diff --git a/src/Contracts/Http/Headers/HeaderParametersParserInterface.php b/src/Contracts/Http/Headers/HeaderParametersParserInterface.php
@@ -16,22 +16,32 @@
  * limitations under the License.
  */
 
-use Psr\Http\Message\ServerRequestInterface;
-
 /**
  * @package Neomerx\JsonApi
  */
 interface HeaderParametersParserInterface
 {
+    /** Header name that contains format of output data from client */
+    const HEADER_ACCEPT = 'Accept';
+
+    /** Header name that contains format of input data from client */
+    const HEADER_CONTENT_TYPE = 'Content-Type';
+
     /**
-     * Parse input parameters from request.
+     * Parse input as `Accept` header.
+     *
+     * @param string $value
      *
-     * @param ServerRequestInterface $request
-     * @param bool                   $checkContentType
+     * @return iterable
+     */
+    public function parseAcceptHeader(string $value): iterable;
+
+    /**
+     * Parse input as `Content-Type` header.
      *
-     * @return HeaderParametersInterface
+     * @param string $value
      *
-     * @SuppressWarnings(PHPMD.BooleanArgumentFlag)
+     * @return MediaTypeInterface
      */
-    public function parse(ServerRequestInterface $request, bool $checkContentType = true): HeaderParametersInterface;
+    public function parseContentTypeHeader(string $value): MediaTypeInterface;
 }
diff --git a/src/Contracts/Http/HttpFactoryInterface.php b/src/Contracts/Http/HttpFactoryInterface.php
@@ -18,10 +18,7 @@
 
 use Neomerx\JsonApi\Contracts\Encoder\Parameters\EncodingParametersInterface;
 use Neomerx\JsonApi\Contracts\Encoder\Parameters\ParametersAnalyzerInterface;
-use Neomerx\JsonApi\Contracts\Http\Headers\AcceptHeaderInterface;
 use Neomerx\JsonApi\Contracts\Http\Headers\AcceptMediaTypeInterface;
-use Neomerx\JsonApi\Contracts\Http\Headers\HeaderInterface;
-use Neomerx\JsonApi\Contracts\Http\Headers\HeaderParametersInterface;
 use Neomerx\JsonApi\Contracts\Http\Headers\HeaderParametersParserInterface;
 use Neomerx\JsonApi\Contracts\Http\Headers\MediaTypeInterface;
 use Neomerx\JsonApi\Contracts\Schema\ContainerInterface;
@@ -68,30 +65,6 @@ public function createQueryParameters(
         array $fieldSets = null
     ): EncodingParametersInterface;
 
-    /**
-     * @param string                $method
-     * @param AcceptHeaderInterface $accept
-     * @param HeaderInterface       $contentType
-     *
-     * @return HeaderParametersInterface
-     */
-    public function createHeaderParameters(
-        string $method,
-        AcceptHeaderInterface $accept,
-        HeaderInterface $contentType
-    ): HeaderParametersInterface;
-
-    /**
-     * @param string                $method
-     * @param AcceptHeaderInterface $accept
-     *
-     * @return HeaderParametersInterface
-     */
-    public function createNoContentHeaderParameters(
-        string $method,
-        AcceptHeaderInterface $accept
-    ): HeaderParametersInterface;
-
     /**
      * Create parameters parser.
      *
@@ -117,13 +90,4 @@ public function createAcceptMediaType(
         array $parameters = null,
         float $quality = 1.0
     ): AcceptMediaTypeInterface;
-
-    /**
-     * Create Accept HTTP header.
-     *
-     * @param AcceptMediaTypeInterface[] $unsortedMediaTypes
-     *
-     * @return AcceptHeaderInterface
-     */
-    public function createAcceptHeader(array $unsortedMediaTypes): AcceptHeaderInterface;
 }
diff --git a/src/Exceptions/JsonApiException.php b/src/Exceptions/JsonApiException.php
@@ -128,12 +128,4 @@ public function getHttpCode(): int
     {
         return $this->httpCode;
     }
-
-    /**
-     * @param JsonApiException $exception
-     */
-    public static function throwException(JsonApiException $exception)
-    {
-        throw $exception;
-    }
 }
diff --git a/src/Factories/Factory.php b/src/Factories/Factory.php
@@ -32,10 +32,7 @@
 use Neomerx\JsonApi\Contracts\Encoder\Stack\StackInterface;
 use Neomerx\JsonApi\Contracts\Encoder\Stack\StackReadOnlyInterface;
 use Neomerx\JsonApi\Contracts\Factories\FactoryInterface;
-use Neomerx\JsonApi\Contracts\Http\Headers\AcceptHeaderInterface;
 use Neomerx\JsonApi\Contracts\Http\Headers\AcceptMediaTypeInterface;
-use Neomerx\JsonApi\Contracts\Http\Headers\HeaderInterface;
-use Neomerx\JsonApi\Contracts\Http\Headers\HeaderParametersInterface;
 use Neomerx\JsonApi\Contracts\Http\Headers\HeaderParametersParserInterface;
 use Neomerx\JsonApi\Contracts\Http\Headers\MediaTypeInterface;
 use Neomerx\JsonApi\Contracts\Schema\ContainerInterface;
@@ -56,9 +53,7 @@
 use Neomerx\JsonApi\Encoder\Parser\ParserReply;
 use Neomerx\JsonApi\Encoder\Stack\Stack;
 use Neomerx\JsonApi\Encoder\Stack\StackFrame;
-use Neomerx\JsonApi\Http\Headers\AcceptHeader;
 use Neomerx\JsonApi\Http\Headers\AcceptMediaType;
-use Neomerx\JsonApi\Http\Headers\HeaderParameters;
 use Neomerx\JsonApi\Http\Headers\HeaderParametersParser;
 use Neomerx\JsonApi\Http\Headers\MediaType;
 use Neomerx\JsonApi\Schema\Container;
@@ -243,27 +238,6 @@ public function createQueryParameters(
         return new EncodingParameters($includePaths, $fieldSets);
     }
 
-    /**
-     * @inheritdoc
-     */
-    public function createHeaderParameters(
-        string $method,
-        AcceptHeaderInterface $accept,
-        HeaderInterface $contentType
-    ): HeaderParametersInterface {
-        return new HeaderParameters($method, $accept, $contentType);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function createNoContentHeaderParameters(
-        string $method,
-        AcceptHeaderInterface $accept
-    ): HeaderParametersInterface {
-        return new HeaderParameters($method, $accept, null);
-    }
-
     /**
      * @inheritdoc
      */
@@ -289,14 +263,6 @@ public function createAcceptMediaType(
         return new AcceptMediaType($position, $type, $subType, $parameters, $quality);
     }
 
-    /**
-     * @inheritdoc
-     */
-    public function createAcceptHeader(array $unsortedMediaTypes): AcceptHeaderInterface
-    {
-        return new AcceptHeader($unsortedMediaTypes);
-    }
-
     /**
      * @inheritdoc
      */

diff --git a/src/Http/Responses.php → src/Http/BaseResponses.php b/src/Http/Responses.php → src/Http/BaseResponses.php
@@ -19,7 +19,7 @@
 use Neomerx\JsonApi\Contracts\Document\ErrorInterface;
 use Neomerx\JsonApi\Contracts\Encoder\EncoderInterface;
 use Neomerx\JsonApi\Contracts\Encoder\Parameters\EncodingParametersInterface;
-use Neomerx\JsonApi\Contracts\Http\Headers\HeaderInterface;
+use Neomerx\JsonApi\Contracts\Http\Headers\HeaderParametersParserInterface;
 use Neomerx\JsonApi\Contracts\Http\Headers\MediaTypeInterface;
 use Neomerx\JsonApi\Contracts\Http\ResponsesInterface;
 use Neomerx\JsonApi\Contracts\Schema\ContainerInterface;
@@ -28,13 +28,13 @@
 /**
  * @package Neomerx\JsonApi
  */
-abstract class Responses implements ResponsesInterface
+abstract class BaseResponses implements ResponsesInterface
 {
     /** Header name that contains format of input data from client */
-    const HEADER_CONTENT_TYPE = HeaderInterface::HEADER_CONTENT_TYPE;
+    const HEADER_CONTENT_TYPE = HeaderParametersParserInterface::HEADER_CONTENT_TYPE;
 
     /** Header name that location of newly created resource */
-    const HEADER_LOCATION = HeaderInterface::HEADER_LOCATION;
+    const HEADER_LOCATION = 'Location';
 
     /**
      * Create HTTP response.