Merge pull request #1 from Lansoweb/php8

Php8
Lansoweb · May 7, 2021 · 5f6f258 · 5f6f258
2 parents 171d64d + 4eb2929
commit 5f6f258
Show file tree

Hide file tree

Showing 10 changed files with 58 additions and 64 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,28 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 3.4.1 - 2020-03-06
+
+### Added
+
+- Remove unecessary laminas dependency
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## 3.4.0 - 2020-01-08
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -2,26 +2,26 @@
     "name": "los/api-server",
     "description": "PHP api server middleware",
     "require": {
-        "php": "^7.2",
-        "psr/container": "^1.0",
+        "php": "^7.4 | ^8.0",
+        "ext-json": "*",
+        "psr/container": "^1.0 | ^2.0",
         "psr/http-message": "^1.0",
         "laminas/laminas-inputfilter": "^2.7",
         "laminas/laminas-paginator": "^2.7",
         "laminas/laminas-eventmanager": "^3.0",
         "psr/http-server-middleware": "^1.0",
-        "mezzio/mezzio-hal": "^1.0",
-        "mezzio/mezzio-helpers": "^5.0",
+        "mezzio/mezzio-hal": "^2.0",
+        "mezzio/mezzio-helpers": "^5.6",
         "mezzio/mezzio-problem-details": "^1.0",
         "laminas/laminas-diactoros": "^1.7 || ^2.2",
-        "los/uql": "^0.5",
-        "laminas/laminas-dependency-plugin": "^0.2"
+        "los/uql": "^1.1",
+        "doctrine/coding-standard": "^9.0"
     },
     "require-dev": {
-        "squizlabs/php_codesniffer": "^2.7",
+        "squizlabs/php_codesniffer": "^3.6",
         "phpstan/phpstan": "^0.12",
-        "laminas/laminas-coding-standard": "^1.0",
         "laminas/laminas-db": "^2.10",
-        "laminas/laminas-hydrator": "^3.0"
+        "laminas/laminas-hydrator": "^4.0"
     },
     "license": "MIT",
     "autoload-dev": {

diff --git a/src/Auth/AuthFactory.php b/src/Auth/AuthFactory.php
@@ -6,6 +6,9 @@
 use Interop\Container\ContainerInterface;
 use Mezzio\ProblemDetails\ProblemDetailsResponseFactory;
 
+/**
+ * @deprecated Use los/api-auth
+ */
 class AuthFactory
 {
     /**

diff --git a/src/Auth/AuthMiddleware.php b/src/Auth/AuthMiddleware.php
@@ -11,6 +11,9 @@
 use Psr\Http\Server\RequestHandlerInterface;
 use Mezzio\ProblemDetails\ProblemDetailsResponseFactory;
 
+/**
+ * @deprecated Use los/api-auth
+ */
 class AuthMiddleware implements MiddlewareInterface
 {
     /** @var array */

diff --git a/src/ConfigProvider.php b/src/ConfigProvider.php
@@ -7,20 +7,14 @@
 
 class ConfigProvider
 {
-    /**
-     * @return array
-     */
-    public function __invoke()
+    public function __invoke(): array
     {
         return [
             'dependencies' => $this->getDependencies(),
         ];
     }
 
-    /**
-     * @return array
-     */
-    public function getDependencies()
+    public function getDependencies(): array
     {
         return [
             'factories' => [

diff --git a/src/Entity/Entity.php b/src/Entity/Entity.php
@@ -13,7 +13,7 @@ class Entity implements EntityInterface
 
     const IDENTIFIER_NAME = 'id';
 
-    protected $fields = [];
+    protected array $fields = [];
 
     /**
      * Exchange internal values from provided array.

diff --git a/src/Handler/AbstractRestHandler.php b/src/Handler/AbstractRestHandler.php
@@ -24,20 +24,13 @@ abstract class AbstractRestHandler implements RequestHandlerInterface
 {
     const IDENTIFIER_NAME = 'id';
 
-    /** @var Entity */
-    protected $entityPrototype;
-    /** @var Request */
-    protected $request;
-    /** @var UrlHelper */
-    protected $urlHelper;
-    /** @var int  */
-    protected $itemCountPerPage = 25;
-    /** @var ProblemDetailsResponseFactory */
-    protected $problemDetailsResponseFactory;
-    /** @var ResourceGenerator */
-    private $resourceGenerator;
-    /** @var HalResponseFactory  */
-    private $responseFactory;
+    protected Entity $entityPrototype;
+    protected Request $request;
+    protected UrlHelper $urlHelper;
+    protected int $itemCountPerPage = 25;
+    protected ProblemDetailsResponseFactory $problemDetailsResponseFactory;
+    private ResourceGenerator $resourceGenerator;
+    private HalResponseFactory $responseFactory;
 
     /**
      * AbstractRestAction constructor.
@@ -160,13 +153,8 @@ protected function validateBody() : array
 
     /**
      * Generates a proper response based on the Entity ot Collection
-     *
-     * @param EntityInterface|Collection $entity
-     * @param int $code
-     * @throws \InvalidArgumentException
-     * @return Response
      */
-    protected function generateResponse($entity, $code = 200) : Response
+    protected function generateResponse($entity, int $code = 200) : Response
     {
         if ($entity instanceof Entity) {
             $resource = $this->resourceGenerator->fromObject($entity, $this->request);
@@ -351,10 +339,6 @@ public function update($id, array $data, array $where = []): EntityInterface
         throw MethodNotAllowedException::create();
     }
 
-    /**
-     * @param array $data
-     * @return Collection
-     */
     public function updateList(array $data) : Collection
     {
         throw MethodNotAllowedException::create();
@@ -374,12 +358,12 @@ public function deleteList()
         throw MethodNotAllowedException::create();
     }
 
-    public function head()
+    public function head(): Response
     {
         throw MethodNotAllowedException::create();
     }
 
-    public function options()
+    public function options(): Response
     {
         throw MethodNotAllowedException::create();
     }
@@ -395,10 +379,6 @@ public function patch($id, array $data, array $where = []): EntityInterface
         throw MethodNotAllowedException::create();
     }
 
-    /**
-     * @param array $data
-     * @return Collection
-     */
     public function patchList(array $data) : Collection
     {
         throw MethodNotAllowedException::create();

diff --git a/src/Handler/MapperRestHandler.php b/src/Handler/MapperRestHandler.php
@@ -17,11 +17,8 @@ abstract class MapperRestHandler extends AbstractRestHandler
 {
     const SORT_BY = self::IDENTIFIER_NAME;
 
-    /** @var MapperInterface */
-    protected $mapper;
-
-    /** @var int */
-    protected $limitItemsPerPage = 25;
+    protected MapperInterface $mapper;
+    protected int $limitItemsPerPage = 25;
 
     public function __construct(
         MapperInterface $mapper,
@@ -96,7 +93,6 @@ public function fetchAll(array $where = [], array $options = []): Collection
         $where = array_merge($where, $query);
         $hint = array_merge($options, $hint);
 
-        /** @var Collection $collection */
         $collection = $this->mapper->findBy($where, $hint);
 
         $page = (int) ($queryParams['page'] ?? $hint['page'] ?? 1);

diff --git a/src/Mapper/ZendDbMapper.php b/src/Mapper/ZendDbMapper.php
@@ -13,14 +13,10 @@
 
 class ZendDbMapper implements MapperInterface
 {
-    /** @var TableGateway */
-    protected $table;
-    /** @var string */
-    private $collectionClass;
-    /** @var int */
-    protected $limitItemsPerPage = 25;
-    /** @var int */
-    protected $itemCountPerPage = 25;
+    protected TableGateway $table;
+    private string $collectionClass;
+    protected int $limitItemsPerPage = 25;
+    protected int $itemCountPerPage = 25;
 
     const IDENTIFIER_NAME = 'id';
     const SORT_BY = 'name';

diff --git a/src/Paginator/MapperAdapter.php b/src/Paginator/MapperAdapter.php
@@ -8,8 +8,8 @@
 
 class MapperAdapter implements AdapterInterface
 {
-    private $mapper;
-    private $where;
+    private MapperInterface $mapper;
+    private array $where;
     private $order;
     private $group;