BLT-5214: Drush 12 support (#4681)

* BLT-5214: Drush 12 support * doublepipe * lockfile * PHP 8.2 * fix tests
acquia · May 19, 2023 · c5fd9be · c5fd9be
1 parent aa80b12
commit c5fd9be
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 48 deletions.
diff --git a/.github/workflows/orca.yml b/.github/workflows/orca.yml
@@ -13,7 +13,7 @@ jobs:
     env:
       ORCA_SUT_NAME: acquia/blt
       ORCA_SUT_BRANCH: main
-      ORCA_VERSION: ^3
+      ORCA_VERSION: ${{ matrix.orca-version }}
       ORCA_PHPCS_STANDARD: AcquiaDrupalStrict
       BLT_PRINT_COMMAND_OUTPUT: 1
       ORCA_JOB: ${{ matrix.orca-job }}
@@ -42,22 +42,33 @@ jobs:
           - LOOSE_DEPRECATED_CODE_SCAN
         php-version: [ "8.1" ]
         coveralls-enable: [ "FALSE" ]
+        orca-version: [ "^4" ]
         include:
           - orca-job: INTEGRATED_TEST_ON_OLDEST_SUPPORTED
             php-version: "7.4"
             coveralls-enable: "FALSE"
+            orca-version: "^3"
 
           - orca-job: INTEGRATED_TEST_ON_OLDEST_SUPPORTED
             php-version: "8.0"
             coveralls-enable: "FALSE"
+            orca-version: "^3"
 
           - orca-job: INTEGRATED_TEST_ON_LATEST_LTS
             php-version: "7.4"
             coveralls-enable: "FALSE"
+            orca-version: "^3"
+
+          - orca-job: INTEGRATED_TEST_ON_LATEST_LTS
+            php-version: "8.2"
+            coveralls-enable: "FALSE"
 
           - orca-job: ISOLATED_TEST_ON_CURRENT
             php-version: "8.1"
             coveralls-enable: "TRUE"
+
+          - orca-job: ISOLATED_TEST_ON_CURRENT
+            php-version: "8.2"
           # - orca-job: ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV
           #   php-version: "8.1"
           #   coveralls-enable: "FALSE"

diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
         "dflydev/dot-access-data": "^1.1.0 || ^2 || ^3",
         "doctrine/annotations": "^1.10.0",
         "drupal/core": "^9.0.0-alpha1 || ^10.0.0-alpha1",
-        "drush/drush": "^11",
+        "drush/drush": "^11 || ^12",
         "enlightn/security-checker": "^1.3",
         "grasmash/yaml-cli": "^2.0.0 || ^3.0.0",
         "grasmash/yaml-expander": "^3.0.2",

diff --git a/composer.lock b/composer.lock
diff --git a/docs/README.md b/docs/README.md
@@ -12,13 +12,15 @@ BLT (Build and Launch Tool) provides an automation layer for testing, building,
 
 ## BLT Versions
 
-| BLT Version | Supported? | Major Drupal Version | PHP Version   | Drush Version |
-|-------------|------------|----------------------|---------------|---------------|
-| 13.x        | Yes        | 9.x and 10.x         | 8.0 and 8.1 * | 11.x *        |
-| 12.x        | **No**     | 9.x                  | 7.4           | 10.x          |
-| 11.x        | **No**     | 8.x                  | 7.4           | 9.x and 10.x  |
+| BLT Version | Supported? | Major Drupal Version | PHP Version     | Drush Version |
+|-------------|------------|----------------------|-----------------|---------------|
+| 13.x        | Yes        | 9.x, 10.x            | 8.0, 8.1, 8.2 * | 11.x, 12.x *  |
+| 12.x        | **No**     | 9.x                  | 7.4             | 10.x          |
+| 11.x        | **No**     | 8.x                  | 7.4             | 9.x, 10.x     |
 
-BLT users must upgrade to at least BLT 13.5.x to upgrade to PHP 8.1. and Drush 11.0.7 (or beyond).
+\* BLT users must upgrade to at least BLT 13.5.x to upgrade to PHP 8.1. and Drush 11.0.7 (or beyond).
+
+PHP 8.2, Drush 12, and Drupal 10 support is unstable.
 
 # License
 

diff --git a/src/Robo/Common/ArrayManipulator.php b/src/Robo/Common/ArrayManipulator.php
@@ -132,6 +132,9 @@ public static function convertArrayToFlatTextArray(array $array) {
           elseif ($sub_value === FALSE) {
             $sub_value = 'false';
           }
+          elseif ($sub_value === NULL) {
+            $sub_value = '';
+          }
           $rows[] = [
             "$key.$sub_key",
             wordwrap($sub_value, $max_line_length, "\n", TRUE),
@@ -145,6 +148,9 @@ public static function convertArrayToFlatTextArray(array $array) {
         elseif ($value === FALSE) {
           $contents = 'false';
         }
+        elseif ($value === NULL) {
+          $contents = '';
+        }
         else {
           $contents = wordwrap($value, $max_line_length, "\n", TRUE);
         }

diff --git a/src/Robo/Inspector/Inspector.php b/src/Robo/Inspector/Inspector.php
@@ -189,9 +189,8 @@ public function isDrupalSettingsFileValid() {
    */
   public function isDrupalInstalled() {
     $this->logger->debug("Verifying that Drupal is installed...");
-    $result = $this->executor->drush(["status", "bootstrap"])->run();
-    $output = trim($result->getMessage());
-    $installed = $result->wasSuccessful() && strpos($output, 'Drupal bootstrap : Successful') !== FALSE;
+    $output = $this->getDrushStatus()['bootstrap'];
+    $installed = $output === 'Successful';
     $this->logger->debug("Drupal bootstrap results: $output");
 
     return $installed;

diff --git a/tests/phpunit/src/BltProjectTestBase.php b/tests/phpunit/src/BltProjectTestBase.php
@@ -288,7 +288,7 @@ protected function blt($command, array $args = [], $stop_on_error = TRUE) {
    */
   protected function writeFullWidthLine($message, OutputInterface $output) {
     $terminal_width = (new Terminal())->getWidth();
-    $padding_len = ($terminal_width - strlen($message)) / 2;
+    $padding_len = ceil(($terminal_width - strlen($message)) / 2);
     $pad = $padding_len > 0 ? str_repeat('-', $padding_len) : '';
     $output->writeln("<comment>{$pad}{$message}{$pad}</comment>");
   }