Update tests, refine ConfigCommand, and fix minor issues

Author: antonmedv

.github/workflows/test.yaml

@@ -50,7 +50,7 @@ jobs:
         run: composer install --prefer-dist --no-progress
 
       - name: Run test suite
-        run: composer test
+        run: vendor/bin/phpunit --order-by random
 
       - name: Run tests with coverage
         if: matrix.php-versions == '8.3'

README.md

@@ -9,7 +9,7 @@
 </h1>
 <p>The PHP deployment tool with support for popular frameworks out of the box.</p>
 
-<p align="center"><br><br><a href="https://deployer.org"><img src="https://medv.io/assets/deployer/deployer.gif" alt="Deployer Screenshot" width="530"></a><br><br><br></p>
+<p align="center"><br><br><a href="https://deployer.org"><img src="https://medv.io/assets/deployer/deployer-rounded.gif" alt="Deployer Screenshot" width="530"></a><br><br><br></p>
 
 ---
 

src/Command/ConfigCommand.php

@@ -43,24 +43,28 @@ protected function execute(Input $input, Output $output): int
         $data = [];
         $keys = $this->deployer->config->keys();
         WillAskUser::$noAsk = true;
-        foreach ($hosts as $host) {
-            Context::push(new Context($host));
-            $values = [];
-            foreach ($keys as $key) {
-                try {
-                    $values[$key] = $host->get($key);
-                } catch (WillAskUser $exception) {
-                    $values[$key] = ['ask' => $exception->getMessage()];
-                } catch (\Throwable $exception) {
-                    $values[$key] = ['error' => $exception->getMessage()];
+        try {
+            foreach ($hosts as $host) {
+                Context::push(new Context($host));
+                $values = [];
+                foreach ($keys as $key) {
+                    try {
+                        $values[$key] = $host->get($key);
+                    } catch (WillAskUser $exception) {
+                        $values[$key] = ['ask' => $exception->getMessage()];
+                    } catch (\Throwable $exception) {
+                        $values[$key] = ['error' => $exception->getMessage()];
+                    }
                 }
+                foreach ($host->config()->persist() as $k => $v) {
+                    $values[$k] = $v;
+                }
+                ksort($values);
+                $data[$host->getAlias()] = $values;
+                Context::pop();
             }
-            foreach ($host->config()->persist() as $k => $v) {
-                $values[$k] = $v;
-            }
-            ksort($values);
-            $data[$host->getAlias()] = $values;
-            Context::pop();
+        } finally {
+            WillAskUser::$noAsk = false;
         }
         $format = $input->getOption('format');
         switch ($format) {

src/functions.php

@@ -763,7 +763,7 @@ function has(string $name): bool
 
 function ask(string $message, ?string $default = null, ?array $autocomplete = null): ?string
 {
-        if (WillAskUser::$noAsk) {
+    if (WillAskUser::$noAsk) {
         throw new WillAskUser($message);
     }
     Context::required(__FUNCTION__);

tests/joy/JoyTest.php

@@ -47,6 +47,12 @@ protected static function cleanUp()
 
     protected function init(string $recipe)
     {
+        // Clear any leftover Context from other tests to prevent
+        // recipe set() calls from writing to a stale host config.
+        while (\Deployer\Task\Context::has()) {
+            \Deployer\Task\Context::pop();
+        }
+
         $console = new Application();
         $console->setAutoExit(false);
         $this->tester = new ApplicationTester($console);

tests/legacy/DeployTest.php

@@ -43,6 +43,7 @@ public function testDeploy()
         }
     }
 
+    #[Depends('testDeploy')]
     public function testDeploySelectHosts()
     {
         $this->init(self::RECIPE);
@@ -54,6 +55,7 @@ public function testDeploySelectHosts()
         self::assertEquals(0, $this->tester->getStatusCode(), $this->tester->getDisplay());
     }
 
+    #[Depends('testDeploySelectHosts')]
     public function testKeepReleases()
     {
         for ($i = 0; $i < 3; $i++) {
@@ -92,6 +94,7 @@ public function testRollback()
         }
     }
 
+    #[Depends('testRollback')]
     public function testFail()
     {
         $this->depFile(self::RECIPE, 'deploy:fail');
@@ -120,6 +123,7 @@ public function testCleanup()
         }
     }
 
+    #[Depends('testCleanup')]
     public function testIsUnlockedExitsWithOneWhenDeployIsLocked()
     {
         $this->depFile(self::RECIPE, 'deploy:lock');
@@ -130,6 +134,7 @@ public function testIsUnlockedExitsWithOneWhenDeployIsLocked()
         self::assertSame(1, $this->tester->getStatusCode());
     }
 
+    #[Depends('testIsUnlockedExitsWithOneWhenDeployIsLocked')]
     public function testIsUnlockedExitsWithZeroWhenDeployIsNotLocked()
     {
         $this->depFile(self::RECIPE, 'deploy:unlock');