refactor done

Author: s3b4stian

.php-cs-fixer.php

@@ -7,7 +7,7 @@
         '@PSR12' => true,
         'no_whitespace_in_blank_line' => true,
         'return_type_declaration' => true,
-        'native_function_invocation' => ['include' => ['@all']],
+        'native_function_invocation' => ['include' => ['@compiler_optimized']],
         'phpdoc_align' => true,
         'phpdoc_separation' => true,
         'phpdoc_line_span' => ['property' => 'single', 'const' => 'single']

src/Linna/Authentication/EnhancedAuthenticationMapper.php

@@ -164,7 +164,7 @@ public function fetchLimit(int $offset, int $rowCount): array
     public function fetchAttemptsWithSameUser(string $userName, int $timeInSeconds): int
     {
         //handle time
-        $time = \date(DATE_ATOM, \time() - $timeInSeconds);
+        $time = date(DATE_ATOM, time() - $timeInSeconds);
 
         //make query
         $stmt = $this->pdo->prepare('SELECT count(user_name) as attempts FROM public.login_attempt WHERE user_name = :user_name AND date_time > :time');
@@ -187,7 +187,7 @@ public function fetchAttemptsWithSameUser(string $userName, int $timeInSeconds):
     public function fetchAttemptsWithSameSession(string $sessionId, int $timeInSeconds): int
     {
         //handle time
-        $time = \date(DATE_ATOM, \time() - $timeInSeconds);
+        $time = date(DATE_ATOM, time() - $timeInSeconds);
 
         //make query
         $stmt = $this->pdo->prepare('SELECT count(session_id) as attempts FROM public.login_attempt WHERE session_id = :session_id AND date_time > :time');
@@ -210,7 +210,7 @@ public function fetchAttemptsWithSameSession(string $sessionId, int $timeInSecon
     public function fetchAttemptsWithSameIp(string $ipAddress, int $timeInSeconds): int
     {
         //handle time
-        $time = \date(DATE_ATOM, \time() - $timeInSeconds);
+        $time = date(DATE_ATOM, time() - $timeInSeconds);
 
         //make query
         $stmt = $this->pdo->prepare('SELECT count(ip) as attempts FROM public.login_attempt WHERE ip = :ip AND date_time > :time');
@@ -232,7 +232,7 @@ public function fetchAttemptsWithSameIp(string $ipAddress, int $timeInSeconds):
     public function deleteOldLoginAttempts(int $timeInSeconds): bool
     {
         //handle time
-        $time = \date(DATE_ATOM, \time() - $timeInSeconds);
+        $time = date(DATE_ATOM, time() - $timeInSeconds);
 
         //make query
         $stmt = $this->pdo->prepare('DELETE FROM public.login_attempt WHERE date_time < :time');

src/Linna/Authorization/PermissionMapper.php

@@ -117,7 +117,7 @@ public function fetchById(int|string $permissionId): DomainObjectInterface
     public function fetchByName(string $permissionName): DomainObjectInterface
     {
         //handle permission name
-        $hashedPermissionName = \md5($permissionName);
+        $hashedPermissionName = md5($permissionName);
 
         //make query
         $stmt = $this->pdo->prepare(self::QUERY_BASE.' WHERE md5(name) = :name');
@@ -384,7 +384,7 @@ public function fetchUserPermissionHashTable(int $userId): array
         }
 
         //return result
-        return \array_flip($result);
+        return array_flip($result);
     }
 
     /**

src/Linna/Authorization/RoleMapper.php

@@ -111,7 +111,7 @@ public function fetchById(int|string $roleId): DomainObjectInterface
     public function fetchByName(string $roleName): DomainObjectInterface
     {
         //handle user name
-        $hashedRoleName = \md5($roleName);
+        $hashedRoleName = md5($roleName);
 
         //make query
         $stmt = $this->pdo->prepare(self::QUERY_BASE.' WHERE md5(name) = :name');

src/Linna/Authorization/UserExtendedMapper.php

@@ -101,7 +101,7 @@ protected function hydrator(array $array): array
                 description:     $value->description,
                 email:           $value->email,
                 password:        $value->password,
-                active:          $value->active,
+                active:          (int) $value->active,
                 created:         new DateTimeImmutable($value->created),
                 lastUpdate:      new DateTimeImmutable($value->last_update),
                 roles:           $roles,
@@ -133,7 +133,7 @@ protected function hydratorSingle(object $object): DomainObjectInterface
             description:     $object->description,
             email:           $object->email,
             password:        $object->password,
-            active:          $object->active,
+            active:          (int) $object->active,
             created:         new DateTimeImmutable($object->created),
             lastUpdate:      new DateTimeImmutable($object->last_update),
             roles:           $roles,
@@ -159,7 +159,7 @@ public function grantPermissionById(UserExtended &$user, string|int $permissionI
 
         try {
             //make query
-            $stmt = $this->pdo->prepare('INSERT INTO public.user_permission (user_id, permission_id) VALUES (:user_id, :permission_id) ON DUPLICATE KEY UPDATE user_id = :user_id, permission_id = :permission_id');
+            $stmt = $this->pdo->prepare('INSERT INTO public.user_permission (user_id, permission_id) VALUES (:user_id, :permission_id) ON CONFLICT (user_id, permission_id) DO UPDATE SET user_id = :user_id, permission_id = :permission_id');
 
             $stmt->bindParam(':user_id', $userId, PDO::PARAM_INT);
             $stmt->bindParam(':permission_id', $permissionId, PDO::PARAM_INT);
@@ -245,7 +245,7 @@ public function addRoleById(UserExtended &$user, int|string $roleId)
 
         try {
             //make query
-            $stmt = $this->pdo->prepare('INSERT INTO public.user_role (user_id, role_id) VALUES (:user_id, :role_id)  ON DUPLICATE KEY UPDATE user_id = :user_id, role_id = :role_id');
+            $stmt = $this->pdo->prepare('INSERT INTO public.user_role (user_id, role_id) VALUES (:user_id, :role_id)  ON CONFLICT (user_id, role_id) DO UPDATE SET user_id = :user_id, role_id = :role_id');
 
             $stmt->bindParam(':user_id', $userId, PDO::PARAM_INT);
             $stmt->bindParam(':role_id', $roleId, PDO::PARAM_INT);

src/Linna/Authorization/UserMapper.php

@@ -136,7 +136,7 @@ public function fetchById(int|string $userId): DomainObjectInterface
     public function fetchByName(string $userName): DomainObjectInterface
     {
         //handle user name
-        $hashedUserName = \md5($userName);
+        $hashedUserName = md5($userName);
 
         //make query
         $stmt = $this->pdo->prepare(self::QUERY_BASE.' WHERE md5(name) = :name');
@@ -411,7 +411,7 @@ protected function concreteInsert(DomainObjectInterface &$user): void
 
             $stmt->execute();
 
-            \settype($user->active, "integer");
+            settype($user->active, "integer");
 
             $user->setId((int) $this->pdo->lastInsertId());
         } catch (RuntimeException $e) {
@@ -450,7 +450,7 @@ protected function concreteUpdate(DomainObjectInterface $user): void
 
             $stmt->execute();
 
-            \settype($user->active, "integer");
+            settype($user->active, "integer");
 
         } catch (RuntimeException $e) {
             echo 'Update not compled, ', $e->getMessage(), "\n";

tests/Linna/Authorization/PermissionExtendedMapperTest.php

@@ -63,6 +63,6 @@ public static function setUpBeforeClass(): void
      */
     public static function tearDownAfterClass(): void
     {
-        self::$pdo->exec('ALTER TABLE permission AUTO_INCREMENT = 0');
+        //self::$pdo->exec('ALTER TABLE permission AUTO_INCREMENT = 0');
     }
 }

tests/Linna/Authorization/UserExtendedMapperTest.php

@@ -56,4 +56,14 @@ public static function setUpBeforeClass(): void
         self::$roleMapper = $roleMapper;
         self::$userExtendedMapper = $userExtendedMapper;
     }
+
+    /**
+     * Tear Down.
+     *
+     * @return void
+     */
+    public static function tearDownAfterClass(): void
+    {
+        self::$pdo->exec('ALTER SEQUENCE public.user_user_id_seq RESTART WITH 8 INCREMENT BY 1;');
+    }
 }