Merge branch 'develop'

Author: acelaya

.travis.yml

@@ -6,9 +6,8 @@ branches:
     - develop
 
 php:
-  - 5.6
-  - 7
   - 7.1
+  - 7.2
 
 before_script:
   - composer self-update

CHANGELOG.md

@@ -0,0 +1,7 @@
+## CHANGELOG
+
+### 2.1.0
+
+**Enhancements:**
+
+* [4: Drop support for PHP 5.6 and 7 and add support for PHP 7.2](https://github.com/acelaya/ze-content-based-error-handler/issues/4)

composer.json

@@ -10,13 +10,14 @@
         "error handler"
     ],
     "require": {
-        "php": "^5.6 || ^7.0",
+        "php": "^7.1",
         "zendframework/zend-servicemanager": "^3.0",
         "zendframework/zend-expressive": "^2.0",
-        "psr/log": "^1.0"
+        "psr/log": "^1.0",
+        "http-interop/http-middleware": "^0.4.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.0 || ^6.0",
+        "phpunit/phpunit": "^6.0",
         "squizlabs/php_codesniffer": "^2.3"
     },
     "license": "MIT",

src/ErrorHandler/ContentBasedErrorResponseGenerator.php

@@ -9,10 +9,7 @@
 
 class ContentBasedErrorResponseGenerator implements ErrorResponseGeneratorInterface
 {
-    /**
-     * @deprecated Inject the default content type to be used while creating this class
-     */
-    const DEFAULT_CONTENT = 'text/html';
+    private const DEFAULT_CONTENT = 'text/html';
 
     /**
      * @var ErrorResponseGeneratorManagerInterface
@@ -33,7 +30,7 @@ class ContentBasedErrorResponseGenerator implements ErrorResponseGeneratorInterf
 
     /**
      * ContentBasedErrorResponseGenerator constructor.
-     * @param ErrorResponseGeneratorManagerInterface|ErrorResponseGeneratorManager $errorHandlerManager
+     * @param ErrorResponseGeneratorManagerInterface $errorHandlerManager
      * @param LoggerInterface $logger
      * @param LogMessageBuilderInterface $logMessageBuilder
      * @param string $defaultContentType
@@ -42,7 +39,7 @@ public function __construct(
         ErrorResponseGeneratorManagerInterface $errorHandlerManager,
         LoggerInterface $logger,
         LogMessageBuilderInterface $logMessageBuilder,
-        $defaultContentType = 'text/html'
+        string $defaultContentType = self::DEFAULT_CONTENT
     ) {
         $this->errorHandlerManager = $errorHandlerManager;
         $this->logger = $logger;
@@ -53,12 +50,13 @@ public function __construct(
     /**
      * Final handler for an application.
      *
-     * @param \Throwable|\Exception $e
+     * @param \Throwable $e
      * @param Request $request
      * @param Response $response
      * @return Response
+     * @throws InvalidArgumentException
      */
-    public function __invoke($e, Request $request, Response $response)
+    public function __invoke($e, Request $request, Response $response): Response
     {
         // Try to get an error handler for provided request accepted type
         $errorHandler = $this->resolveErrorHandlerFromAcceptHeader($request);
@@ -67,13 +65,13 @@ public function __invoke($e, Request $request, Response $response)
     }
 
     /**
-     * Tries to resolve
+     * Tries to resolve an error response generator based on request's accept header
      *
      * @param Request $request
      * @return callable
      * @throws InvalidArgumentException
      */
-    protected function resolveErrorHandlerFromAcceptHeader(Request $request)
+    protected function resolveErrorHandlerFromAcceptHeader(Request $request): callable
     {
         // Try to find an error handler for one of the accepted content types
         $accepts = $request->hasHeader('Accept') ? $request->getHeaderLine('Accept') : $this->defaultContentType;

src/ErrorHandler/ErrorResponseGeneratorInterface.php

@@ -9,7 +9,7 @@ interface ErrorResponseGeneratorInterface
     /**
      * Final handler for an application.
      *
-     * @param \Throwable|\Exception $e
+     * @param \Throwable $e
      * @param Request $request
      * @param Response $response
      * @return Response

test/ErrorHandler/ContentBasedErrorHandlerTest.php

@@ -34,7 +34,7 @@ public function setUp()
     public function factory($container, $name)
     {
         return function () use ($name) {
-            return $name;
+            return (new Response())->withHeader('Content-type', $name);
         };
     }
 
@@ -45,17 +45,17 @@ public function correctAcceptHeaderValueInvokesErrorHandler()
     {
         $request = ServerRequestFactory::fromGlobals()->withHeader('Accept', 'foo/bar,application/json');
         $result = $this->errorHandler->__invoke(null, $request, new Response());
-        $this->assertEquals('application/json', $result);
+        $this->assertEquals('application/json', $result->getHeaderLine('Content-type'));
     }
 
     /**
      * @test
      */
-    public function defaultContentTypeIsUsedWhenNoAcceptHeaderisPresent()
+    public function defaultContentTypeIsUsedWhenNoAcceptHeaderIsPresent()
     {
         $request = ServerRequestFactory::fromGlobals();
         $result = $this->errorHandler->__invoke(null, $request, new Response());
-        $this->assertEquals('text/html', $result);
+        $this->assertEquals('text/html', $result->getHeaderLine('Content-type'));
     }
 
     /**
@@ -65,7 +65,7 @@ public function defaultContentTypeIsUsedWhenAcceptedContentIsNotSupported()
     {
         $request = ServerRequestFactory::fromGlobals()->withHeader('Accept', 'foo/bar,text/xml');
         $result = $this->errorHandler->__invoke(null, $request, new Response());
-        $this->assertEquals('text/html', $result);
+        $this->assertEquals('text/html', $result->getHeaderLine('Content-type'));
     }
 
     /**
@@ -101,6 +101,6 @@ public function providedDefaultContentTypeIsUsed()
         );
         $request = ServerRequestFactory::fromGlobals()->withHeader('Accept', 'foo/bar,text/xml');
         $result = $this->errorHandler->__invoke(null, $request, new Response());
-        $this->assertEquals('application/json', $result);
+        $this->assertEquals('application/json', $result->getHeaderLine('Content-type'));
     }
 }