Merge branch 'hotfix/1.3.1'

config/VERSION

@@ -1 +1 @@
-v1.3.0
+v1.3.1

docs/README.md

@@ -12,8 +12,8 @@ ORCA (Official Representative Customer Application) is a tool for testing a comp
 | --- | --- |
 | Adds all company packages to a BLT project via Composer, installs them and their subextensions, and runs their automated tests. | Ensures that all company packages can be added to the same codebase via Composer (prevents dependency conflicts), that there are no adverse install time or functional interactions between them, and that they have no undeclared dependencies, and prevents regressions. |
 | Adds only the package under test to a BLT project via Composer, installs it and its subextensions, and runs its automated tests. | Ensures that the package under test has no undeclared dependencies on other company packages and functions correctly on its own. |
-| Performs the above tests with the recommended, stable versions of company packages and Drush. | Ensures that the package under test still works with the versions of other software already released and in use and prevents releases of the package from disrupting the ecosystem. |
-| Performs the above tests using the latest development versions of company packages and Drush. | Ensures that the package under test will continue to work when new versions of other software are released and prevents changes in the ecosystem from breaking the package. Forces early awareness and collaboration between project teams and prevents rework and release day emergency support situations. |
+| Performs the above tests with the recommended, stable versions of company packages, Drush, and Drupal Console. | Ensures that the package under test still works with the versions of other software already released and in use and prevents releases of the package from disrupting the ecosystem. |
+| Performs the above tests using the latest development versions of company packages, Drush, and Drupal Console. | Ensures that the package under test will continue to work when new versions of other software are released and prevents changes in the ecosystem from breaking the package. Forces early awareness and collaboration between project teams and prevents rework and release day emergency support situations. |
 | Performs the above tests using a threefold spread of Drupal core versions: the previous minor release, the current supported release, and the next minor dev version. | Ensures that the package under test still works with both supported releases of Drupal and will continue to work when the next one drops. |
 | Performs static analysis of the package under test. | Ensures low level construction quality. (Prevents PHP warnings and errors, version incompatibility, etc.) |
 

src/Fixture/FixtureCreator.php

@@ -437,6 +437,15 @@ private function fixDefaultDependencies(): void {
       $additions[] = 'drush/drush:dev-master || 10.x-dev || 9.x-dev || 9.5.x-dev';
     }
 
+    if ($this->shouldRequireDrupalConsole()) {
+      // Add Drupal Console as a soft dependency akin to Drush.
+      $drupal_console_version = '~1.0';
+      if ($this->isDev) {
+        $drupal_console_version = 'dev-master';
+      }
+      $additions[] = "drupal/console:{$drupal_console_version}";
+    }
+
     // Install a specific version of Drupal core.
     if ($this->drupalCoreVersion) {
       $additions[] = "drupal/core:{$this->drupalCoreVersion}";
@@ -465,6 +474,20 @@ private function fixDefaultDependencies(): void {
     $this->processRunner->runOrcaVendorBin($command, $fixture_path);
   }
 
+  /**
+   * Determines whether or not to require drupal/console.
+   *
+   * Only require it for Drupal 8. It's not compatible with Drupal 9 at the time
+   * of this writing.
+   *
+   * @return bool
+   *   Returns TRUE if it should be required, or FALSE if not.
+   */
+  private function shouldRequireDrupalConsole(): bool {
+    $version = $this->getResolvedDrupalCoreVersion();
+    return Comparator::lessThan($version, '9');
+  }
+
   /**
    * Determines whether or not to require drupal/core-dev.
    *
@@ -475,16 +498,28 @@ private function fixDefaultDependencies(): void {
    *   Returns TRUE if it should be required, or FALSE if not.
    */
   private function shouldRequireDrupalCoreDev(): bool {
+    $version = $this->getResolvedDrupalCoreVersion();
+    return Comparator::greaterThanOrEqualTo($version, '8.8');
+  }
+
+  /**
+   * Gets the concrete version of Drupal core that will be installed.
+   *
+   * @return string
+   *   The best match for the requested version of Drupal core, accounting for
+   *   ranges.
+   */
+  private function getResolvedDrupalCoreVersion(): string {
     try {
       // Get the version if it's concrete as opposed to a range.
       $version = $this->versionParser->normalize($this->drupalCoreVersion);
     }
     catch (\UnexpectedValueException $e) {
       // The requested Drupal core version is a range. Get the best match.
-      $minimum_stability = $this->isDev ? 'dev' : 'stable';
-      $version = $this->coreVersionFinder->find($this->drupalCoreVersion, $minimum_stability);
+      $stability = $this->isDev ? 'dev' : 'stable';
+      $version = $this->coreVersionFinder->find($this->drupalCoreVersion, $stability, $stability);
     }
-    return Comparator::greaterThanOrEqualTo($version, '8.8');
+    return $version;
   }
 
   /**

src/Fixture/FixtureInspector.php

@@ -119,6 +119,10 @@ public function getOverview(): array {
       'Drush version',
       $this->getInstalledPackageVersionPretty('drush/drush'),
     ];
+    $overview[] = [
+      'Drupal Console version',
+      $this->getInstalledPackageVersionPretty('drupal/console'),
+    ];
 
     $overview = array_merge($overview, $this->getInstalledPackages());