Display old structure if .env.plesk is missing or empty

Author: ferrumfist

src/PleskEnv.php

@@ -91,22 +91,54 @@ public static function get(string $name): ?string
     }
 
     /**
-     * Whether the multi-queue scheme is configured (the queue list is present).
-     * When false, the legacy single-worker variables should be used instead.
+     * Whether the multi-queue format applies. True only when the
+     * PLESK_EXT_LARAVEL_QUEUE_LIST key is explicitly present in the file (an
+     * empty "PLESK_EXT_LARAVEL_QUEUE_LIST=" still counts). A missing or empty
+     * file, or a legacy-only file, falls back to the legacy single-worker
+     * format. This is what the Plesk extension keys on: the queue-list row
+     * appears in the output only for the new format.
      */
     public static function isMultiQueue(): bool
     {
-        return self::get(self::LIST_VAR) !== null;
+        return self::hasQueueList();
     }
 
     /**
-     * Where the queue configuration comes from. Reads .env.plesk directly, so
-     * the result is either "plesk-environment" (any queue setting present) or
-     * "default" (nothing configured).
+     * Whether the PLESK_EXT_LARAVEL_QUEUE_LIST key is defined, regardless of its
+     * value (an empty value still counts as present).
+     */
+    public static function hasQueueList(): bool
+    {
+        self::load();
+
+        return Env::getRepository()->has(self::LIST_VAR);
+    }
+
+    /**
+     * Whether any legacy single-worker variable is defined.
+     */
+    private static function hasLegacyConfig(): bool
+    {
+        self::load();
+
+        $repository = Env::getRepository();
+        foreach (self::legacyParameterNames() as $name) {
+            if ($repository->has($name)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Where the queue configuration comes from: "plesk-environment" when any
+     * queue configuration is present (the queue-list key or a legacy variable),
+     * otherwise "default".
      */
     public static function configSource(): string
     {
-        if (self::isMultiQueue() || self::get(self::LEGACY_ENABLED) !== null) {
+        if (self::hasQueueList() || self::hasLegacyConfig()) {
             return self::SOURCE_PLESK_ENV;
         }
 

tests/Feature/ListEnvCommandTest.php

@@ -30,6 +30,28 @@ public function testLegacyOutputShowsWorkerVariables(): void
 
     public function testLegacyOutputDefaultsEnabledToFalseWhenUnset(): void
     {
+        // Legacy structure: a WORKER_* variable is present and there is no
+        // queue-list key, so the enabled flag is unset and shown as "false".
+        $this->setPleskEnv([
+            'PLESK_EXT_LARAVEL_QUEUE_WORKER_TIMEOUT' => '5',
+        ]);
+
+        $this->artisan('plesk-ext-laravel:list-env')
+            ->expectsTable(['Parameter', 'Value'], [
+                ['PLESK_EXT_LARAVEL_QUEUE_MULTIPLE_SUPPORTED', 'true'],
+                ['PLESK_EXT_LARAVEL_QUEUE_WORKER_ENABLED', 'false'],
+                ['PLESK_EXT_LARAVEL_QUEUE_WORKER_STOP_WHEN_EMPTY', ''],
+                ['PLESK_EXT_LARAVEL_QUEUE_WORKER_TIMEOUT', '5'],
+                ['PLESK_EXT_LARAVEL_QUEUE_WORKER_MAX_JOBS', ''],
+                ['PLESK_EXT_LARAVEL_QUEUE_WORKER_MAX_TIME', ''],
+            ])
+            ->assertExitCode(0);
+    }
+
+    public function testEmptyEnvironmentOutputsLegacyFormat(): void
+    {
+        // No .env.plesk / nothing configured -> legacy format (no queue-list
+        // row), so the extension treats it as the old package.
         $this->artisan('plesk-ext-laravel:list-env')
             ->expectsTable(['Parameter', 'Value'], [
                 ['PLESK_EXT_LARAVEL_QUEUE_MULTIPLE_SUPPORTED', 'true'],
@@ -42,6 +64,22 @@ public function testLegacyOutputDefaultsEnabledToFalseWhenUnset(): void
             ->assertExitCode(0);
     }
 
+    public function testExplicitEmptyQueueListOutputsMultiQueueFormat(): void
+    {
+        // Only "PLESK_EXT_LARAVEL_QUEUE_LIST=" present -> the new format, because
+        // the queue-list key is explicitly there.
+        $this->setPleskEnv([
+            'PLESK_EXT_LARAVEL_QUEUE_LIST' => '',
+        ]);
+
+        $this->artisan('plesk-ext-laravel:list-env')
+            ->expectsTable(['Parameter', 'Value'], [
+                ['PLESK_EXT_LARAVEL_QUEUE_MULTIPLE_SUPPORTED', 'true'],
+                ['PLESK_EXT_LARAVEL_QUEUE_LIST', ''],
+            ])
+            ->assertExitCode(0);
+    }
+
     public function testMultiQueueOutputListsEveryQueueParameter(): void
     {
         $this->setPleskEnv([

tests/Feature/ScheduleTest.php

@@ -92,7 +92,19 @@ public function testLegacyWorkerTranslatesEveryParameterToFlags(): void
 
     public function testNothingIsScheduledWhenLegacyWorkerDisabled(): void
     {
-        // No PLESK_EXT_LARAVEL_QUEUE_* variables set at all.
+        // Legacy structure (a WORKER_* variable present, no queue list) with the
+        // worker explicitly disabled -> nothing is scheduled.
+        $this->setPleskEnv([
+            'PLESK_EXT_LARAVEL_QUEUE_WORKER_ENABLED' => 'false',
+        ]);
+
+        $this->assertCount(0, $this->queueWorkerCommands());
+    }
+
+    public function testNothingIsScheduledWithoutAnyConfiguration(): void
+    {
+        // No PLESK_EXT_LARAVEL_QUEUE_* variables at all: legacy mode with the
+        // worker not enabled -> no workers.
         $this->assertCount(0, $this->queueWorkerCommands());
     }