Refactor: PHP8 and grizz-it/services support

.travis.yml

@@ -1,10 +1,8 @@
 language: php
 php:
-    - '7.3'
-    - '7.4'
+    - '8.0'
 
 before_script:
-    - yes '' | pecl install yaml
     - composer install
 
 script:

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 3.1.0 - 2021-04-03
+
+### Added
+- Support for PHP8
+
+### Changed
+- Support from `ulrack/services` to `grizz-it/services`.
+
 ## 3.0.1 - 2021-01-17
 
 ### Fixed
@@ -43,7 +51,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - The initial implementation of the package.
 
 # Versions
-- [3.0.1 > Unreleased](https://github.com/ulrack/web/compare/3.0.1...HEAD)
+- [3.1.0 > Unreleased](https://github.com/ulrack/web/compare/3.1.0...HEAD)
+- [3.0.1 > 3.1.0](https://github.com/ulrack/web/compare/3.0.1...3.1.0)
 - [3.0.0 > 3.0.1](https://github.com/ulrack/web/compare/3.0.0...3.0.1)
 - [2.0.0 > 3.0.0](https://github.com/ulrack/web/compare/2.0.0...3.0.0)
 - [1.0.1 > 2.0.0](https://github.com/ulrack/web/compare/1.0.1...2.0.0)

composer.json

@@ -11,13 +11,13 @@
     "prefer-stable": true,
     "minimum-stability": "stable",
     "require": {
-        "php": "^7.3",
-        "grizz-it/codec": "^1.0",
-        "grizz-it/configuration": "^1.1",
-        "grizz-it/enum": "^1.0",
-        "grizz-it/http": "^1.0",
-        "grizz-it/translator": "^1.1",
-        "ulrack/services": "^3.0"
+        "php": "^8.0",
+        "grizz-it/codec": "^1.1",
+        "grizz-it/configuration": "^1.3",
+        "grizz-it/enum": "^1.1",
+        "grizz-it/http": "^1.1",
+        "grizz-it/services": "^1.0",
+        "grizz-it/translator": "^1.2"
     },
     "authors": [
         {
@@ -55,7 +55,7 @@
         ]
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.3",
+        "phpunit/phpunit": "^9.5",
         "squizlabs/php_codesniffer": "^3.5"
     }
 }

docs/usage/error.md

@@ -13,11 +13,13 @@ services. These are
 A definition for an error looks like the following:
 ```json
 {
-    "web.errors.default.api.400": {
-        "class": "\\Ulrack\\Web\\Component\\Error\\ConfigurableApiError",
-        "parameters": {
-            "errorStatusCode": 400,
-            "errorMessage": "Bad Request"
+    "services": {
+        "web.errors.default.api.400": {
+            "class": "\\Ulrack\\Web\\Component\\Error\\ConfigurableApiError",
+            "parameters": {
+                "errorStatusCode": 400,
+                "errorMessage": "Bad Request"
+            }
         }
     }
 }

src/Common/Endpoint/InputInterface.php

@@ -34,7 +34,7 @@ public function hasParameter(string $key): bool;
      *
      * @return mixed
      */
-    public function getParameter(string $key);
+    public function getParameter(string $key): mixed;
 
     /**
      * Retrieves all parameters.
@@ -51,7 +51,7 @@ public function getParameters(): array;
      *
      * @return void
      */
-    public function setParameter(string $key, $value): void;
+    public function setParameter(string $key, mixed $value): void;
 
     /**
      * Retrieves a list of keys of available parameters.

src/Common/Endpoint/OutputInterface.php

@@ -14,7 +14,7 @@ interface OutputInterface
      *
      * @return mixed
      */
-    public function getOutput();
+    public function getOutput(): mixed;
 
     /**
      * Sets the value of the output.
@@ -23,7 +23,7 @@ public function getOutput();
      *
      * @return void
      */
-    public function setOutput($output): void;
+    public function setOutput(mixed $output): void;
 
     /**
      * Sets the serving protocol.

src/Component/Endpoint/Input.php

@@ -17,14 +17,14 @@ class Input implements InputInterface
      *
      * @var RequestInterface
      */
-    private $request;
+    private RequestInterface $request;
 
     /**
      * Contains the parameters for the input.
      *
      * @var array
      */
-    private $parameters = [];
+    private array $parameters = [];
 
     /**
      * Constructor.
@@ -65,7 +65,7 @@ public function hasParameter(string $key): bool
      *
      * @return mixed
      */
-    public function getParameter(string $key)
+    public function getParameter(string $key): mixed
     {
         return $this->parameters[$key];
     }
@@ -88,7 +88,7 @@ public function getParameters(): array
      *
      * @return void
      */
-    public function setParameter(string $key, $value): void
+    public function setParameter(string $key, mixed $value): void
     {
         $this->parameters[$key] = $value;
     }

src/Component/Endpoint/Output.php

@@ -16,49 +16,49 @@ class Output implements OutputInterface
      *
      * @var string
      */
-    private $protocol;
+    private string $protocol;
 
     /**
      * Contains the status code for the response.
      *
      * @var int
      */
-    private $statusCode = 200;
+    private int $statusCode = 200;
 
     /**
      * Contains the headers for the response.
      *
      * @var string[]
      */
-    private $headers = [];
+    private array $headers = [];
 
     /**
      * Contains the parameters.
      *
      * @var array
      */
-    private $parameters = [];
+    private array $parameters = [];
 
     /**
      * Contains the chosen content type.
      *
      * @var string
      */
-    private $contentType = '';
+    private string $contentType = '';
 
     /**
      * Contains the output of the response.
      *
      * @var mixed
      */
-    private $output;
+    private mixed $output;
 
     /**
      * Contains the accepted content types.
      *
      * @var string[]
      */
-    private $acceptedContentTypes;
+    private array $acceptedContentTypes;
 
     /**
      * Constructor.
@@ -78,7 +78,7 @@ public function __construct(string ...$acceptedContentTypes)
      *
      * @return mixed
      */
-    public function getOutput()
+    public function getOutput(): mixed
     {
         return $this->output;
     }
@@ -90,7 +90,7 @@ public function getOutput()
      *
      * @return void
      */
-    public function setOutput($output): void
+    public function setOutput(mixed $output): void
     {
         $this->output = $output;
     }
@@ -237,7 +237,7 @@ public function hasParameter(string $key): bool
      *
      * @return mixed
      */
-    public function getParameter(string $key)
+    public function getParameter(string $key): mixed
     {
         return $this->parameters[$key];
     }
@@ -250,7 +250,7 @@ public function getParameter(string $key)
      *
      * @return void
      */
-    public function setParameter(string $key, $value): void
+    public function setParameter(string $key, mixed $value): void
     {
         $this->parameters[$key] = $value;
     }

src/Component/Error/ConfigurableApiError.php

@@ -19,35 +19,35 @@ class ConfigurableApiError implements ErrorInterface
      *
      * @var int
      */
-    private $errorStatusCode;
+    private int $errorStatusCode;
 
     /**
      * Contains the error code.
      *
-     * @var int
+     * @var int|null
      */
-    private $errorCode;
+    private ?int $errorCode;
 
     /**
      * Contains the error message.
      *
-     * @var string
+     * @var string|null
      */
-    private $errorMessage;
+    private ?string $errorMessage;
 
     /**
      * Contains the default content type.
      *
      * @var string
      */
-    private $defaultContentType;
+    private string $defaultContentType;
 
     /**
      * Constructor.
      *
      * @param int $errorStatusCode
-     * @param int $errorCode
-     * @param string $errorMessage
+     * @param int|null $errorCode
+     * @param string|null $errorMessage
      * @param string $defaultContentType
      */
     public function __construct(

src/Component/Error/ConfigurablePlainError.php

@@ -19,29 +19,28 @@ class ConfigurablePlainError implements ErrorInterface
      *
      * @var int
      */
-    private $errorStatusCode;
+    private int $errorStatusCode;
 
     /**
      * Contains the error code.
      *
-     * @var int
+     * @var int|null
      */
-    private $errorCode;
+    private ?int $errorCode;
 
     /**
      * Contains the error message.
      *
-     * @var string
+     * @var string|null
      */
-    private $errorMessage;
+    private ?string $errorMessage;
 
     /**
      * Constructor.
      *
      * @param int $errorStatusCode
-     * @param int $errorCode
-     * @param string $errorMessage
-     * @param string $defaultContentType
+     * @param int|null $errorCode
+     * @param string|null $errorMessage
      */
     public function __construct(
         int $errorStatusCode,

src/Component/Error/ErrorHandler.php

@@ -22,28 +22,28 @@ class ErrorHandler implements ErrorHandlerInterface
      *
      * @var InputInterface
      */
-    private $input;
+    private InputInterface $input;
 
     /**
      * Contains a reference to the output.
      *
      * @var OutputInterface
      */
-    private $output;
+    private OutputInterface $output;
 
     /**
      * Contains the output handler.
      *
      * @var OutputHandlerInterface
      */
-    private $outputHandler;
+    private OutputHandlerInterface $outputHandler;
 
     /**
      * Contains the error registry.
      *
      * @var ErrorRegistryInterface
      */
-    private $errorRegistry;
+    private ErrorRegistryInterface $errorRegistry;
 
     /**
      * Constructor.

src/Component/Error/ErrorRegistry.php

@@ -17,7 +17,7 @@ class ErrorRegistry implements ErrorRegistryInterface
      *
      * @var ErrorInterface[]
      */
-    private $errors;
+    private array $errors;
 
     /**
      * Constructor.

src/Component/Middleware/HostMatchingMiddleware.php

@@ -18,7 +18,7 @@ class HostMatchingMiddleware implements MiddlewareInterface
      *
      * @var string[]
      */
-    private $hosts;
+    private array $hosts;
 
     /**
      * Constructor.

src/Component/Middleware/MethodMatchingMiddleware.php

@@ -18,7 +18,7 @@ class MethodMatchingMiddleware implements MiddlewareInterface
      *
      * @var string[]
      */
-    private $methods;
+    private array $methods;
 
     /**
      * Constructor.