Connection config improvements + L11 support

protonemedia · Mar 5, 2024 · 0fecea0 · 0fecea0
1 parent 756175c
commit 0fecea0
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 14 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -13,10 +13,12 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-22.04]
-        php: [8.3, 8.2, 8.1]
-        laravel: [10.*]
+        php: [8.3, 8.2]
+        laravel: [11.*, 10.*]
         stability: [prefer-lowest, prefer-stable]
         include:
+          - laravel: 11.*
+            testbench: 9.*
           - laravel: 10.*
             testbench: 8.*
 

diff --git a/README.md b/README.md
@@ -17,13 +17,9 @@ A package to write Shell scripts like Blade Components and run them locally or o
 
 It's the *magic* of Inertia.js with the *simplicity* of Blade. [Splade](https://github.com/protonemedia/laravel-splade) provides a super easy way to build Single Page Applications using Blade templates. Besides that magic SPA-feeling, it comes with more than ten components to sparkle your app and make it interactive, all without ever leaving Blade.
 
-## Want to see this package in action?
-
-Check out [Eddy Server Management](https://github.com/protonemedia/eddy-server-management), our open-source solution for Server Provisioning and Zero-Downtime PHP Deployment!
-
 ## Installation
 
-This package requires Laravel 10 and PHP 8.1 or higher. You can install the package via composer:
+This package requires Laravel 10 and PHP 8.2 or higher. You can install the package via composer:
 
 ```bash
 composer require protonemedia/laravel-task-runner

diff --git a/composer.json b/composer.json
@@ -16,8 +16,8 @@
         }
     ],
     "require": {
-        "php": "^8.1|^8.2|^8.3",
-        "illuminate/process": "^10.0",
+        "php": "^8.2|^8.3",
+        "illuminate/process": "^10.0|^11.0",
         "spatie/laravel-package-tools": "^1.13.0",
         "spatie/temporary-directory": "^2.1"
     },
@@ -27,7 +27,7 @@
     "require-dev": {
         "laravel/pint": "^1.0",
         "nunomaduro/collision": "^7.0",
-        "orchestra/testbench": "^8.0",
+        "orchestra/testbench": "^8.0|^9.0",
         "pestphp/pest": "^2.0",
         "pestphp/pest-plugin-laravel": "^2.0",
         "phpunit/phpunit": "^10.4"

diff --git a/src/Connection.php b/src/Connection.php
@@ -72,7 +72,7 @@ public static function fromArray(array $config): static
     {
         $username = $config['username'] ?: '';
 
-        $scriptPath = $config['script_path'] ?: null;
+        $scriptPath = $config['script_path'] ?? null;
 
         if ($scriptPath) {
             $scriptPath = rtrim($scriptPath, '/');
@@ -90,18 +90,36 @@ public static function fromArray(array $config): static
             $privateKey = $privateKey();
         }
 
-        if (! $privateKey && array_key_exists('private_key_path', $config)) {
-            $privateKey = file_get_contents($config['private_key_path']);
+        $privateKeyPath = $config['private_key_path'] ?? null;
+
+        if (! $privateKey && $privateKeyPath) {
+            $privateKey = file_get_contents($privateKeyPath);
         }
 
-        return new static(
+        $instance = new static(
             host: $config['host'] ?: null,
             port: $config['port'] ?: null,
             username: $username ?: null,
             privateKey: $privateKey,
             scriptPath: $scriptPath,
             proxyJump: $config['proxy_jump'] ?? null,
         );
+
+        if ($privateKeyPath) {
+            $instance->setPrivateKeyPath($privateKeyPath);
+        }
+
+        return $instance;
+    }
+
+    /**
+     * Sets the path to the private key.
+     */
+    public function setPrivateKeyPath(string $privateKeyPath): self
+    {
+        $this->privateKeyPath = $privateKeyPath;
+
+        return $this;
     }
 
     /**