v0.2.0 release

s3b4stian · s3b4stian · commit 044d574c78b8 · 2022-10-03T20:23:07.000Z
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -8,6 +8,9 @@
         'no_whitespace_in_blank_line' => true,
         'return_type_declaration' => true,
         'native_function_invocation' => ['include' => ['@all']],
+        'phpdoc_align' => true,
+        'phpdoc_separation' => true,
+        'phpdoc_line_span' => ['property' => 'single', 'const' => 'single']
     ])
     ->setFinder(PhpCsFixer\Finder::create()
         ->exclude('vendor')
diff --git a/.styleci.yml b/.styleci.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,10 +6,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [v0.2.0](https://github.com/linna/auth-mapper-pgsql/compare/v0.2.0...master) - 2020-XX-XX
+## [v0.2.0](https://github.com/linna/auth-mapper-pgsql/compare/v0.2.0...master) - 2022-10-03
 
 * Start with v0.2.0 for match `auth-mapper-mysql` version
 
+### Changed
+* PHP 8.1 required
+* strict typing updated to provide compatibility with the next version of the framework
+* `composer.json` `require` and `require-dev` sections updated
+* tests updated
+
 ### Added
 * `Linna\Authentication\EnhancedAuthenticationMapper` class
 * `Linna\Authentication\UserMapper` class
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <div align="center">
-    <a href="#"><img src="logo-linna-96.png" alt="Linna Logo"></a>
+    <a href="#"><img src="logo-linna-128.png" alt="Linna Logo"></a>
 </div>
 
 <br/>
@@ -13,7 +13,6 @@
 <div align="center">
 
 [![Tests](https://github.com/linna/auth-mapper-pgsql/actions/workflows/tests.yml/badge.svg)](https://github.com/linna/auth-mapper-pgsql/actions/workflows/tests.yml)
-[![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 8.1](https://img.shields.io/badge/PHP-8.1-8892BF.svg)](http://php.net)
 
diff --git a/composer.json b/composer.json
@@ -23,10 +23,10 @@
         "ext-pgsql": "*"
     },
     "require-dev": {
-        "infection/infection": "^0.21",
-        "phpstan/phpstan": "^0.12",
-        "phpunit/phpunit": "^9.0",
-        "linna/framework": "dev-master",
+        "infection/infection": ">=0.26",
+        "phpstan/phpstan": ">=1.8",
+        "phpunit/phpunit": ">=9.0",
+        "linna/framework": "^0.27.0",
         "linna/db-dumps": "dev-master",
         "linna/auth-mapper-test-trait": "dev-master"
     },
diff --git a/logo-linna-128.png b/logo-linna-128.png
diff --git a/logo-linna-96.png b/logo-linna-96.png
diff --git a/src/Linna/Authentication/EnhancedAuthenticationMapper.php b/src/Linna/Authentication/EnhancedAuthenticationMapper.php
@@ -24,14 +24,10 @@
  */
 class EnhancedAuthenticationMapper extends MapperAbstract implements EnhancedAuthenticationMapperInterface
 {
-    /**
-     * @var ExtendedPDO Database Connection
-     */
+    /** @var ExtendedPDO Database Connection */
     protected ExtendedPDO $pdo;
 
-    /**
-     * @var string Constant part of SELECT query
-     */
+    /** @var string Constant part of SELECT query */
     protected string $baseQuery = 'SELECT login_attempt_id AS "id", user_name AS "userName", session_id AS "sessionId", ip as "ipAddress", date_time AS "when", created, last_update AS lastUpdate FROM public.login_attempt';
 
     /**
diff --git a/src/Linna/Authentication/UserMapper.php b/src/Linna/Authentication/UserMapper.php
@@ -25,19 +25,13 @@
  */
 class UserMapper extends MapperAbstract implements UserMapperInterface
 {
-    /**
-     * @var Password Password util for user object
-     */
+    /** @var Password Password util for user object */
     protected Password $password;
 
-    /**
-     * @var ExtendedPDO Database Connection
-     */
+    /** @var ExtendedPDO Database Connection */
     protected ExtendedPDO $pdo;
 
-    /**
-     * @var string Constant part of SELECT query
-     */
+    /** @var string Constant part of SELECT query */
     protected string $baseQuery = 'SELECT user_id AS "id", uuid, name, email, description, password, active, created, last_update AS "lastUpdate" FROM public.user';
 
     /**
diff --git a/src/Linna/Authorization/EnhancedUserMapper.php b/src/Linna/Authorization/EnhancedUserMapper.php
@@ -27,14 +27,10 @@
  */
 class EnhancedUserMapper extends UserMapper implements EnhancedUserMapperInterface
 {
-    /**
-     * @var PermissionMapperInterface Permission Mapper
-     */
+    /** @var PermissionMapperInterface Permission Mapper */
     protected PermissionMapperInterface $permissionMapper;
 
-    /**
-     * @var RoleToUserMapperInterface Role to user Mapper
-     */
+    /** @var RoleToUserMapperInterface Role to user Mapper */
     protected RoleToUserMapperInterface $roleToUserMapper;
 
     /**
diff --git a/src/Linna/Authorization/PermissionMapper.php b/src/Linna/Authorization/PermissionMapper.php
@@ -24,14 +24,10 @@
  */
 class PermissionMapper extends MapperAbstract implements PermissionMapperInterface
 {
-    /**
-     * @var ExtendedPDO Database Connection
-     */
+    /** @var ExtendedPDO Database Connection */
     protected ExtendedPDO $pdo;
 
-    /**
-     * @var string Constant part of SELECT query
-     */
+    /** @var string Constant part of SELECT query */
     protected string $baseQuery = 'SELECT permission_id AS "id", name, description, last_update AS "lastUpdate" FROM public.permission';
 
     /**
diff --git a/src/Linna/Authorization/RoleMapper.php b/src/Linna/Authorization/RoleMapper.php
@@ -27,29 +27,19 @@
  */
 class RoleMapper extends MapperAbstract implements RoleMapperInterface
 {
-    /**
-     * @var ExtendedPDO Database Connection
-     */
+    /** @var ExtendedPDO Database Connection */
     protected ExtendedPDO $pdo;
 
-    /**
-     * @var PermissionMapperInterface Permission Mapper
-     */
+    /** @var PermissionMapperInterface Permission Mapper */
     protected PermissionMapperInterface $permissionMapper;
 
-    /**
-     * @var UserMapperInterface Permission Mapper
-     */
+    /** @var UserMapperInterface Permission Mapper */
     protected UserMapperInterface $userMapper;
 
-    /**
-     * @var RoleToUserMapperInterface Role To User Mapper
-     */
+    /** @var RoleToUserMapperInterface Role To User Mapper */
     protected RoleToUserMapperInterface $roleToUserMapper;
 
-    /**
-     * @var string Constant part of SELECT query
-     */
+    /** @var string Constant part of SELECT query */
     protected string $baseQuery = 'SELECT role_id AS "id", name, description, active, created, last_update AS "lastUpdate" FROM public.role';
 
     /**
diff --git a/src/Linna/Authorization/RoleToUserMapper.php b/src/Linna/Authorization/RoleToUserMapper.php
@@ -21,14 +21,10 @@
  */
 class RoleToUserMapper implements RoleToUserMapperInterface
 {
-    /**
-     * @var Password Password utility for user object
-     */
+    /** @var Password Password utility for user object */
     protected Password $password;
 
-    /**
-     * @var ExtendedPDO Database Connection
-     */
+    /** @var ExtendedPDO Database Connection */
     protected ExtendedPDO $pdo;
 
     /**
diff --git a/tests/Linna/Authentication/EnhancedAuthenticationMapperTest.php b/tests/Linna/Authentication/EnhancedAuthenticationMapperTest.php
@@ -22,9 +22,7 @@ class EnhancedAuthenticationMapperTest extends TestCase
 {
     use EnhancedAuthenticationMapperTrait;
 
-    /**
-     * @var string Date format string.
-     */
+    /** @var string Date format string. */
     protected static string $date_format = DATE_ATOM;
 
     /**
diff --git a/tests/Linna/Authentication/UserMapperTest.php b/tests/Linna/Authentication/UserMapperTest.php
@@ -44,6 +44,8 @@ public static function setUpBeforeClass(): void
 
         self::$pdo = $pdo;
         self::$userMapper = new UserMapper($pdo, new Password());
+
+        self::$pdo->exec('ALTER SEQUENCE public.user_user_id_seq RESTART WITH 8 INCREMENT BY 1;');
     }
 
     /**
