Merge pull request #16 from olssonm/dev/php84

Support for PHP 8.4
olssonm · Dec 11, 2024 · cf39aa2 · cf39aa2
2 parents ee33a87 + 7a895d3
commit cf39aa2
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 32 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         php:
-          - "8.3"
+          - "8.4"
 
     steps:
       - name: "Checkout"
@@ -42,6 +42,7 @@ jobs:
         php:
           - 8.2
           - 8.3
+          - 8.4
         dependency-version: [prefer-stable]
         exclude:
           - os: ubuntu-20.04

diff --git a/phpunit.xml.bak b/phpunit.xml.bak
diff --git a/src/Certificate.php b/src/Certificate.php
@@ -28,7 +28,7 @@ public function __construct(
         ?string $passphrase = null,
         bool|string $rootPath = true,
         ?string $signingPath = null,
-        string $signingPassphrase = null
+        ?string $signingPassphrase = null
     ) {
         $this->client = $clientPath;
         $this->passphrase = $passphrase;

diff --git a/src/Client.php b/src/Client.php
@@ -36,17 +36,17 @@ class Client
     protected ClientInterface $client;
 
     public function __construct(
-        Certificate $certificate = null,
+        ?Certificate $certificate = null,
         string $endpoint = self::PRODUCTION_ENDPOINT,
-        ClientInterface $client = null
+        ?ClientInterface $client = null
     ) {
         $this->setup($certificate, $endpoint, $client);
     }
 
     public function setup(
-        Certificate $certificate = null,
+        ?Certificate $certificate = null,
         string $endpoint = self::PRODUCTION_ENDPOINT,
-        ClientInterface $client = null
+        ?ClientInterface $client = null
     ): void {
 
         if ($certificate) {

diff --git a/src/Exceptions/InvalidUuidException.php b/src/Exceptions/InvalidUuidException.php
@@ -4,7 +4,7 @@
 
 class InvalidUuidException extends \InvalidArgumentException
 {
-    public function __construct(string $message = null, int $code = 0)
+    public function __construct(?string $message = null, int $code = 0)
     {
         if (!$message) {
             throw new $this('Invalid UUID ' . get_class($this), $code);

diff --git a/src/Exceptions/ValidationException.php b/src/Exceptions/ValidationException.php
@@ -6,6 +6,7 @@
 use Olssonm\Swish\Error;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
+use Throwable;
 
 class ValidationException extends RequestException
 {
@@ -22,8 +23,8 @@ class ValidationException extends RequestException
     public function __construct(
         string $message,
         RequestInterface $request,
-        ResponseInterface $response = null,
-        \Throwable $previous = null,
+        ?ResponseInterface $response = null,
+        ?Throwable $previous = null,
         array $handlerContext = []
     ) {
 

diff --git a/src/Providers/SwishServiceProvider.php b/src/Providers/SwishServiceProvider.php
@@ -18,21 +18,24 @@ public function register(): void
         $this->mergeConfigFrom($source, 'swish');
 
         $this->app->singleton('swish', function (Container $app): Client {
+            $config = $app->get('config');
             $certificate = new Certificate(
-                clientPath: $app['config']['swish.certificates.client'],
-                passphrase: $app['config']['swish.certificates.password'],
-                rootPath: $app['config']['swish.certificates.root'],
-                signingPath: $app['config']['swish.certificates.signing'],
-                signingPassphrase: $app['config']['swish.certificates.signing_password'],
+                clientPath: $config['swish.certificates.client'],
+                passphrase: $config['swish.certificates.password'],
+                rootPath: $config['swish.certificates.root'],
+                signingPath: $config['swish.certificates.signing'],
+                signingPassphrase: $config['swish.certificates.signing_password'],
             );
 
-            return new Client($certificate, $app['config']['swish.endpoint']);
+            return new Client($certificate, $config['swish.endpoint']);
         });
 
         $this->app->alias('swish', Client::class);
     }
 
-    /** @codeCoverageIgnore */
+    /**
+     * @return array<string>
+     */
     public function provides(): array
     {
         return ['swish'];