From 860403d3e690a0e4da597e4d3051f919ce8e1d17 Mon Sep 17 00:00:00 2001 From: Shubham Bansal Date: Wed, 20 Sep 2023 14:13:13 +0530 Subject: [PATCH 01/10] added prompt for php version --- .../CodeStudio/CodeStudioCiCdVariables.php | 9 ++++++++- .../CodeStudio/CodeStudioWizardCommand.php | 15 ++++++++++++--- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/Command/CodeStudio/CodeStudioCiCdVariables.php b/src/Command/CodeStudio/CodeStudioCiCdVariables.php index 6f422f6d4..8380be32d 100644 --- a/src/Command/CodeStudio/CodeStudioCiCdVariables.php +++ b/src/Command/CodeStudio/CodeStudioCiCdVariables.php @@ -16,7 +16,7 @@ public static function getList(): array { /** * @return array */ - public static function getDefaults(?string $cloudApplicationUuid = NULL, ?string $cloudKey = NULL, ?string $cloudSecret = NULL, ?string $projectAccessTokenName = NULL, ?string $projectAccessToken = NULL): array { + public static function getDefaults(?string $cloudApplicationUuid = NULL, ?string $cloudKey = NULL, ?string $cloudSecret = NULL, ?string $projectAccessTokenName = NULL, ?string $projectAccessToken = NULL, int $phpVersion): array { return [ [ 'key' => 'ACQUIA_APPLICATION_UUID', @@ -53,6 +53,13 @@ public static function getDefaults(?string $cloudApplicationUuid = NULL, ?string 'value' => $projectAccessToken, 'variable_type' => 'env_var', ], + [ + 'key' => 'PHP_VERSION', + 'masked' => FALSE, + 'protected' => FALSE, + 'value' => $phpVersion, + 'variable_type' => 'env_var', + ], ]; } diff --git a/src/Command/CodeStudio/CodeStudioWizardCommand.php b/src/Command/CodeStudio/CodeStudioWizardCommand.php index 4788d92cb..78dada7d1 100644 --- a/src/Command/CodeStudio/CodeStudioWizardCommand.php +++ b/src/Command/CodeStudio/CodeStudioWizardCommand.php @@ -46,6 +46,15 @@ protected function execute(InputInterface $input, OutputInterface $output): int // But, we specifically need an API Token key-pair of Code Studio. // So we reauthenticate to be sure we're using the provided credentials. $this->reAuthenticate($cloudKey, $cloudSecret, $this->cloudCredentials->getBaseUri(), $this->cloudCredentials->getAccountsUri()); + + $phpVersions = [ + 'PHP_version_8.1' => 8.1, + 'PHP_version_8.2' => 8.2, + ]; + $project = $this->io->choice('Select a PHP version', array_values($phpVersions), $phpVersions['PHP_version_8.1']); + $project = array_search($project, $phpVersions, TRUE); + $phpVersion = $phpVersions[$project]; + $appUuid = $this->determineCloudApplication(); // Get Cloud account. @@ -92,7 +101,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int $projectAccessTokenName = 'acquia-codestudio'; $projectAccessToken = $this->createProjectAccessToken($project, $projectAccessTokenName); $this->updateGitLabProject($project); - $this->setGitLabCiCdVariables($project, $appUuid, $cloudKey, $cloudSecret, $projectAccessTokenName, $projectAccessToken); + $this->setGitLabCiCdVariables($project, $appUuid, $cloudKey, $cloudSecret, $projectAccessTokenName, $projectAccessToken, $phpVersion); $this->createScheduledPipeline($project); $this->io->success([ @@ -161,9 +170,9 @@ private function createProjectAccessToken(array $project, string $projectAccessT return $projectAccessToken['token']; } - private function setGitLabCiCdVariables(array $project, string $cloudApplicationUuid, string $cloudKey, string $cloudSecret, string $projectAccessTokenName, string $projectAccessToken): void { + private function setGitLabCiCdVariables(array $project, string $cloudApplicationUuid, string $cloudKey, string $cloudSecret, string $projectAccessTokenName, string $projectAccessToken, int $phpVersion): void { $this->io->writeln("Setting GitLab CI/CD variables for {$project['path_with_namespace']}.."); - $gitlabCicdVariables = CodeStudioCiCdVariables::getDefaults($cloudApplicationUuid, $cloudKey, $cloudSecret, $projectAccessTokenName, $projectAccessToken); + $gitlabCicdVariables = CodeStudioCiCdVariables::getDefaults($cloudApplicationUuid, $cloudKey, $cloudSecret, $projectAccessTokenName, $projectAccessToken, $phpVersion); $gitlabCicdExistingVariables = $this->gitLabClient->projects() ->variables($project['id']); $gitlabCicdExistingVariablesKeyed = []; From fbced374dac7dc351e42d9b49faf8bdff3682687 Mon Sep 17 00:00:00 2001 From: Shubham Bansal Date: Mon, 25 Sep 2023 19:11:42 +0530 Subject: [PATCH 02/10] changes int to string --- src/Command/CodeStudio/CodeStudioCiCdVariables.php | 2 +- src/Command/CodeStudio/CodeStudioWizardCommand.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Command/CodeStudio/CodeStudioCiCdVariables.php b/src/Command/CodeStudio/CodeStudioCiCdVariables.php index 8380be32d..afac39408 100644 --- a/src/Command/CodeStudio/CodeStudioCiCdVariables.php +++ b/src/Command/CodeStudio/CodeStudioCiCdVariables.php @@ -16,7 +16,7 @@ public static function getList(): array { /** * @return array */ - public static function getDefaults(?string $cloudApplicationUuid = NULL, ?string $cloudKey = NULL, ?string $cloudSecret = NULL, ?string $projectAccessTokenName = NULL, ?string $projectAccessToken = NULL, int $phpVersion): array { + public static function getDefaults(?string $cloudApplicationUuid = NULL, ?string $cloudKey = NULL, ?string $cloudSecret = NULL, ?string $projectAccessTokenName = NULL, ?string $projectAccessToken = NULL, ?string $phpVersion = NULL): array { return [ [ 'key' => 'ACQUIA_APPLICATION_UUID', diff --git a/src/Command/CodeStudio/CodeStudioWizardCommand.php b/src/Command/CodeStudio/CodeStudioWizardCommand.php index 78dada7d1..24fa2e210 100644 --- a/src/Command/CodeStudio/CodeStudioWizardCommand.php +++ b/src/Command/CodeStudio/CodeStudioWizardCommand.php @@ -170,7 +170,7 @@ private function createProjectAccessToken(array $project, string $projectAccessT return $projectAccessToken['token']; } - private function setGitLabCiCdVariables(array $project, string $cloudApplicationUuid, string $cloudKey, string $cloudSecret, string $projectAccessTokenName, string $projectAccessToken, int $phpVersion): void { + private function setGitLabCiCdVariables(array $project, string $cloudApplicationUuid, string $cloudKey, string $cloudSecret, string $projectAccessTokenName, string $projectAccessToken, string $phpVersion): void { $this->io->writeln("Setting GitLab CI/CD variables for {$project['path_with_namespace']}.."); $gitlabCicdVariables = CodeStudioCiCdVariables::getDefaults($cloudApplicationUuid, $cloudKey, $cloudSecret, $projectAccessTokenName, $projectAccessToken, $phpVersion); $gitlabCicdExistingVariables = $this->gitLabClient->projects() From 3eaf999be11890b962bccc31a87b62355bbf55e6 Mon Sep 17 00:00:00 2001 From: Shubham Bansal Date: Mon, 25 Sep 2023 21:44:48 +0530 Subject: [PATCH 03/10] changes PHP_VERSION from int to string --- src/Command/CodeStudio/CodeStudioWizardCommand.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Command/CodeStudio/CodeStudioWizardCommand.php b/src/Command/CodeStudio/CodeStudioWizardCommand.php index 24fa2e210..2d83e22a2 100644 --- a/src/Command/CodeStudio/CodeStudioWizardCommand.php +++ b/src/Command/CodeStudio/CodeStudioWizardCommand.php @@ -48,8 +48,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int $this->reAuthenticate($cloudKey, $cloudSecret, $this->cloudCredentials->getBaseUri(), $this->cloudCredentials->getAccountsUri()); $phpVersions = [ - 'PHP_version_8.1' => 8.1, - 'PHP_version_8.2' => 8.2, + 'PHP_version_8.1' => "8.1", + 'PHP_version_8.2' => "8.2", ]; $project = $this->io->choice('Select a PHP version', array_values($phpVersions), $phpVersions['PHP_version_8.1']); $project = array_search($project, $phpVersions, TRUE); From 33d243ba42f9f12d097e5236ebcd2d3f888e487b Mon Sep 17 00:00:00 2001 From: Shubham Bansal Date: Wed, 27 Sep 2023 18:43:16 +0530 Subject: [PATCH 04/10] added UTC --- .../src/Commands/CodeStudio/CodeStudioWizardCommandTest.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/phpunit/src/Commands/CodeStudio/CodeStudioWizardCommandTest.php b/tests/phpunit/src/Commands/CodeStudio/CodeStudioWizardCommandTest.php index b797d674a..f46bc2772 100644 --- a/tests/phpunit/src/Commands/CodeStudio/CodeStudioWizardCommandTest.php +++ b/tests/phpunit/src/Commands/CodeStudio/CodeStudioWizardCommandTest.php @@ -65,6 +65,7 @@ public function providerTestCommand(): array { // Args. [ '--key' => $this->key, + '--phpversion' => "8.1", '--secret' => $this->secret, ], ], @@ -83,6 +84,7 @@ public function providerTestCommand(): array { // Args. [ '--key' => $this->key, + '--phpversion' => "8.1", '--secret' => $this->secret, ], ], @@ -101,6 +103,7 @@ public function providerTestCommand(): array { // Args. [ '--key' => $this->key, + '--phpversion' => "8.1", '--secret' => $this->secret, ], ], @@ -119,6 +122,7 @@ public function providerTestCommand(): array { // Args [ '--key' => $this->key, + '--phpversion' => "8.1", '--secret' => $this->secret, ], ], @@ -133,6 +137,7 @@ public function providerTestCommand(): array { $this->key, // Enter Cloud secret, $this->secret, + '--phpversion' => "8.1", // Do you want to continue? 'y', ], From 7a191b1b49bca69300e42a27b28018542ddf0827 Mon Sep 17 00:00:00 2001 From: Shubham Bansal Date: Wed, 27 Sep 2023 19:27:46 +0530 Subject: [PATCH 05/10] fixed UTC --- .../CodeStudio/CodeStudioWizardCommandTest.php | 10 +++++----- tests/phpunit/src/TestBase.php | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/phpunit/src/Commands/CodeStudio/CodeStudioWizardCommandTest.php b/tests/phpunit/src/Commands/CodeStudio/CodeStudioWizardCommandTest.php index f46bc2772..34ec28820 100644 --- a/tests/phpunit/src/Commands/CodeStudio/CodeStudioWizardCommandTest.php +++ b/tests/phpunit/src/Commands/CodeStudio/CodeStudioWizardCommandTest.php @@ -65,7 +65,7 @@ public function providerTestCommand(): array { // Args. [ '--key' => $this->key, - '--phpversion' => "8.1", + '--phpversion' => $this->phpVersion, '--secret' => $this->secret, ], ], @@ -84,7 +84,7 @@ public function providerTestCommand(): array { // Args. [ '--key' => $this->key, - '--phpversion' => "8.1", + '--phpversion' => $this->phpVersion, '--secret' => $this->secret, ], ], @@ -103,7 +103,7 @@ public function providerTestCommand(): array { // Args. [ '--key' => $this->key, - '--phpversion' => "8.1", + '--phpversion' => $this->phpVersion, '--secret' => $this->secret, ], ], @@ -122,7 +122,7 @@ public function providerTestCommand(): array { // Args [ '--key' => $this->key, - '--phpversion' => "8.1", + '--phpVersion' => $this->phpVersion, '--secret' => $this->secret, ], ], @@ -137,7 +137,7 @@ public function providerTestCommand(): array { $this->key, // Enter Cloud secret, $this->secret, - '--phpversion' => "8.1", + '--phpversion' => $this->phpVersion, // Do you want to continue? 'y', ], diff --git a/tests/phpunit/src/TestBase.php b/tests/phpunit/src/TestBase.php index e88bdb6a8..e60d1cd94 100644 --- a/tests/phpunit/src/TestBase.php +++ b/tests/phpunit/src/TestBase.php @@ -86,6 +86,8 @@ abstract class TestBase extends TestCase { protected string $secret = 'X1u\/PIQXtYaoeui.4RJSJpGZjwmWYmfl5AUQkAebYE='; + protected string $phpVersion = '8.1'; + protected string $dataDir; protected string $cloudConfigFilepath; From 62441efe00e538267c93a966cf7208cdde699ed4 Mon Sep 17 00:00:00 2001 From: Shubham Bansal Date: Wed, 27 Sep 2023 19:35:11 +0530 Subject: [PATCH 06/10] fixed UTC --- .../src/Commands/CodeStudio/CodeStudioWizardCommandTest.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/phpunit/src/Commands/CodeStudio/CodeStudioWizardCommandTest.php b/tests/phpunit/src/Commands/CodeStudio/CodeStudioWizardCommandTest.php index 34ec28820..32315c948 100644 --- a/tests/phpunit/src/Commands/CodeStudio/CodeStudioWizardCommandTest.php +++ b/tests/phpunit/src/Commands/CodeStudio/CodeStudioWizardCommandTest.php @@ -213,6 +213,7 @@ public function testInvalidGitLabCredentials(): void { $this->expectExceptionMessage('Unable to authenticate with Code Studio'); $this->executeCommand([ '--key' => $this->key, + '--phpversion' => $this->phpVersion, '--secret' => $this->secret, ]); } @@ -227,6 +228,7 @@ public function testMissingGitLabCredentials(): void { $this->expectExceptionMessage('Could not determine GitLab token'); $this->executeCommand([ '--key' => $this->key, + '--phpversion' => $this->phpVersion, '--secret' => $this->secret, ]); } From 17efb34131a36733480e46bdce99351ba999bc88 Mon Sep 17 00:00:00 2001 From: Shubham Bansal Date: Wed, 27 Sep 2023 19:38:47 +0530 Subject: [PATCH 07/10] fixed UTC variable name --- .../CodeStudio/CodeStudioWizardCommandTest.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/phpunit/src/Commands/CodeStudio/CodeStudioWizardCommandTest.php b/tests/phpunit/src/Commands/CodeStudio/CodeStudioWizardCommandTest.php index 32315c948..e8d5887d4 100644 --- a/tests/phpunit/src/Commands/CodeStudio/CodeStudioWizardCommandTest.php +++ b/tests/phpunit/src/Commands/CodeStudio/CodeStudioWizardCommandTest.php @@ -65,7 +65,7 @@ public function providerTestCommand(): array { // Args. [ '--key' => $this->key, - '--phpversion' => $this->phpVersion, + '--phpVersion' => $this->phpVersion, '--secret' => $this->secret, ], ], @@ -84,7 +84,7 @@ public function providerTestCommand(): array { // Args. [ '--key' => $this->key, - '--phpversion' => $this->phpVersion, + '--phpVersion' => $this->phpVersion, '--secret' => $this->secret, ], ], @@ -103,7 +103,7 @@ public function providerTestCommand(): array { // Args. [ '--key' => $this->key, - '--phpversion' => $this->phpVersion, + '--phpVersion' => $this->phpVersion, '--secret' => $this->secret, ], ], @@ -137,7 +137,7 @@ public function providerTestCommand(): array { $this->key, // Enter Cloud secret, $this->secret, - '--phpversion' => $this->phpVersion, + '--phpVersion' => $this->phpVersion, // Do you want to continue? 'y', ], @@ -213,7 +213,7 @@ public function testInvalidGitLabCredentials(): void { $this->expectExceptionMessage('Unable to authenticate with Code Studio'); $this->executeCommand([ '--key' => $this->key, - '--phpversion' => $this->phpVersion, + '--phpVersion' => $this->phpVersion, '--secret' => $this->secret, ]); } @@ -228,7 +228,7 @@ public function testMissingGitLabCredentials(): void { $this->expectExceptionMessage('Could not determine GitLab token'); $this->executeCommand([ '--key' => $this->key, - '--phpversion' => $this->phpVersion, + '--phpVersion' => $this->phpVersion, '--secret' => $this->secret, ]); } From c24e1c6311b9680a169b238e39a741be8f241cdc Mon Sep 17 00:00:00 2001 From: Shubham Bansal Date: Thu, 28 Sep 2023 12:01:11 +0530 Subject: [PATCH 08/10] fixed broken tests --- tests/phpunit/src/CommandTestBase.php | 2 +- .../CodeStudio/CodeStudioWizardCommandTest.php | 18 +++++++++++------- tests/phpunit/src/TestBase.php | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/tests/phpunit/src/CommandTestBase.php b/tests/phpunit/src/CommandTestBase.php index ab573ba7e..9e7517986 100644 --- a/tests/phpunit/src/CommandTestBase.php +++ b/tests/phpunit/src/CommandTestBase.php @@ -633,7 +633,7 @@ protected function getMockGitLabVariables(): array { 'protected' => FALSE, 'value' => '111aae74-e81a-4052-b4b9-a27a62e6b6a6', 'variable_type' => 'env_var', - ], + ], ]; } diff --git a/tests/phpunit/src/Commands/CodeStudio/CodeStudioWizardCommandTest.php b/tests/phpunit/src/Commands/CodeStudio/CodeStudioWizardCommandTest.php index e8d5887d4..7ccb0d787 100644 --- a/tests/phpunit/src/Commands/CodeStudio/CodeStudioWizardCommandTest.php +++ b/tests/phpunit/src/Commands/CodeStudio/CodeStudioWizardCommandTest.php @@ -65,9 +65,9 @@ public function providerTestCommand(): array { // Args. [ '--key' => $this->key, - '--phpVersion' => $this->phpVersion, '--secret' => $this->secret, ], + //'--phpVersion' => $this->phpVersion, ], // Two projects. [ @@ -84,9 +84,9 @@ public function providerTestCommand(): array { // Args. [ '--key' => $this->key, - '--phpVersion' => $this->phpVersion, '--secret' => $this->secret, ], + // '--phpVersion' => $this->phpVersion, ], [ // No projects. @@ -95,6 +95,8 @@ public function providerTestCommand(): array { [ // 'Would you like to create a new Code Studio project? 'y', + // Select PHP version + '0', // Do you want to continue? 'y', // Would you like to perform a one time push of code from Acquia Cloud to Code Studio now? (yes/no) [yes]: @@ -103,9 +105,9 @@ public function providerTestCommand(): array { // Args. [ '--key' => $this->key, - '--phpVersion' => $this->phpVersion, '--secret' => $this->secret, ], + // '--phpVersion' => $this->phpVersion, ], [ // No projects. @@ -122,9 +124,9 @@ public function providerTestCommand(): array { // Args [ '--key' => $this->key, - '--phpVersion' => $this->phpVersion, '--secret' => $this->secret, ], + // '--phpVersion' => $this->phpVersion, ], [ // No projects. @@ -137,10 +139,12 @@ public function providerTestCommand(): array { $this->key, // Enter Cloud secret, $this->secret, - '--phpVersion' => $this->phpVersion, + // Select PHP version + '0', // Do you want to continue? 'y', ], + // '--phpVersion' => $this->phpVersion, // Args [], ], @@ -213,8 +217,8 @@ public function testInvalidGitLabCredentials(): void { $this->expectExceptionMessage('Unable to authenticate with Code Studio'); $this->executeCommand([ '--key' => $this->key, - '--phpVersion' => $this->phpVersion, '--secret' => $this->secret, + // '--phpVersion' => $this->phpVersion, ]); } @@ -228,8 +232,8 @@ public function testMissingGitLabCredentials(): void { $this->expectExceptionMessage('Could not determine GitLab token'); $this->executeCommand([ '--key' => $this->key, - '--phpVersion' => $this->phpVersion, '--secret' => $this->secret, + // '--phpVersion' => $this->phpVersion, ]); } diff --git a/tests/phpunit/src/TestBase.php b/tests/phpunit/src/TestBase.php index e60d1cd94..3e913b3ab 100644 --- a/tests/phpunit/src/TestBase.php +++ b/tests/phpunit/src/TestBase.php @@ -86,7 +86,7 @@ abstract class TestBase extends TestCase { protected string $secret = 'X1u\/PIQXtYaoeui.4RJSJpGZjwmWYmfl5AUQkAebYE='; - protected string $phpVersion = '8.1'; + // protected string $phpVersion = '8.1'; protected string $dataDir; From f8b8534562c6e92e57149ac781eff1cc93ecca9a Mon Sep 17 00:00:00 2001 From: Shubham Bansal Date: Thu, 28 Sep 2023 18:42:42 +0530 Subject: [PATCH 09/10] added test to increase coverage --- .../CodeStudioWizardCommandTest.php | 45 ++++++++++++++++++- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/tests/phpunit/src/Commands/CodeStudio/CodeStudioWizardCommandTest.php b/tests/phpunit/src/Commands/CodeStudio/CodeStudioWizardCommandTest.php index 7ccb0d787..535437b34 100644 --- a/tests/phpunit/src/Commands/CodeStudio/CodeStudioWizardCommandTest.php +++ b/tests/phpunit/src/Commands/CodeStudio/CodeStudioWizardCommandTest.php @@ -95,7 +95,7 @@ public function providerTestCommand(): array { [ // 'Would you like to create a new Code Studio project? 'y', - // Select PHP version + // Select PHP version 8.1 '0', // Do you want to continue? 'y', @@ -109,6 +109,27 @@ public function providerTestCommand(): array { ], // '--phpVersion' => $this->phpVersion, ], + [ + // No projects. + [], + // Inputs. + [ + // 'Would you like to create a new Code Studio project? + 'y', + // Select PHP version 8.2 + '1', + // Do you want to continue? + 'y', + // Would you like to perform a one time push of code from Acquia Cloud to Code Studio now? (yes/no) [yes]: + 'y', + ], + // Args. + [ + '--key' => $this->key, + '--secret' => $this->secret, + ], + // '--phpVersion' => $this->phpVersion, + ], [ // No projects. [], @@ -139,7 +160,7 @@ public function providerTestCommand(): array { $this->key, // Enter Cloud secret, $this->secret, - // Select PHP version + // Select PHP version 8.1 '0', // Do you want to continue? 'y', @@ -148,6 +169,26 @@ public function providerTestCommand(): array { // Args [], ], + [ + // No projects. + [], + // Inputs + [ + // 'Would you like to create a new Code Studio project? + 'y', + // Enter Cloud Key + $this->key, + // Enter Cloud secret, + $this->secret, + // Select PHP version 8.2 + '1', + // Do you want to continue? + 'y', + ], + // '--phpVersion' => $this->phpVersion, + // Args + [], + ], ]; } From 46c8a501cdd6b2fb06ec6c33c818f6d0a706613e Mon Sep 17 00:00:00 2001 From: Shubham Bansal Date: Fri, 29 Sep 2023 09:20:55 +0530 Subject: [PATCH 10/10] removed unnecessary commented lines --- .../Commands/CodeStudio/CodeStudioWizardCommandTest.php | 9 --------- tests/phpunit/src/TestBase.php | 2 -- 2 files changed, 11 deletions(-) diff --git a/tests/phpunit/src/Commands/CodeStudio/CodeStudioWizardCommandTest.php b/tests/phpunit/src/Commands/CodeStudio/CodeStudioWizardCommandTest.php index 535437b34..ca22288e2 100644 --- a/tests/phpunit/src/Commands/CodeStudio/CodeStudioWizardCommandTest.php +++ b/tests/phpunit/src/Commands/CodeStudio/CodeStudioWizardCommandTest.php @@ -67,7 +67,6 @@ public function providerTestCommand(): array { '--key' => $this->key, '--secret' => $this->secret, ], - //'--phpVersion' => $this->phpVersion, ], // Two projects. [ @@ -86,7 +85,6 @@ public function providerTestCommand(): array { '--key' => $this->key, '--secret' => $this->secret, ], - // '--phpVersion' => $this->phpVersion, ], [ // No projects. @@ -107,7 +105,6 @@ public function providerTestCommand(): array { '--key' => $this->key, '--secret' => $this->secret, ], - // '--phpVersion' => $this->phpVersion, ], [ // No projects. @@ -128,7 +125,6 @@ public function providerTestCommand(): array { '--key' => $this->key, '--secret' => $this->secret, ], - // '--phpVersion' => $this->phpVersion, ], [ // No projects. @@ -147,7 +143,6 @@ public function providerTestCommand(): array { '--key' => $this->key, '--secret' => $this->secret, ], - // '--phpVersion' => $this->phpVersion, ], [ // No projects. @@ -165,7 +160,6 @@ public function providerTestCommand(): array { // Do you want to continue? 'y', ], - // '--phpVersion' => $this->phpVersion, // Args [], ], @@ -185,7 +179,6 @@ public function providerTestCommand(): array { // Do you want to continue? 'y', ], - // '--phpVersion' => $this->phpVersion, // Args [], ], @@ -259,7 +252,6 @@ public function testInvalidGitLabCredentials(): void { $this->executeCommand([ '--key' => $this->key, '--secret' => $this->secret, - // '--phpVersion' => $this->phpVersion, ]); } @@ -274,7 +266,6 @@ public function testMissingGitLabCredentials(): void { $this->executeCommand([ '--key' => $this->key, '--secret' => $this->secret, - // '--phpVersion' => $this->phpVersion, ]); } diff --git a/tests/phpunit/src/TestBase.php b/tests/phpunit/src/TestBase.php index 3e913b3ab..e88bdb6a8 100644 --- a/tests/phpunit/src/TestBase.php +++ b/tests/phpunit/src/TestBase.php @@ -86,8 +86,6 @@ abstract class TestBase extends TestCase { protected string $secret = 'X1u\/PIQXtYaoeui.4RJSJpGZjwmWYmfl5AUQkAebYE='; - // protected string $phpVersion = '8.1'; - protected string $dataDir; protected string $cloudConfigFilepath;