Merge branch 'main' into CLI-1631

Author: jigar-shah-acquia

src/Command/CodeStudio/CodeStudioWizardCommand.php

@@ -332,6 +332,7 @@ private function promptForPhpVersions(): string
             'PHP_version_8.2' => "8.2",
             'PHP_version_8.3' => "8.3",
             'PHP_version_8.4' => "8.4",
+            'PHP_version_8.5' => "8.5",
         ];
         $phpChoice = $this->io->choice('Select a PHP version', array_values($phpVersions), "8.3");
         $phpKey = array_search($phpChoice, $phpVersions, true);

tests/phpunit/src/Commands/CodeStudio/CodeStudioWizardCommandTest.php

@@ -124,6 +124,26 @@ public static function providerTestCommand(): array
                     self::ARG_SECRET => self::$secret,
                 ],
             ],
+            // Application: Drupal_project, PHP 8.5.
+            [
+                [self::getMockedGitLabProject(self::$gitLabProjectId)],
+                [
+                    // Project type: Drupal_project.
+                    0,
+                    // MySQL version: 8.0.
+                    1,
+                    // PHP version: 8.5.
+                    3,
+                    // Do you want to continue?
+                    'y',
+                    // One time push?
+                    'y',
+                ],
+                [
+                    self::ARG_KEY => self::$key,
+                    self::ARG_SECRET => self::$secret,
+                ],
+            ],
             // Application: Node_project, Basic, Node 20.
             [
                 [self::getMockedGitLabProject(self::$gitLabProjectId)],