Add support for multiple queues

Author: ferrumfist

.github/workflows/tests.yml

@@ -0,0 +1,64 @@
+name: Tests
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  tests:
+    name: PHPUnit (PHP ${{ matrix.php }})
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php: ['8.2', '8.3', '8.4']
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          coverage: none
+
+      - name: Validate composer.json
+        run: composer validate
+
+      - name: Get Composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> "$GITHUB_OUTPUT"
+
+      - name: Cache Composer dependencies
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: composer-${{ matrix.php }}-${{ hashFiles('composer.json') }}
+          restore-keys: composer-${{ matrix.php }}-
+
+      - name: Install dependencies
+        run: composer install --prefer-dist --no-interaction --no-progress
+
+      - name: Run tests
+        run: composer test
+
+  php74-compat:
+    name: PHP 7.4 compatibility
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '7.4'
+          coverage: none
+
+      - name: Lint sources against PHP 7.4
+        run: find src -name '*.php' -print0 | xargs -0 -n1 -P4 php -l

composer.json

@@ -11,11 +11,19 @@
     "php": ">=7.4",
     "laravel/framework": ">=7.0.0"
   },
+  "require-dev": {
+    "orchestra/testbench": "10.0"
+  },
   "autoload": {
     "psr-4": {
       "PleskExtLaravel\\": "src/"
     }
   },
+  "autoload-dev": {
+    "psr-4": {
+      "PleskExtLaravel\\Tests\\": "tests/"
+    }
+  },
   "extra": {
     "component": "package",
     "laravel": {
@@ -25,10 +33,10 @@
     }
   },
   "config": {
-    "platform": {
-      "php": "7.4.0"
-    },
     "sort-packages": true
   },
+  "scripts": {
+    "test": "phpunit"
+  },
   "prefer-stable": true
 }

config/plesk-ext-laravel.php

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+         cacheDirectory=".phpunit.cache"
+         failOnWarning="true">
+    <testsuites>
+        <testsuite name="Package">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+    <source>
+        <include>
+            <directory>src</directory>
+        </include>
+    </source>
+</phpunit>

phpunit.xml

@@ -3,6 +3,7 @@
 namespace PleskExtLaravel\Console\Commands;
 
 use Illuminate\Console\Command;
+use PleskExtLaravel\PleskEnv;
 
 class ConfigSource extends Command
 {
@@ -12,6 +13,6 @@ class ConfigSource extends Command
 
     public function handle()
     {
-        $this->line(config('plesk-ext-laravel.config-source'));
+        $this->line(PleskEnv::configSource());
     }
 }

src/Console/Commands/ConfigSource.php

@@ -3,36 +3,79 @@
 namespace PleskExtLaravel\Console\Commands;
 
 use Illuminate\Console\Command;
+use PleskExtLaravel\PleskEnv;
 
 class ListEnv extends Command
 {
-    private const CONFIG_PARAMETERS_MAP = [
-        'plesk-ext-laravel.queue-worker.enabled' => 'PLESK_EXT_LARAVEL_QUEUE_WORKER_ENABLED',
-        'plesk-ext-laravel.queue-worker.params.stop-when-empty' => 'PLESK_EXT_LARAVEL_QUEUE_WORKER_STOP_WHEN_EMPTY',
-        'plesk-ext-laravel.queue-worker.params.timeout' => 'PLESK_EXT_LARAVEL_QUEUE_WORKER_TIMEOUT',
-        'plesk-ext-laravel.queue-worker.params.max-jobs' => 'PLESK_EXT_LARAVEL_QUEUE_WORKER_MAX_JOBS',
-        'plesk-ext-laravel.queue-worker.params.max-time' => 'PLESK_EXT_LARAVEL_QUEUE_WORKER_MAX_TIME',
-    ];
-
     protected $signature = 'plesk-ext-laravel:list-env';
 
-    protected $description = 'Display environment variables setted for Plesk Laravel Toolkit extension integration.';
+    protected $description = 'Display environment variables set for Plesk Laravel Toolkit extension integration.';
 
     public function handle()
+    {
+        $parameters = PleskEnv::isMultiQueue()
+            ? $this->multiQueueParameters()
+            : $this->legacyParameters();
+
+        $this->table(['Parameter', 'Value'], $parameters);
+    }
+
+    /**
+     * Legacy single-worker output, kept identical to previous versions.
+     *
+     * @return array<int, array{parameter: string, value: string}>
+     */
+    private function legacyParameters(): array
     {
         $parameters = [];
-        foreach (self::CONFIG_PARAMETERS_MAP as $key => $name) {
-            $value = config($key);
+        foreach (PleskEnv::legacyParameterNames() as $name) {
+            $value = PleskEnv::get($name);
 
-            if (is_bool($value)) {
-                $value = $value ? 'true' : 'false';
+            if ($value === null) {
+                // The legacy "enabled" flag defaulted to false, so it was shown
+                // as "false" when unset; other params were shown empty.
+                $value = $name === PleskEnv::LEGACY_ENABLED ? 'false' : '';
             }
 
             $parameters[] = [
                 'parameter' => $name,
                 'value' => $value,
             ];
         }
-        $this->table(['Parameter', 'Value'], $parameters);
+
+        return $parameters;
+    }
+
+    /**
+     * Multi-queue output: the queue list plus the per-queue variables of every
+     * listed queue.
+     *
+     * @return array<int, array{parameter: string, value: string}>
+     */
+    private function multiQueueParameters(): array
+    {
+        $parameters = [[
+            'parameter' => PleskEnv::LIST_VAR,
+            'value' => PleskEnv::get(PleskEnv::LIST_VAR) ?? '',
+        ]];
+
+        foreach (PleskEnv::queues() as $queue) {
+            foreach (PleskEnv::queueSuffixes() as $suffix) {
+                $name = PleskEnv::key($queue, $suffix);
+
+                // COUNT falls back to 1 when unset (same as the scheduler),
+                // so the displayed value matches what actually runs.
+                $value = $suffix === PleskEnv::SUFFIX_COUNT
+                    ? (string) PleskEnv::count($queue)
+                    : PleskEnv::get($name) ?? '';
+
+                $parameters[] = [
+                    'parameter' => $name,
+                    'value' => $value,
+                ];
+            }
+        }
+
+        return $parameters;
     }
 }