diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 97c4d9981..5278631ea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,6 +84,7 @@ jobs: - uses: shivammathur/setup-php@v2 with: coverage: none + php-version: '8.1' - name: 'Get ACLI version' id: acli-version run: | diff --git a/config/from_d7_config.json b/config/from_d7_config.json index 9d3eb39b6..ad99bc836 100644 --- a/config/from_d7_config.json +++ b/config/from_d7_config.json @@ -9,7 +9,6 @@ } ], "require": { - "acquia/acquia-migrate-accelerate": "^1@dev", "composer/installers": "^1.9", "cweagans/composer-patches": "^1.7", "drupal/core-composer-scaffold": "9.0.1", diff --git a/src/Command/App/NewFromDrupal7Command.php b/src/Command/App/NewFromDrupal7Command.php index f9973fa9c..ad1dabbc3 100644 --- a/src/Command/App/NewFromDrupal7Command.php +++ b/src/Command/App/NewFromDrupal7Command.php @@ -137,7 +137,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int fclose($config_resource); // Parse recommendations for project builder. - $recommendations_location = __DIR__ . '/../../../config/from_d7_recommendations.json'; + $recommendations_location = "https://git.drupalcode.org/project/acquia_migrate/-/raw/recommendations/recommendations.json"; if ($input->getOption('recommendations') !== NULL) { $raw_recommendations_location = $input->getOption('recommendations'); try { @@ -148,6 +148,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int return Command::FAILURE; } } + // PHP defaults to no user agent. (Drupal.org's) GitLab requires it. + // @see https://www.php.net/manual/en/filesystem.configuration.php#ini.user-agent + ini_set('user_agent', 'ACLI'); $recommendations_resource = fopen($recommendations_location, 'r'); $recommendations = Recommendations::createFromResource($recommendations_resource); fclose($recommendations_resource); diff --git a/src/Command/CodeStudio/CodeStudioCiCdVariables.php b/src/Command/CodeStudio/CodeStudioCiCdVariables.php index afac39408..f81893f59 100644 --- a/src/Command/CodeStudio/CodeStudioCiCdVariables.php +++ b/src/Command/CodeStudio/CodeStudioCiCdVariables.php @@ -20,28 +20,28 @@ public static function getDefaults(?string $cloudApplicationUuid = NULL, ?string return [ [ 'key' => 'ACQUIA_APPLICATION_UUID', - 'masked' => FALSE, + 'masked' => TRUE, 'protected' => FALSE, 'value' => $cloudApplicationUuid, 'variable_type' => 'env_var', ], [ 'key' => 'ACQUIA_CLOUD_API_TOKEN_KEY', - 'masked' => FALSE, + 'masked' => TRUE, 'protected' => FALSE, 'value' => $cloudKey, 'variable_type' => 'env_var', ], [ 'key' => 'ACQUIA_CLOUD_API_TOKEN_SECRET', - 'masked' => FALSE, + 'masked' => TRUE, 'protected' => FALSE, 'value' => $cloudSecret, 'variable_type' => 'env_var', ], [ 'key' => 'ACQUIA_GLAB_TOKEN_NAME', - 'masked' => FALSE, + 'masked' => TRUE, 'protected' => FALSE, 'value' => $projectAccessTokenName, 'variable_type' => 'env_var', diff --git a/tests/phpunit/src/CommandTestBase.php b/tests/phpunit/src/CommandTestBase.php index 3df30847e..ab573ba7e 100644 --- a/tests/phpunit/src/CommandTestBase.php +++ b/tests/phpunit/src/CommandTestBase.php @@ -621,7 +621,7 @@ protected function getMockGitLabVariables(): array { 0 => [ 'environment_scope' => '*', 'key' => 'ACQUIA_APPLICATION_UUID', - 'masked' => FALSE, + 'masked' => TRUE, 'protected' => FALSE, 'value' => '2b3f7cf0-6602-4590-948b-3b07b1b005ef', 'variable_type' => 'env_var', @@ -629,7 +629,7 @@ protected function getMockGitLabVariables(): array { 1 => [ 'environment_scope' => '*', 'key' => 'ACQUIA_CLOUD_API_TOKEN_KEY', - 'masked' => FALSE, + 'masked' => TRUE, 'protected' => FALSE, 'value' => '111aae74-e81a-4052-b4b9-a27a62e6b6a6', 'variable_type' => 'env_var',