Merge pull request #14 from TomHAnderson/feature/2.0

Feature/2.0
API-Skeletons · Apr 12, 2024 · d50f119 · d50f119
2 parents c5079b4 + 3f58e83
commit d50f119
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 37 deletions.
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -15,6 +15,6 @@ jobs:
     name: "Coding Standards"
     uses: "doctrine/.github/.github/workflows/coding-standards.yml@1.3.0"
     with:
-      php-version: '8.0'
+      php-version: '8.1'
       composer-options: '--prefer-dist --ignore-platform-req=php'
 
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -19,18 +19,19 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "8.0"
           - "8.1"
+          - "8.2"
+          - "8.3"
         dependencies:
           - "highest"
         optional-dependencies:
           - true
           - false
         include:
-          -   php-version: "8.0"
+          -   php-version: "8.1"
               dependencies: "lowest"
               optional-dependencies: false
-          -   php-version: "8.0"
+          -   php-version: "8.1"
               dependencies: "lowest"
               optional-dependencies: true
 

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -28,9 +28,3 @@ jobs:
 
     - name: Install dependencies
       run: composer install --prefer-dist --no-progress
-
-    # Add a test script to composer.json, for instance: "test": "vendor/bin/phpunit"
-    # Docs: https://getcomposer.org/doc/articles/scripts.md
-
-    # - name: Run test suite
-    #   run: composer run-script test
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: shivammathur/setup-php@15c43e89cdef867065b0213be354c2841860869e
         with:
-          php-version: '8.0'
+          php-version: '8.1'
       - uses: actions/checkout@v2
       - name: Install Dependencies
         run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist

diff --git a/composer.json b/composer.json
@@ -20,17 +20,18 @@
         }
     ],
     "require": {
-        "php": "^8.0",
-        "laravel-doctrine/orm": "^1.6",
+        "php": "^8.1",
+        "laravel-doctrine/orm": "^2.0",
         "api-skeletons/laravel-api-problem": "^1.0.1"
     },
     "require-dev": {
-        "doctrine/coding-standard": "^9.0",
-        "doctrine/dbal": "^3.1.1",
-        "doctrine/annotations": "^1.13.2",
-        "orchestra/testbench": "^6.23",
+        "doctrine/coding-standard": "^12.0",
+        "doctrine/dbal": "^3.8",
+        "doctrine/annotations": "^2.0",
         "phpunit/phpunit": "^9.5",
-        "vimeo/psalm": "^4.15"
+        "vimeo/psalm": "^4.15",
+        "orchestra/testbench": "^7.41",
+        "php-parallel-lint/php-parallel-lint": "^1.4"
     },
     "extra": {
         "laravel": {
@@ -40,6 +41,16 @@
         }
     },
     "scripts": {
-        "test": "vendor/bin/phpcs && vendor/bin/phpunit && vendor/bin/psalm"
+        "test": [
+            "parallel-lint src/ test/",
+            "vendor/bin/phpcs",
+            "vendor/bin/psalm",
+            "vendor/bin/phpunit"
+        ]
+    },
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     }
 }
diff --git a/src/Console/Command/Command.php b/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'];

diff --git a/src/Http/Middleware/AuthorizeApiKey.php b/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) {

diff --git a/src/Repository/ApiKeyRepository.php b/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',
             );
         }
 

diff --git a/src/Service/ApiKeyService.php b/src/Service/ApiKeyService.php
@@ -14,7 +14,7 @@
 
 class ApiKeyService
 {
-    private ?EntityManager $entityManager = null;
+    private EntityManager|null $entityManager = null;
 
     public function getEntityManager(): EntityManager
     {