Minor CS changes

aphiria · Aug 9, 2023 · c188f07 · c188f07
1 parent 41ea2a7
commit c188f07
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 17 deletions.
diff --git a/src/Demo/Auth/AuthorizedUserDeleterRequirement.php b/src/Demo/Auth/AuthorizedUserDeleterRequirement.php
@@ -13,7 +13,7 @@
     public array $authorizedRoles;
 
     /**
-     * @param string|list<string> $authorizedRoles The role or list of roles that are authorized to delete other users' accounts
+     * @param list<string>|string $authorizedRoles The role or list of roles that are authorized to delete other users' accounts
      */
     public function __construct(array|string $authorizedRoles)
     {

diff --git a/src/Demo/Auth/BasicAuthenticationHandler.php b/src/Demo/Auth/BasicAuthenticationHandler.php
@@ -8,7 +8,6 @@
 use Aphiria\Authentication\AuthenticationScheme;
 use Aphiria\Authentication\Schemes\BasicAuthenticationHandler as BaseBasicAuthenticationHandler;
 use Aphiria\Net\Http\IRequest;
-use Aphiria\Security\IdentityBuilder;
 use Aphiria\Security\PrincipalBuilder;
 use App\Demo\Users\IUserService;
 
@@ -38,13 +37,11 @@ protected function createAuthenticationResultFromCredentials(
         }
 
         return AuthenticationResult::pass(
-            (new PrincipalBuilder($scheme->options->claimsIssuer ?? $scheme->name))
-                ->withIdentity(function (IdentityBuilder $identity) use ($user, $scheme) {
-                    $identity->withNameIdentifier($user->id)
-                        ->withEmail($user->email)
-                        ->withRoles($user->roles)
-                        ->withAuthenticationSchemeName($scheme->name);
-                })->build(),
+            (new PrincipalBuilder($scheme->options->claimsIssuer ?? $scheme->name))->withNameIdentifier($user->id)
+                ->withEmail($user->email)
+                ->withRoles($user->roles)
+                ->withAuthenticationSchemeName($scheme->name)
+                ->build(),
             $scheme->name
         );
     }

diff --git a/src/Demo/Auth/CookieAuthenticationHandler.php b/src/Demo/Auth/CookieAuthenticationHandler.php
@@ -10,7 +10,6 @@
 use Aphiria\Authentication\Schemes\CookieAuthenticationOptions;
 use Aphiria\Net\Http\IRequest;
 use Aphiria\Net\Http\IResponse;
-use Aphiria\Security\IdentityBuilder;
 use Aphiria\Security\IPrincipal;
 use Aphiria\Security\PrincipalBuilder;
 use App\Demo\Users\IUserService;
@@ -92,13 +91,11 @@ protected function createAuthenticationResultFromCookie(string $cookieValue, IRe
         $user = $this->users->getUserById($userId);
 
         return AuthenticationResult::pass(
-            (new PrincipalBuilder($scheme->options->claimsIssuer ?? $scheme->name))
-                ->withIdentity(function (IdentityBuilder $identity) use ($user, $scheme) {
-                    $identity->withNameIdentifier($user->id)
-                        ->withEmail($user->email)
-                        ->withRoles($user->roles)
-                        ->withAuthenticationSchemeName($scheme->name);
-                })->build(),
+            (new PrincipalBuilder($scheme->options->claimsIssuer ?? $scheme->name))->withNameIdentifier($user->id)
+                ->withEmail($user->email)
+                ->withRoles($user->roles)
+                ->withAuthenticationSchemeName($scheme->name)
+                ->build(),
             $scheme->name
         );
     }

diff --git a/src/Demo/Database/Components/DatabaseComponents.php b/src/Demo/Database/Components/DatabaseComponents.php
@@ -20,6 +20,7 @@ trait DatabaseComponents
      * @param IApplicationBuilder $appBuilder The application builder
      * @param class-string<IDatabaseSeeder>|list<class-string<IDatabaseSeeder>> $classNames The name or names of database seeder classes to add
      * @return static For chaining
+     * @throws RuntimeException Thrown if the global container instance was not set
      */
     protected function withDatabaseSeeders(IApplicationBuilder $appBuilder, string|array $classNames): static
     {