Merge pull request #6 from TomHAnderson/hotfix/command-print-sort

Added sort asc by name to print commands

Author: TomHAnderson

README.md

@@ -135,9 +135,14 @@ Delete a Scope
 php artisan apikey:scope:delete {scopeName}
 ```
 
-Print an ApiKey
+Print ApiKey[s]
 ```shell
-php artisan apikey:print {name} 
+php artisan apikey:print {name?} 
+```
+
+Print Scope[s]
+```shell
+php artisan apikey:scope:print {name?} 
 ```
 
 

composer.json

@@ -36,5 +36,8 @@
                 "ApiSkeletons\\Laravel\\Doctrine\\ApiKey\\ServiceProvider"
             ]
         }
+    },
+    "scripts": {
+        "test": "vendor/bin/phpcs && vendor/bin/phpunit && vendor/bin/psalm"
     }
 }

src/Console/Command/AddScope.php

@@ -7,7 +7,6 @@
 use ApiSkeletons\Laravel\Doctrine\ApiKey\Entity\ApiKey;
 use ApiSkeletons\Laravel\Doctrine\ApiKey\Entity\Scope;
 use ApiSkeletons\Laravel\Doctrine\ApiKey\Exception\DuplicateScopeForApiKey;
-use ApiSkeletons\Laravel\Doctrine\ApiKey\Service\ApiKeyService;
 
 // phpcs:disable SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint
 final class AddScope extends Command

src/Console/Command/Command.php

@@ -1,12 +1,17 @@
 <?php
 
+declare(strict_types=1);
+
 namespace ApiSkeletons\Laravel\Doctrine\ApiKey\Console\Command;
 
 use ApiSkeletons\Laravel\Doctrine\ApiKey\Entity\ApiKey;
 use ApiSkeletons\Laravel\Doctrine\ApiKey\Entity\Scope;
 use ApiSkeletons\Laravel\Doctrine\ApiKey\Service\ApiKeyService;
 use Illuminate\Console\Command as IlluminateCommand;
 
+use function count;
+use function implode;
+
 abstract class Command extends IlluminateCommand
 {
     protected ApiKeyService $apiKeyService;
@@ -31,7 +36,7 @@ protected function printApiKeys(array $apiKeys): void
         $headers = ['name', 'api_key', 'status', 'scopes'];
 
         $rows = [];
-        foreach($apiKeys as $apiKey) {
+        foreach ($apiKeys as $apiKey) {
             $scopeNames = [];
             foreach ($apiKey->getScopes() as $s) {
                 $scopeNames[] = $s->getName();

src/Console/Command/DeactivateApiKey.php

@@ -5,9 +5,6 @@
 namespace ApiSkeletons\Laravel\Doctrine\ApiKey\Console\Command;
 
 use ApiSkeletons\Laravel\Doctrine\ApiKey\Entity\ApiKey;
-use ApiSkeletons\Laravel\Doctrine\ApiKey\Service\ApiKeyService;
-
-use function implode;
 
 // phpcs:disable SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint
 final class DeactivateApiKey extends Command

src/Console/Command/DeleteScope.php

@@ -6,7 +6,6 @@
 
 use ApiSkeletons\Laravel\Doctrine\ApiKey\Entity\Scope;
 use ApiSkeletons\Laravel\Doctrine\ApiKey\Exception\ScopeHasApiKeys;
-use ApiSkeletons\Laravel\Doctrine\ApiKey\Service\ApiKeyService;
 
 // phpcs:disable SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint
 final class DeleteScope extends Command

src/Console/Command/GenerateApiKey.php

@@ -8,8 +8,6 @@
 use ApiSkeletons\Laravel\Doctrine\ApiKey\Exception\DuplicateName;
 use ApiSkeletons\Laravel\Doctrine\ApiKey\Exception\InvalidName;
 
-use function implode;
-
 // phpcs:disable SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint
 final class GenerateApiKey extends Command
 {

src/Console/Command/GenerateScope.php

@@ -7,9 +7,6 @@
 use ApiSkeletons\Laravel\Doctrine\ApiKey\Entity\Scope;
 use ApiSkeletons\Laravel\Doctrine\ApiKey\Exception\DuplicateName;
 use ApiSkeletons\Laravel\Doctrine\ApiKey\Exception\InvalidName;
-use ApiSkeletons\Laravel\Doctrine\ApiKey\Service\ApiKeyService;
-
-use function count;
 
 // phpcs:disable SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint
 final class GenerateScope extends Command

src/Console/Command/PrintApiKey.php

@@ -38,7 +38,7 @@ public function handle(): mixed
                 return 1;
             }
         } else {
-            $apiKeys = $apiKeyRepository->findAll();
+            $apiKeys = $apiKeyRepository->findBy([], ['name' => 'asc']);
         }
 
         $this->printApiKeys($apiKeys);

src/Console/Command/PrintScope.php

@@ -4,7 +4,6 @@
 
 namespace ApiSkeletons\Laravel\Doctrine\ApiKey\Console\Command;
 
-use ApiSkeletons\Laravel\Doctrine\ApiKey\Entity\ApiKey;
 use ApiSkeletons\Laravel\Doctrine\ApiKey\Entity\Scope;
 
 // phpcs:disable SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint
@@ -39,7 +38,7 @@ public function handle(): mixed
                 return 1;
             }
         } else {
-            $scopes = $scopeRepository->findAll();
+            $scopes = $scopeRepository->findBy([], ['name' => 'asc']);
         }
 
         $this->printScopes($scopes);

src/Console/Command/RemoveScope.php

@@ -7,9 +7,6 @@
 use ApiSkeletons\Laravel\Doctrine\ApiKey\Entity\ApiKey;
 use ApiSkeletons\Laravel\Doctrine\ApiKey\Entity\Scope;
 use ApiSkeletons\Laravel\Doctrine\ApiKey\Exception\ApiKeyDoesNotHaveScope;
-use ApiSkeletons\Laravel\Doctrine\ApiKey\Service\ApiKeyService;
-
-use function implode;
 
 // phpcs:disable SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint
 final class RemoveScope extends Command

src/ServiceProvider.php

@@ -24,18 +24,20 @@ public function register(): void
      */
     public function boot(): void
     {
-        if ($this->app->runningInConsole()) {
-            $this->commands([
-                Console\Command\ActivateApiKey::class,
-                Console\Command\AddScope::class,
-                Console\Command\DeactivateApiKey::class,
-                Console\Command\DeleteScope::class,
-                Console\Command\GenerateApiKey::class,
-                Console\Command\GenerateScope::class,
-                Console\Command\PrintApiKey::class,
-                Console\Command\PrintScope::class,
-                Console\Command\RemoveScope::class,
-            ]);
+        if (! $this->app->runningInConsole()) {
+            return;
         }
+
+        $this->commands([
+            Console\Command\ActivateApiKey::class,
+            Console\Command\AddScope::class,
+            Console\Command\DeactivateApiKey::class,
+            Console\Command\DeleteScope::class,
+            Console\Command\GenerateApiKey::class,
+            Console\Command\GenerateScope::class,
+            Console\Command\PrintApiKey::class,
+            Console\Command\PrintScope::class,
+            Console\Command\RemoveScope::class,
+        ]);
     }
 }