php 8.1 support

Author: s3b4stian

.gitignore

@@ -4,4 +4,6 @@ clover.xml
 infection-log.txt
 vendor/
 .phan/
-.phpunit.result.cache
+.php-cs-fixer.cache
+.phpunit.result.cache
+phpunit.local.xml

.php-cs-fixer.php

@@ -0,0 +1,15 @@
+<?php
+
+$config = new PhpCsFixer\Config();
+return $config
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@PSR12' => true,
+        'no_whitespace_in_blank_line' => true,
+        'return_type_declaration' => true,
+        'native_function_invocation' => ['include' => ['@all']],
+    ])
+    ->setFinder(PhpCsFixer\Finder::create()
+        ->exclude('vendor')
+        ->in(__DIR__)
+    );

.scrutinizer.yml

@@ -12,15 +12,14 @@
 
 <div align="center">
 
-[![Build Status](https://travis-ci.org/linna/auth-mapper-pgsql.svg?branch=master)](https://travis-ci.org/linna/auth-mapper-pgsql)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/linna/auth-mapper-pgsql/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/linna/auth-mapper-pgsql/?branch=master)
-[![Code Coverage](https://scrutinizer-ci.com/g/linna/auth-mapper-pgsql/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/linna/auth-mapper-pgsql/?branch=master)
 [![StyleCI](https://github.styleci.io/repos/209962835/shield?branch=master&style=flat)](https://github.styleci.io/repos/209962835)
 [![PDS Skeleton](https://img.shields.io/badge/pds-skeleton-blue.svg?style=flat)](https://github.com/php-pds/skeleton)
-[![PHP 7.4](https://img.shields.io/badge/PHP-7.4-8892BF.svg)](http://php.net)
+[![PHP 8.1](https://img.shields.io/badge/PHP-8.1-8892BF.svg)](http://php.net)
 
 </div>
 
+> **_NOTE:_**  Code porting to PHP 8.1 ongoing.
+
 # About
 This package provide a concrete implementation for authentication interfaces and 
 for the authorization interfaces of the framework.
@@ -29,7 +28,7 @@ Mappers use as persistent storage postgresql through php pdo.
 
 # Requirements
 
-   * PHP >= 7.4
+   * PHP >= 8.1
    * PDO extension
    * Postgresql extension
    * linna/framework v0.27.0

.travis.yml

@@ -17,13 +17,13 @@
         }
     ],
     "require": {
-        "php": "^7.4",
+        "php": ">=8.1",
         "ext-pdo": "*",
         "ext-pdo_pgsql": "*",
         "ext-pgsql": "*"
     },
     "require-dev": {
-        "infection/infection": "^0.15",
+        "infection/infection": "^0.21",
         "phpstan/phpstan": "^0.12",
         "phpunit/phpunit": "^9.0",
         "linna/framework": "dev-master",
@@ -32,13 +32,17 @@
     },
     "autoload": {
         "psr-4": {
-            "Linna\\Authentication\\": "src/Authentication/",
-            "Linna\\Authorization\\": "src/Authorization/"
+            "Linna\\": "src/Linna/"
         }
     },
     "autoload-dev": {
-        "psr-4": { 
-            "Linna\\Tests\\":  ["tests/Authentication", "tests/Authorization"]
+        "psr-4": {
+            "Linna\\":  "tests/Linna/"
+        }
+    },
+    "config": {
+        "allow-plugins": {
+            "infection/extension-installer": true
         }
     }
 }

README.md

@@ -47,11 +47,11 @@ public function __construct(ExtendedPDO $pdo)
     /**
      * Fetch a login attempt by id.
      *
-     * @param int $loginAttemptId
+     * @param string|int $loginAttemptId
      *
      * @return DomainObjectInterface
      */
-    public function fetchById(int $loginAttemptId): DomainObjectInterface
+    public function fetchById(string|int $loginAttemptId): DomainObjectInterface
     {
         $pdos = $this->pdo->prepare("{$this->baseQuery} WHERE login_attempt_id = :id");
 
@@ -201,8 +201,10 @@ protected function concreteCreate(): DomainObjectInterface
      * storage record.
      *
      * @param DomainObjectInterface $loginAttempt
+     *
+     * @return void
      */
-    protected function concreteInsert(DomainObjectInterface &$loginAttempt)
+    protected function concreteInsert(DomainObjectInterface &$loginAttempt): void
     {
         $this->checkDomainObjectType($loginAttempt);
 
@@ -226,8 +228,10 @@ protected function concreteInsert(DomainObjectInterface &$loginAttempt)
      * Update a LoginAttempt object in persistent storage.
      *
      * @param DomainObjectInterface $loginAttempt
+     *
+     * @return void
      */
-    protected function concreteUpdate(DomainObjectInterface $loginAttempt)
+    protected function concreteUpdate(DomainObjectInterface $loginAttempt): void
     {
         $this->checkDomainObjectType($loginAttempt);
 
@@ -255,8 +259,10 @@ protected function concreteUpdate(DomainObjectInterface $loginAttempt)
      * deletion.
      *
      * @param DomainObjectInterface $domainObject
+     *
+     * @return void
      */
-    protected function concreteDelete(DomainObjectInterface &$loginAttempt)
+    protected function concreteDelete(DomainObjectInterface &$loginAttempt): void
     {
         $this->checkDomainObjectType($loginAttempt);
 
@@ -278,9 +284,11 @@ protected function concreteDelete(DomainObjectInterface &$loginAttempt)
      *
      * @param DomainObjectInterface $domainObject
      *
+     * @return void
+     *
      * @throws InvalidArgumentException if the domain object isn't of the type required by mapper
      */
-    protected function checkDomainObjectType(DomainObjectInterface $domainObject)
+    protected function checkDomainObjectType(DomainObjectInterface $domainObject): void
     {
         if (!($domainObject instanceof LoginAttempt)) {
             throw new InvalidArgumentException('Domain Object parameter must be instance of LoginAttempt class');

composer.json

@@ -56,11 +56,11 @@ public function __construct(ExtendedPDO $pdo, Password $password)
     /**
      * Fetch a user by id.
      *
-     * @param int $userId
+     * @param string|int $userId
      *
      * @return DomainObjectInterface
      */
-    public function fetchById(int $userId): DomainObjectInterface
+    public function fetchById(string|int $userId): DomainObjectInterface
     {
         $pdos = $this->pdo->prepare("{$this->baseQuery} WHERE user_id = :id");
 
@@ -146,8 +146,10 @@ protected function concreteCreate(): DomainObjectInterface
      * storage record.
      *
      * @param DomainObjectInterface $user
+     *
+     * @return void
      */
-    protected function concreteInsert(DomainObjectInterface &$user)
+    protected function concreteInsert(DomainObjectInterface &$user): void
     {
         $this->checkDomainObjectType($user);
 
@@ -171,8 +173,10 @@ protected function concreteInsert(DomainObjectInterface &$user)
      * Update a User object in persistent storage.
      *
      * @param DomainObjectInterface $user
+     *
+     * @return void
      */
-    protected function concreteUpdate(DomainObjectInterface $user)
+    protected function concreteUpdate(DomainObjectInterface $user): void
     {
         $this->checkDomainObjectType($user);
 
@@ -200,8 +204,10 @@ protected function concreteUpdate(DomainObjectInterface $user)
      * deletion.
      *
      * @param DomainObjectInterface $domainObject
+     *
+     * @return void
      */
-    protected function concreteDelete(DomainObjectInterface &$user)
+    protected function concreteDelete(DomainObjectInterface &$user): void
     {
         $this->checkDomainObjectType($user);
 
@@ -223,9 +229,11 @@ protected function concreteDelete(DomainObjectInterface &$user)
      *
      * @param DomainObjectInterface $domainObject
      *
+     * @return void
+     *
      * @throws InvalidArgumentException if the domain object isn't of the type required by mapper
      */
-    protected function checkDomainObjectType(DomainObjectInterface $domainObject)
+    protected function checkDomainObjectType(DomainObjectInterface $domainObject): void
     {
         if (!($domainObject instanceof User)) {
             throw new InvalidArgumentException('Domain Object parameter must be instance of User class');

phpunit.scrutinizer.xml

@@ -62,7 +62,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function fetchById(int $userId): DomainObjectInterface
+    public function fetchById(string|int $userId): DomainObjectInterface
     {
         $roles = $this->roleToUserMapper->fetchByUserId($userId);
         $permissions = $this->permissionMapper->fetchByUserId($userId);
@@ -132,7 +132,7 @@ public function fetchByPermission(Permission $permission): array
     /**
      * {@inheritdoc}
      */
-    public function fetchByPermissionId(int $permissionId): array
+    public function fetchByPermissionId(string|int $permissionId): array
     {
         $pdos = $this->pdo->prepare('
         (SELECT u.user_id AS "id", u.uuid, u.name, u.email, u.description, 
@@ -163,7 +163,7 @@ public function fetchByPermissionName(string $permissionName): array
     {
         $permission = $this->permissionMapper->fetchByName($permissionName);
 
-        return $this->fetchByPermissionId($permission->getId());
+        return $this->fetchByPermissionId((int) $permission->getId());
     }
 
     /**
@@ -177,7 +177,7 @@ public function fetchByRole(Role $role): array
     /**
      * {@inheritdoc}
      */
-    public function fetchByRoleId(int $roleId): array
+    public function fetchByRoleId(string|int $roleId): array
     {
         $pdos = $this->pdo->prepare('
         SELECT u.user_id AS "id", u.uuid, u.name, u.email, u.description, 
@@ -263,7 +263,7 @@ public function grantPermission(EnhancedUser &$user, Permission $permission)
     /**
      * {@inheritdoc}
      */
-    public function grantPermissionById(EnhancedUser &$user, int $permissionId)
+    public function grantPermissionById(EnhancedUser &$user, string|int $permissionId)
     {
         $userId = $user->getId();
 
@@ -301,7 +301,7 @@ public function revokePermission(EnhancedUser &$user, Permission $permission)
     /**
      * {@inheritdoc}
      */
-    public function revokePermissionById(EnhancedUser &$user, int $permissionId)
+    public function revokePermissionById(EnhancedUser &$user, string|int $permissionId)
     {
         $userId = $user->getId();
 
@@ -335,7 +335,7 @@ public function addRole(EnhancedUser &$user, Role $role)
     /**
      * {@inheritdoc}
      */
-    public function addRoleById(EnhancedUser &$user, int $roleId)
+    public function addRoleById(EnhancedUser &$user, string|int $roleId)
     {
         $userId = $user->getId();
 
@@ -383,7 +383,7 @@ public function removeRole(EnhancedUser &$user, Role $role)
     /**
      * {@inheritdoc}
      */
-    public function removeRoleById(EnhancedUser &$user, int $roleId)
+    public function removeRoleById(EnhancedUser &$user, string|int $roleId)
     {
         $userId = $user->getId();
 
@@ -423,7 +423,7 @@ protected function concreteCreate(): DomainObjectInterface
     /**
      * {@inheritdoc}
      */
-    protected function checkDomainObjectType(DomainObjectInterface $domainObject)
+    protected function checkDomainObjectType(DomainObjectInterface $domainObject): void
     {
         if (!($domainObject instanceof EnhancedUser)) {
             throw new InvalidArgumentException('Domain Object parameter must be instance of EnhancedUser class');