Merge branch '4.x' into release-docs-automation

Author: namespacebrian

CHANGELOG.md

@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. This projec
 
 ## 4.0.4-dev
 
+### Added
+
+- Add "PHP Runtime Generation" (php_runtime_generation) and "PHP Version" (php_version) to the `env:list` command (#2729, #2732)
+
 ## 4.0.3 - 2025-09-11
 
 ### Added

src/Commands/Env/ListCommand.php

@@ -34,7 +34,11 @@ class ListCommand extends TerminusCommand implements SiteAwareInterface
      *     connection_mode: Connection Mode
      *     locked: Locked
      *     initialized: Initialized
-     * @return RowsOfFields
+     *     php_version: PHP Version
+     *     php_runtime_generation: PHP Runtime Generation
+     * @default-fields id,created,domain,connection_mode,locked,initialized
+
+    * @return RowsOfFields
      *
      * @param string $site_id Site name
      *

src/Commands/Workflow/WaitCommand.php

@@ -111,18 +111,20 @@ protected function waitForWorkflow(
         do {
             $current_time = time();
             if ($maxNotFoundAttempts && $not_found_attempts === $maxNotFoundAttempts) {
-                throw new TerminusException(
+                $this->log()->warning(
                     "Attempted '{max}' times, giving up waiting for workflow to be found",
                     ['max' => $maxNotFoundAttempts]
                 );
+                return;
             }
 
-            // Check if the timeout has been reached and throw an exception if so.
+            // Check if the timeout has been reached and log warning if so.
             if ($end_time > 0 && $current_time >= $end_time) {
-                throw new TerminusException(
-                    'Workflow timed out after {timeout} seconds.',
+                $this->log()->warning(
+                    'Waited \'{timeout}\' seconds, giving up waiting for workflow to finish',
                     ['timeout' => $maxWaitInSeconds]
                 );
+                return;
             }
             $site = $this->getSiteById($site->id);
             $workflows->reset();
@@ -171,10 +173,11 @@ protected function waitForWorkflow(
         }
         do {
             if ($end_time > 0 && $current_time >= $end_time) {
-                throw new TerminusException(
-                    'Workflow timed out after {timeout} seconds.',
+                $this->log()->warning(
+                    'Waited \'{timeout}\' seconds, giving up waiting for workflow to finish',
                     ['timeout' => $maxWaitInSeconds]
                 );
+                return;
             }
             $workflow->fetch();
             usleep($retry_interval * 1000);
@@ -226,10 +229,11 @@ protected function waitForCommit(
 
             // Check timeout
             if ($end_time > 0 && $current_time >= $end_time) {
-                throw new TerminusException(
-                    'Workflow with commit {commit} timed out after {timeout} seconds.',
+                $this->log()->warning(
+                    'Waited \'{timeout}\' seconds, giving up waiting for workflow with commit {commit} to finish',
                     ['commit' => $target_commit, 'timeout' => $maxWaitInSeconds]
                 );
+                return;
             }
 
             // Fetch workflow logs using the logs/workflows endpoint
@@ -281,10 +285,11 @@ protected function waitForCommit(
 
             $retry_count++;
             if ($retry_count >= $max_retries) {
-                throw new TerminusException(
+                $this->log()->warning(
                     'Workflow with commit {commit} not found after {retries} attempts.',
                     ['commit' => $target_commit, 'retries' => $max_retries]
                 );
+                return;
             }
 
             $this->log()->debug('Workflow not found, retrying... ({retry}/{max})', [
@@ -305,10 +310,11 @@ protected function waitForCommit(
         do {
             $current_time = time();
             if ($end_time > 0 && $current_time >= $end_time) {
-                throw new TerminusException(
-                    'Workflow timed out after {timeout} seconds.',
+                $this->log()->warning(
+                    'Waited \'{timeout}\' seconds, giving up waiting for workflow to finish',
                     ['timeout' => $maxWaitInSeconds]
                 );
+                return;
             }
 
             // Re-fetch workflow logs to get updated status

src/Models/Environment.php

@@ -690,7 +690,7 @@ public function getPHPVersion()
      */
     public function getPHPRuntimeGeneration()
     {
-         return $this->settings('appserver_runtime')->php_runtime_generation;
+        return $this->settings('appserver_runtime')->php_runtime_generation;
     }
 
     /**

tests/Functional/EnvCommandsTest.php

@@ -457,6 +457,60 @@ public function testListCommand()
         );
     }
 
+    /**
+     * @test
+     * @covers \Pantheon\Terminus\Commands\Env\ListCommand
+     *
+     * @group env
+     * @group short
+     */
+    public function testListCommandWithPHPRuntimeGeneration()
+    {
+        $envs = $this->terminusJsonResponse(
+            sprintf('env:list %s --fields=id,php_runtime_generation', $this->getSiteName())
+        );
+        $this->assertIsArray($envs);
+        $env = array_shift($envs);
+
+        $this->assertArrayHasKey(
+            'id',
+            $env,
+            'An environment should have "id" field.'
+        );
+        $this->assertArrayHasKey(
+            'php_runtime_generation',
+            $env,
+            'An environment should have "php_runtime_generation" field when explicitly requested.'
+        );
+    }
+
+    /**
+     * @test
+     * @covers \Pantheon\Terminus\Commands\Env\ListCommand
+     *
+     * @group env
+     * @group short
+     */
+    public function testListCommandWithPHPVersion()
+    {
+        $envs = $this->terminusJsonResponse(
+            sprintf('env:list %s --fields=id,php_version', $this->getSiteName())
+        );
+        $this->assertIsArray($envs);
+        $env = array_shift($envs);
+
+        $this->assertArrayHasKey(
+            'id',
+            $env,
+            'An environment should have "id" field.'
+        );
+        $this->assertArrayHasKey(
+            'php_version',
+            $env,
+            'An environment should have "php_version" field when explicitly requested.'
+        );
+    }
+
     /**
      * @test
      * @covers \Pantheon\Terminus\Commands\Env\ViewCommand