Skip to content

Commit e9bcba7

Browse files
s3b4stians3b4stian
committed
v0.28.0 framework compatibility
1 parent 044d574 commit e9bcba7

6 files changed

Lines changed: 25 additions & 25 deletions

File tree

‎src/Linna/Authentication/EnhancedAuthenticationMapper.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ public function __construct(ExtendedPDO $pdo)
4343
/**
4444
* Fetch a login attempt by id.
4545
*
46-
* @param string|int $loginAttemptId
46+
* @param int|string $loginAttemptId
4747
*
4848
* @return DomainObjectInterface
4949
*/
50-
public function fetchById(string|int $loginAttemptId): DomainObjectInterface
50+
public function fetchById(int|string $loginAttemptId): DomainObjectInterface
5151
{
5252
$pdos = $this->pdo->prepare("{$this->baseQuery} WHERE login_attempt_id = :id");
5353

‎src/Linna/Authentication/UserMapper.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ public function __construct(ExtendedPDO $pdo, Password $password)
4949
/**
5050
* Fetch a user by id.
5151
*
52-
* @param string|int $userId
52+
* @param int|string $userId
5353
*
5454
* @return DomainObjectInterface
5555
*/
56-
public function fetchById(string|int $userId): DomainObjectInterface
56+
public function fetchById(int|string $userId): DomainObjectInterface
5757
{
5858
$pdos = $this->pdo->prepare("{$this->baseQuery} WHERE user_id = :id");
5959

‎src/Linna/Authorization/EnhancedUserMapper.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function __construct(
5656
/**
5757
* {@inheritdoc}
5858
*/
59-
public function fetchById(string|int $userId): DomainObjectInterface
59+
public function fetchById(int|string $userId): DomainObjectInterface
6060
{
6161
$roles = $this->roleToUserMapper->fetchByUserId($userId);
6262
$permissions = $this->permissionMapper->fetchByUserId($userId);
@@ -126,7 +126,7 @@ public function fetchByPermission(Permission $permission): array
126126
/**
127127
* {@inheritdoc}
128128
*/
129-
public function fetchByPermissionId(string|int $permissionId): array
129+
public function fetchByPermissionId(int|string $permissionId): array
130130
{
131131
$pdos = $this->pdo->prepare('
132132
(SELECT u.user_id AS "id", u.uuid, u.name, u.email, u.description,
@@ -171,7 +171,7 @@ public function fetchByRole(Role $role): array
171171
/**
172172
* {@inheritdoc}
173173
*/
174-
public function fetchByRoleId(string|int $roleId): array
174+
public function fetchByRoleId(int|string $roleId): array
175175
{
176176
$pdos = $this->pdo->prepare('
177177
SELECT u.user_id AS "id", u.uuid, u.name, u.email, u.description,
@@ -257,7 +257,7 @@ public function grantPermission(EnhancedUser &$user, Permission $permission)
257257
/**
258258
* {@inheritdoc}
259259
*/
260-
public function grantPermissionById(EnhancedUser &$user, string|int $permissionId)
260+
public function grantPermissionById(EnhancedUser &$user, int|string $permissionId)
261261
{
262262
$userId = $user->getId();
263263

@@ -295,7 +295,7 @@ public function revokePermission(EnhancedUser &$user, Permission $permission)
295295
/**
296296
* {@inheritdoc}
297297
*/
298-
public function revokePermissionById(EnhancedUser &$user, string|int $permissionId)
298+
public function revokePermissionById(EnhancedUser &$user, int|string $permissionId)
299299
{
300300
$userId = $user->getId();
301301

@@ -329,7 +329,7 @@ public function addRole(EnhancedUser &$user, Role $role)
329329
/**
330330
* {@inheritdoc}
331331
*/
332-
public function addRoleById(EnhancedUser &$user, string|int $roleId)
332+
public function addRoleById(EnhancedUser &$user, int|string $roleId)
333333
{
334334
$userId = $user->getId();
335335

@@ -377,7 +377,7 @@ public function removeRole(EnhancedUser &$user, Role $role)
377377
/**
378378
* {@inheritdoc}
379379
*/
380-
public function removeRoleById(EnhancedUser &$user, string|int $roleId)
380+
public function removeRoleById(EnhancedUser &$user, int|string $roleId)
381381
{
382382
$userId = $user->getId();
383383

‎src/Linna/Authorization/PermissionMapper.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function __construct(ExtendedPDO $pdo)
4343
/**
4444
* {@inheritdoc}
4545
*/
46-
public function fetchById(string|int $permissionId): DomainObjectInterface
46+
public function fetchById(int|string $permissionId): DomainObjectInterface
4747
{
4848
$pdos = $this->pdo->prepare("{$this->baseQuery} WHERE permission_id = :id");
4949

@@ -111,7 +111,7 @@ public function fetchByRole(Role $role): array
111111
/**
112112
* {@inheritdoc}
113113
*/
114-
public function fetchByRoleId(string|int $roleId): array
114+
public function fetchByRoleId(int|string $roleId): array
115115
{
116116
$pdos = $this->pdo->prepare('
117117
SELECT p.permission_id AS "id", p.name, p.description, p.last_update AS "lastUpdate"
@@ -161,7 +161,7 @@ public function fetchByUser(EnhancedUser $user): array
161161
/**
162162
* {@inheritdoc}
163163
*/
164-
public function fetchByUserId(string|int $userId): array
164+
public function fetchByUserId(int|string $userId): array
165165
{
166166
$pdos = $this->pdo->prepare('
167167
(SELECT p.permission_id AS "id", p.name, p.description,
@@ -227,7 +227,7 @@ public function fetchByUserName(string $userName): array
227227
/**
228228
* {@inheritdoc}
229229
*/
230-
public function fetchUserPermissionHashTable(string|int $userId): array
230+
public function fetchUserPermissionHashTable(int|string $userId): array
231231
{
232232
$pdos = $this->pdo->prepare("(SELECT encode(digest(concat(u.user_id, '.', up.permission_id), 'sha256'), 'hex') AS p_hash
233233
FROM public.user AS u
@@ -254,7 +254,7 @@ public function fetchUserPermissionHashTable(string|int $userId): array
254254
/**
255255
* {@inheritdoc}
256256
*/
257-
public function permissionExistById(string|int $permissionId): bool
257+
public function permissionExistById(int|string $permissionId): bool
258258
{
259259
$pdos = $this->pdo->prepare('SELECT permission_id FROM public.permission WHERE permission_id = :id');
260260

‎src/Linna/Authorization/RoleMapper.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public function __construct(
6565
/**
6666
* {@inheritdoc}
6767
*/
68-
public function fetchById(string|int $roleId): DomainObjectInterface
68+
public function fetchById(int|string $roleId): DomainObjectInterface
6969
{
7070
$users = $this->roleToUserMapper->fetchByRoleId($roleId);
7171
$permissions = $this->permissionMapper->fetchByRoleId($roleId);
@@ -143,7 +143,7 @@ public function fetchByPermission(Permission $permission): array
143143
/**
144144
* {@inheritdoc}
145145
*/
146-
public function fetchByPermissionId(string|int $permissionId): array
146+
public function fetchByPermissionId(int|string $permissionId): array
147147
{
148148
$pdos = $this->pdo->prepare('
149149
SELECT r.role_id AS "id", r.name, r.description, r.active, r.created, r.last_update AS "lastUpdate"
@@ -179,7 +179,7 @@ public function fetchByUser(EnhancedUser $user): array
179179
/**
180180
* {@inheritdoc}
181181
*/
182-
public function fetchByUserId(string|int $userId): array
182+
public function fetchByUserId(int|string $userId): array
183183
{
184184
$pdos = $this->pdo->prepare('
185185
SELECT r.role_id AS "id", r.name, r.description, r.active, r.created, r.last_update AS "lastUpdate"
@@ -249,7 +249,7 @@ public function grantPermission(Role &$role, Permission $permission)
249249
/**
250250
* {@inheritdoc}
251251
*/
252-
public function grantPermissionById(Role &$role, string|int $permissionId)
252+
public function grantPermissionById(Role &$role, int|string $permissionId)
253253
{
254254
$roleId = $role->getId();
255255

@@ -287,7 +287,7 @@ public function revokePermission(Role &$role, Permission $permission)
287287
/**
288288
* {@inheritdoc}
289289
*/
290-
public function revokePermissionById(Role &$role, string|int $permissionId)
290+
public function revokePermissionById(Role &$role, int|string $permissionId)
291291
{
292292
$roleId = $role->getId();
293293

@@ -321,7 +321,7 @@ public function addUser(Role &$role, EnhancedUser $user)
321321
/**
322322
* {@inheritdoc}
323323
*/
324-
public function addUserById(Role &$role, string|int $userId)
324+
public function addUserById(Role &$role, int|string $userId)
325325
{
326326
$roleId = $role->getId();
327327

@@ -359,7 +359,7 @@ public function removeUser(Role &$role, EnhancedUser $user)
359359
/**
360360
* {@inheritdoc}
361361
*/
362-
public function removeUserById(Role &$role, string|int $userId)
362+
public function removeUserById(Role &$role, int|string $userId)
363363
{
364364
$roleId = $role->getId();
365365

‎src/Linna/Authorization/RoleToUserMapper.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function fetchByRole(Role $role): array
5050
/**
5151
* {@inheritdoc}
5252
*/
53-
public function fetchByRoleId(int $roleId): array
53+
public function fetchByRoleId(int|string $roleId): array
5454
{
5555
$pdos = $this->pdo->prepare('
5656
SELECT u.user_id AS "id", u.uuid, u.name, u.email, u.description, u.password, u.active, u.created, u.last_update AS "lastUpdate"
@@ -101,7 +101,7 @@ public function fetchByUser(EnhancedUser $user): array
101101
/**
102102
* {@inheritdoc}
103103
*/
104-
public function fetchByUserId(int $userId): array
104+
public function fetchByUserId(int|string $userId): array
105105
{
106106
$pdos = $this->pdo->prepare('
107107
SELECT r.role_id AS "id", r.name, r.description, r.active, r.created, r.last_update AS "lastUpdate"

0 commit comments

Comments
 (0)