Require orisai/auth ^2.0.0

Author: mabar

composer.json

@@ -46,14 +46,14 @@
 		"nextras/dbal": "~4.0.5",
 		"nextras/migrations": "~3.2.0",
 		"nextras/orm": "~4.0.6",
-		"orisai/auth": "^1.0.3",
+		"orisai/auth": "^2.0.0",
 		"orisai/clock": "^1.1.0",
 		"orisai/data-sources": "^1.0.0",
 		"orisai/exceptions": "^1.1.1",
 		"orisai/installer": "^1.0.0",
 		"orisai/localization": "^1.0.0",
 		"orisai/nette-application": "^1.0.0",
-		"orisai/nette-auth": "^1.0.0",
+		"orisai/nette-auth": "^1.1.0",
 		"orisai/nette-clock": "^1.0.0",
 		"orisai/nette-console": "^1.2.0",
 		"orisai/nette-data-sources": "^1.0.0",

src/Auth/UI/UserIdentity.php

@@ -10,7 +10,7 @@ final class UserIdentity extends StringIdentity
 {
 
 	/**
-	 * @param array<int, string> $roles
+	 * @param list<string> $roles
 	 */
 	public function __construct(string $id, array $roles, private UserIdentity|null $impersonator = null)
 	{

src/Auth/UI/UserIdentityCreator.php

@@ -2,11 +2,9 @@
 
 namespace OriCMF\Auth\UI;
 
-use OriCMF\Role\DB\Role;
 use OriCMF\User\DB\User;
 use Orisai\Auth\Authorization\Authorizer;
 use Orisai\Auth\Authorization\IdentityAuthorizationDataBuilder;
-use function array_map;
 
 final class UserIdentityCreator
 {
@@ -17,10 +15,10 @@ public function __construct(private readonly Authorizer $authorizer)
 
 	public function create(User $user, UserIdentity|null $impersonator = null): UserIdentity
 	{
-		$roles = array_map(
-			static fn (Role $role): string => $role->name,
-			$user->roles->getIterator()->fetchAll(),
-		);
+		$roles = [];
+		foreach ($user->roles as $role) {
+			$roles[] = $role->name;
+		}
 
 		$identity = new UserIdentity($user->id, $roles, $impersonator);
 

src/wiring.neon

@@ -23,6 +23,7 @@ includes:
 
 orisai.localization:
 	directories:
+		- %vendorDir%/orisai/auth/Locale/**
 		- %modules.orisai_cmf.dir%/src/**/Locale/**
 
 nextras.migrations:

tools/phpstan.neon

@@ -32,12 +32,6 @@ parameters:
 			path: ../src/UI/Presenter/BasePresenter.php
 			count: 1
 
-		# array works, iterable does not - probably phpstan-nextras issue?
-		-
-			message: '#^Parameter \#1 \$callback of function array_map expects \(callable\(Nextras\\Orm\\Entity\\IEntity\)\: mixed\)\|null, Closure\(OriCMF\\Role\\DB\\Role\)\: string given\.$#'
-			path: ../src/Auth/UI/UserIdentityCreator.php
-			count: 1
-
 		# Weakly typed underlying lib
 		-
 			message: '#^(.+)does not accept array(.+)$#'