add php 8.5

.github/workflows/main.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['8.3','8.x']
+        php-versions: ['8.3','8.4','8.x']
     name: Testing PHP ${{ matrix.php-versions }}
     steps:
       - name: Checkout

.php-cs-fixer.dist.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+use PhpCsFixer\Config;
+use PhpCsFixer\Finder;
+use PhpCsFixer\Runner\Parallel\ParallelConfigFactory;
+
+return (new Config())
+    ->setParallelConfig(ParallelConfigFactory::detect()) // @TODO 4.0 no need to call this manually
+    ->setRiskyAllowed(false)
+    ->setRules([
+        '@auto' => true,
+        '@PhpCsFixer' => true
+    ])
+    // 💡 by default, Fixer looks for `*.php` files excluding `./vendor/` - here, you can groom this config
+    ->setFinder(
+        (new Finder())
+            // 💡 root folder to check
+            ->in(__DIR__)
+            // 💡 additional files, eg bin entry file
+            // ->append([__DIR__.'/bin-entry-file'])
+            // 💡 folders to exclude, if any
+            // ->exclude([/* ... */])
+            // 💡 path patterns to exclude, if any
+            // ->notPath([/* ... */])
+            // 💡 extra configs
+            // ->ignoreDotFiles(false) // true by default in v3, false in v4 or future mode
+            // ->ignoreVCSIgnored(true) // true by default
+    )
+;

composer.json

@@ -1,46 +1,46 @@
 {
-    "name": "mittwald/vault-php",
-    "type": "library",
-    "license": "MIT",
-    "homepage": "https://www.mittwald.de/",
-    "description": "A PHP client library for 'Vault by HashiCorp'",
-    "require": {
-        "ext-json": "*",
-        "guzzlehttp/psr7": "^2.7.1",
-        "php": ">=8.3"
-    },
-    "suggest": {
-        "guzzlehttp/guzzle": "HTTP Client Adapter"
-    },
-    "require-dev": {
-        "friendsofphp/php-cs-fixer": "^v3.75.0",
-        "php-http/mock-client": "^1.6.1",
-        "phpunit/phpunit": "^12.1.5",
-        "vimeo/psalm": "^6.10.3"
-    },
-    "authors": [
-        {
-            "name": "Marco Rieger",
-            "email": "m.rieger@mittwald.de"
-        }
-    ],
-    "autoload": {
-        "psr-4": {
-            "VaultPHP\\": "src\\VaultPHP\\"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Test\\VaultPHP\\": "tests\\VaultPHP\\"
-        }
-    },
-    "scripts": {
-        "test": "php ./vendor/bin/phpunit --configuration ./phpunit.xml.dist",
-        "pretty": "php ./vendor/bin/php-cs-fixer fix ./src"
-    },
-    "config": {
-        "allow-plugins": {
-            "php-http/discovery": false
-        }
+  "name": "mittwald/vault-php",
+  "type": "library",
+  "license": "MIT",
+  "homepage": "https://www.mittwald.de/",
+  "description": "A PHP client library for 'Vault by HashiCorp'",
+  "require": {
+    "ext-json": "*",
+    "guzzlehttp/psr7": "^2.7.1",
+    "php": ">=8.3"
+  },
+  "suggest": {
+    "guzzlehttp/guzzle": "HTTP Client Adapter"
+  },
+  "require-dev": {
+    "friendsofphp/php-cs-fixer": "^v3.91.2",
+    "php-http/mock-client": "^1.6.1",
+    "phpunit/phpunit": "^12.5.0",
+    "vimeo/psalm": "6.x-dev"
+  },
+  "authors": [
+    {
+      "name": "Marco Rieger",
+      "email": "m.rieger@mittwald.de"
     }
+  ],
+  "autoload": {
+    "psr-4": {
+      "VaultPHP\\": "src\\VaultPHP\\"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "Test\\VaultPHP\\": "tests\\VaultPHP\\"
+    }
+  },
+  "scripts": {
+    "test": "./vendor/bin/psalm --no-cache && php ./vendor/bin/phpunit --configuration ./phpunit.xml.dist",
+    "pretty": "php ./vendor/bin/php-cs-fixer fix ./src"
+  },
+  "config": {
+    "allow-plugins": {
+      "php-http/discovery": false
+    }
+  }
 }

src/VaultPHP/Authentication/AbstractAuthenticationProvider.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace VaultPHP\Authentication;
@@ -12,45 +13,26 @@
 use VaultPHP\VaultClient;
 
 /**
- * Class AbstractAuthenticationProvider
- * @package VaultPHP\Authentication
+ * Class AbstractAuthenticationProvider.
  */
 abstract class AbstractAuthenticationProvider implements AuthenticationProviderInterface
 {
-    /** @var VaultClient|null */
     private ?VaultClient $vaultClient = null;
 
-    /**
-     * @param VaultClient $VaultClient
-     * @return void
-     */
     #[\Override]
     public function setVaultClient(VaultClient $VaultClient): void
     {
         $this->vaultClient = $VaultClient;
     }
 
-    /**
-     * @throws VaultException
-     * @return VaultClient
-     */
-    private function getVaultClient(): VaultClient
-    {
-        if (!$this->vaultClient) {
-            throw new VaultException('Trying to request the VaultClient before initialization');
-        }
-
-        return $this->vaultClient;
-    }
-
     /**
      * @throws InvalidRouteException
      * @throws VaultHttpException
      * @throws VaultException
      * @throws InvalidDataException
      * @throws VaultAuthenticationException
      */
-    protected function sendApiRequest(string $method, string $endpoint, string $returnClass, ResourceRequestInterface|array $data = []): mixed
+    protected function sendApiRequest(string $method, string $endpoint, string $returnClass, array|ResourceRequestInterface $data = []): mixed
     {
         return $this->getVaultClient()->sendApiRequest(
             $method,
@@ -60,4 +42,16 @@ protected function sendApiRequest(string $method, string $endpoint, string $retu
             false,
         );
     }
+
+    /**
+     * @throws VaultException
+     */
+    private function getVaultClient(): VaultClient
+    {
+        if (!$this->vaultClient) {
+            throw new VaultException('Trying to request the VaultClient before initialization');
+        }
+
+        return $this->vaultClient;
+    }
 }

src/VaultPHP/Authentication/AuthenticationMetaData.php

@@ -1,20 +1,18 @@
 <?php
+
 declare(strict_types=1);
 
 namespace VaultPHP\Authentication;
 
 /**
- * Class AuthenticationMetaData
- * @package VaultPHP\Authentication
+ * Class AuthenticationMetaData.
  */
 final class AuthenticationMetaData
 {
-    /** @var string */
     private string $token = '';
 
     /**
      * AuthenticationMetaData constructor.
-     * @param object|null $fromAuth
      */
     public function __construct(?object $fromAuth = null)
     {
@@ -23,19 +21,13 @@ public function __construct(?object $fromAuth = null)
         }
     }
 
-    /**
-     * @return string
-     */
     public function getClientToken(): string
     {
         return $this->token;
     }
 
-    /**
-     * @return bool
-     */
     public function isClientTokenPresent(): bool
     {
-        return !!$this->token;
+        return (bool) $this->token;
     }
 }

src/VaultPHP/Authentication/AuthenticationProviderInterface.php

@@ -1,24 +1,17 @@
 <?php
+
 declare(strict_types=1);
 
 namespace VaultPHP\Authentication;
 
 use VaultPHP\VaultClient;
 
 /**
- * Interface AuthenticationProviderInterface
- * @package VaultPHP\Authentication
+ * Interface AuthenticationProviderInterface.
  */
 interface AuthenticationProviderInterface
 {
-    /**
-     * @return AuthenticationMetaData|boolean
-     */
     public function authenticate(): AuthenticationMetaData|bool;
 
-    /**
-     * @param VaultClient $VaultClient
-     * @return void
-     */
     public function setVaultClient(VaultClient $VaultClient): void;
 }

src/VaultPHP/Authentication/Provider/AppRole.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace VaultPHP\Authentication\Provider;
@@ -13,24 +14,18 @@
 use VaultPHP\Response\EndpointResponse;
 
 /**
- * Class AppRole
- * @package VaultPHP\Authentication\Provider
+ * Class AppRole.
  */
 final class AppRole extends AbstractAuthenticationProvider
 {
     /** @var string */
+    public const string endpoint = '/v1/auth/approle/login';
     private string $roleId;
 
-    /** @var string */
     private string $secretId;
 
-    /** @var string  */
-    const string endpoint = '/v1/auth/approle/login';
-
     /**
      * AppRole constructor.
-     * @param string $roleId
-     * @param string $secretId
      */
     public function __construct(string $roleId, string $secretId)
     {
@@ -48,7 +43,7 @@ public function __construct(string $roleId, string $secretId)
      * @throws VaultHttpException
      */
     #[\Override]
-    public function authenticate(): bool|AuthenticationMetaData
+    public function authenticate(): AuthenticationMetaData|bool
     {
         /** @var EndpointResponse $response */
         $response = $this->sendApiRequest(

src/VaultPHP/Authentication/Provider/Kubernetes.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace VaultPHP\Authentication\Provider;
@@ -13,42 +14,35 @@
 use VaultPHP\Response\EndpointResponse;
 
 /**
- * Class Kubernetes
- * @package VaultPHP\Authentication\Provider
+ * Class Kubernetes.
  */
 final class Kubernetes extends AbstractAuthenticationProvider
 {
-    /** @var string */
     private string $role;
-    /** @var string */
     private string $jwt;
-    /** @var string  */
     private string $endpoint;
 
     /**
      * Kubernetes constructor.
-     * @param string $role
-     * @param string $jwt
+     *
      * @param string $authPath - defaults to '/auth/kubernetes'
      */
     public function __construct(string $role, string $jwt, string $authPath = 'auth/kubernetes')
     {
         $this->role = $role;
         $this->jwt = $jwt;
-        $this->endpoint = '/v1/' . $authPath . '/login';
+        $this->endpoint = '/v1/'.$authPath.'/login';
     }
 
     /**
-     * @return AuthenticationMetaData|false
-     *
      * @throws InvalidDataException
      * @throws InvalidRouteException
      * @throws VaultAuthenticationException
      * @throws VaultException
      * @throws VaultHttpException
      */
     #[\Override]
-    public function authenticate(): false|AuthenticationMetaData
+    public function authenticate(): AuthenticationMetaData|false
     {
         /** @var EndpointResponse $response */
         $response = $this->sendApiRequest(