psalm + phpcs + phpunit

TomHAnderson · TomHAnderson · commit 1dbb0adca577 · 2021-12-16T20:41:35.000-07:00
diff --git a/composer.json b/composer.json
@@ -21,12 +21,13 @@
     ],
     "require": {
         "php": "^8.0",
-        "laravel-doctrine/orm": "^1.6",
-        "doctrine/coding-standard": "^9.0"
+        "laravel-doctrine/orm": "^1.6"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",
-        "orchestra/testbench": "^6.23"
+        "doctrine/coding-standard": "^9.0",
+        "orchestra/testbench": "^6.23",
+        "vimeo/psalm": "^4.15"
     },
     "extra": {
         "laravel": {
diff --git a/config/orm/ApiSkeletons.Laravel.Doctrine.ApiKey.AccessEvent.dcm.xml b/config/orm/ApiSkeletons.Laravel.Doctrine.ApiKey.AccessEvent.dcm.xml
diff --git a/config/orm/ApiSkeletons.Laravel.Doctrine.ApiKey.AdminEvent.dcm.xml b/config/orm/ApiSkeletons.Laravel.Doctrine.ApiKey.AdminEvent.dcm.xml
diff --git a/config/orm/ApiSkeletons.Laravel.Doctrine.ApiKey.ApiKey.dcm.xml b/config/orm/ApiSkeletons.Laravel.Doctrine.ApiKey.ApiKey.dcm.xml
diff --git a/config/orm/ApiSkeletons.Laravel.Doctrine.ApiKey.Scope.dcm.xml b/config/orm/ApiSkeletons.Laravel.Doctrine.ApiKey.Scope.dcm.xml
diff --git a/src/Console/Command/ActivateApiKey.php b/src/Console/Command/ActivateApiKey.php
@@ -10,19 +10,20 @@
 
 use function implode;
 
+// phpcs:disable SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint
 final class ActivateApiKey extends Command
 {
     private ApiKeyService $apiKeyService;
 
     /**
      * The name and signature of the console command.
      */
-    protected string $signature = 'apikey:activate {name}';
+    protected $signature = 'apikey:activate {name}';
 
     /**
      * The console command description.
      */
-    protected string $description = 'Activate an ApiKey';
+    protected $description = 'Activate an ApiKey';
 
     /**
      * Create a new command instance.
diff --git a/src/Console/Command/AddScope.php b/src/Console/Command/AddScope.php
@@ -12,19 +12,20 @@
 
 use function implode;
 
+// phpcs:disable SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint
 final class AddScope extends Command
 {
     private ApiKeyService $apiKeyService;
 
     /**
      * The name and signature of the console command.
      */
-    protected string $signature = 'apikey:scope:add {apiKeyName} {scopeName}';
+    protected $signature = 'apikey:scope:add {apiKeyName} {scopeName}';
 
     /**
      * The console command description.
      */
-    protected string $description = 'Add a Scope to an ApiKey';
+    protected $description = 'Add a Scope to an ApiKey';
 
     /**
      * Create a new command instance.
diff --git a/src/Console/Command/DeactivateApiKey.php b/src/Console/Command/DeactivateApiKey.php
@@ -10,19 +10,20 @@
 
 use function implode;
 
+// phpcs:disable SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint
 final class DeactivateApiKey extends Command
 {
     private ApiKeyService $apiKeyService;
 
     /**
      * The name and signature of the console command.
      */
-    protected string $signature = 'apikey:deactivate {name}';
+    protected $signature = 'apikey:deactivate {name}';
 
     /**
      * The console command description.
      */
-    protected string $description = 'Deactivate an ApiKey';
+    protected $description = 'Deactivate an ApiKey';
 
     /**
      * Create a new command instance.
diff --git a/src/Console/Command/DeleteScope.php b/src/Console/Command/DeleteScope.php
@@ -9,19 +9,20 @@
 use ApiSkeletons\Laravel\Doctrine\ApiKey\Service\ApiKeyService;
 use Illuminate\Console\Command;
 
+// phpcs:disable SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint
 final class DeleteScope extends Command
 {
     private ApiKeyService $apiKeyService;
 
     /**
      * The name and signature of the console command.
      */
-    protected string $signature = 'apikey:scope:delete {name}';
+    protected $signature = 'apikey:scope:delete {name}';
 
     /**
      * The console command description.
      */
-    protected string $description = 'Delete an ApiKey Scope (Delete a scope, not a relationship)';
+    protected $description = 'Delete an ApiKey Scope (Delete a scope, not a relationship)';
 
     /**
      * Create a new command instance.
diff --git a/src/Console/Command/GenerateApiKey.php b/src/Console/Command/GenerateApiKey.php
@@ -12,19 +12,20 @@
 
 use function implode;
 
+// phpcs:disable SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint
 final class GenerateApiKey extends Command
 {
     private ApiKeyService $apiKeyService;
 
     /**
      * The name and signature of the console command.
      */
-    protected string $signature = 'apikey:generate {name}';
+    protected $signature = 'apikey:generate {name}';
 
     /**
      * The console command description.
      */
-    protected string $description = 'Create a new ApiKey';
+    protected $description = 'Create a new ApiKey';
 
     /**
      * Create a new command instance.
diff --git a/src/Console/Command/GenerateScope.php b/src/Console/Command/GenerateScope.php
@@ -12,19 +12,20 @@
 
 use function count;
 
+// phpcs:disable SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint
 final class GenerateScope extends Command
 {
     private ApiKeyService $apiKeyService;
 
     /**
      * The name and signature of the console command.
      */
-    protected string $signature = 'apikey:scope:generate {name}';
+    protected $signature = 'apikey:scope:generate {name}';
 
     /**
      * The console command description.
      */
-    protected string $description = 'Generate a new ApiKey Scope';
+    protected $description = 'Generate a new ApiKey Scope';
 
     /**
      * Create a new command instance.
diff --git a/src/Console/Command/PrintApiKey.php b/src/Console/Command/PrintApiKey.php
@@ -10,19 +10,20 @@
 
 use function implode;
 
+// phpcs:disable SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint
 final class PrintApiKey extends Command
 {
     private ApiKeyService $apiKeyService;
 
     /**
      * The name and signature of the console command.
      */
-    protected string $signature = 'apikey:print {name}';
+    protected $signature = 'apikey:print {name}';
 
     /**
      * The console command description.
      */
-    protected string $description = 'Print an ApiKey';
+    protected $description = 'Print an ApiKey';
 
     /**
      * Create a new command instance.
diff --git a/src/Console/Command/RemoveScope.php b/src/Console/Command/RemoveScope.php
@@ -12,19 +12,20 @@
 
 use function implode;
 
+// phpcs:disable SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint
 final class RemoveScope extends Command
 {
     private ApiKeyService $apiKeyService;
 
     /**
      * The name and signature of the console command.
      */
-    protected string $signature = 'apikey:scope:remove {apiKeyName} {scopeName}';
+    protected $signature = 'apikey:scope:remove {apiKeyName} {scopeName}';
 
     /**
      * The console command description.
      */
-    protected string $description = 'Remove a Scope from an ApiKey';
+    protected $description = 'Remove a Scope from an ApiKey';
 
     /**
      * Create a new command instance.
diff --git a/src/Http/Middleware/AuthorizeApiKey.php b/src/Http/Middleware/AuthorizeApiKey.php
@@ -27,6 +27,14 @@ public function handle(Request $request, Closure $next, ?string $scope = null):
     {
         $header = $request->header('Authorization');
         // Remove Bearer from key prefix
+        if (! $header) {
+            return response([
+                'errors' => [
+                    ['message' => 'Unauthorized'],
+                ],
+            ], 401);
+        }
+
         $key = substr($header, 7);
 
         $apiKey = $this->apiKeyService->isActive($key);
diff --git a/src/Service/ApiKeyService.php b/src/Service/ApiKeyService.php
@@ -23,7 +23,7 @@ public function getEntityManager(): EntityManager
 
     public function init(EntityManager $entityManager): self|bool
     {
-        if ($this->entityManager === null) {
+        if ($this->entityManager !== null) {
             return false;
         }
 
