phpcs 12

Author: TomHAnderson

src/Console/Command/Command.php

@@ -14,23 +14,17 @@
 
 abstract class Command extends IlluminateCommand
 {
-    protected ApiKeyService $apiKeyService;
-
     /**
      * Create a new command instance.
      *
      * @return void
      */
-    public function __construct(ApiKeyService $apiKeyService)
+    public function __construct(protected ApiKeyService $apiKeyService)
     {
         parent::__construct();
-
-        $this->apiKeyService = $apiKeyService;
     }
 
-    /**
-     * @param ApiKey[] $apiKeys
-     */
+    /** @param ApiKey[] $apiKeys */
     protected function printApiKeys(array $apiKeys): void
     {
         $headers = ['name', 'api_key', 'status', 'scopes'];
@@ -53,9 +47,7 @@ protected function printApiKeys(array $apiKeys): void
         $this->table($headers, $rows);
     }
 
-    /**
-     * @param Scope[] $scopes
-     */
+    /** @param Scope[] $scopes */
     protected function printScopes(array $scopes): void
     {
         $headers = ['name', 'apikey count'];

src/Http/Middleware/AuthorizeApiKey.php

@@ -13,17 +13,14 @@
 
 class AuthorizeApiKey
 {
-    private ApiKeyService $apiKeyService;
-
-    public function __construct(ApiKeyService $apiKeyService)
+    public function __construct(private ApiKeyService $apiKeyService)
     {
-        $this->apiKeyService = $apiKeyService;
     }
 
     /**
      * Handle request
      */
-    public function handle(Request $request, Closure $next, ?string $scope = null): mixed
+    public function handle(Request $request, Closure $next, string|null $scope = null): mixed
     {
         $header = $request->header('Authorization');
         if (! $header) {

src/Repository/ApiKeyRepository.php

@@ -133,7 +133,7 @@ public function removeScope(ApiKey $apiKey, Scope $scope): ApiKey
 
         if (! $found) {
             throw new ApiKeyDoesNotHaveScope(
-                'The requested Scope to remove does not exist on the ApiKey'
+                'The requested Scope to remove does not exist on the ApiKey',
             );
         }
 

src/Service/ApiKeyService.php

@@ -14,7 +14,7 @@
 
 class ApiKeyService
 {
-    private ?EntityManager $entityManager = null;
+    private EntityManager|null $entityManager = null;
 
     public function getEntityManager(): EntityManager
     {