Merge branch 'hotfix/2.11.5' into support/2

.travis.yml

@@ -6,7 +6,7 @@ dist: bionic
 
 version: ~> 1.0
 
-php: "7.2"
+php: "7.3"
 
 addons:
   chrome: stable
@@ -44,7 +44,7 @@ jobs:
     - { name: "Integrated test w/ recommended package versions & previous minor release of Drupal core", env: ORCA_JOB=CORE_PREVIOUS }
     - { name: "Isolated test w/ dev package versions", env: ORCA_JOB=ISOLATED_DEV }
     - { name: "Integrated test w/ dev package versions", env: ORCA_JOB=INTEGRATED_DEV }
-    - { name: "Integrated test w/ dev package versions & next minor dev version of Drupal core", env: ORCA_JOB=CORE_NEXT }
+    - { name: "Integrated test w/ dev package versions & next minor dev version of Drupal core", env: ORCA_JOB=CORE_NEXT ORCA_ENABLE_NIGHTWATCH=FALSE }
     - { name: "D9 readiness test", php: "7.3", env: ORCA_JOB=D9_READINESS }
     - { name: "Custom job", env: ORCA_JOB=CUSTOM ORCA_CUSTOM_FIXTURE_INIT_ARGS="--help" ORCA_CUSTOM_TESTS_RUN_ARGS="--help" }
     - { name: "Integrated live test", env: ORCA_JOB=LIVE_TEST ORCA_ENABLE_NIGHTWATCH=FALSE }

bin/travis/_includes.sh

@@ -42,7 +42,10 @@ export ORCA_COVERALLS_ENABLE=${ORCA_COVERALLS_ENABLE:=FALSE}
 export ORCA_COVERAGE_ENABLE=${ORCA_COVERAGE_ENABLE:="$ORCA_COVERALLS_ENABLE"}
 export ORCA_FIXTURE_DIR=${ORCA_FIXTURE_DIR:="$ORCA_ROOT/../orca-build"}
 export ORCA_FIXTURE_PROFILE=${ORCA_FIXTURE_PROFILE:="orca"}
-DEFAULT_PROJECT_TEMPLATE=$([[ "$ORCA_JOB" == "D9_READINESS" ]] && echo "acquia/drupal-recommended-project" || echo "acquia/blt-project")
+DEFAULT_PROJECT_TEMPLATE="acquia/blt-project"
+if [[ "$ORCA_JOB" == "CORE_NEXT" || "$ORCA_JOB" == "D9_READINESS" ]]; then
+  DEFAULT_PROJECT_TEMPLATE="acquia/drupal-recommended-project"
+fi
 export ORCA_FIXTURE_PROJECT_TEMPLATE=${ORCA_FIXTURE_PROJECT_TEMPLATE:="$DEFAULT_PROJECT_TEMPLATE"}
 export ORCA_SUT_DIR=${ORCA_SUT_DIR:=${TRAVIS_BUILD_DIR}}
 ORCA_SUT_HAS_NIGHTWATCH_TESTS=$(cd "$ORCA_SUT_DIR"; find . -regex ".*/Nightwatch/.*" -name \*.js)

config/VERSION

@@ -1 +1 @@
-v2.11.4
+v2.11.5

docs/getting-started.md

@@ -31,7 +31,7 @@ See also [Continuous integration](understanding-orca.md#continuous-integration).
 
 ORCA can also be installed and run locally for testing and development. Follow these steps to set it up:
 
-1. Ensure you have PHP 7.2 or later with at least 256 MB of memory allocated to it and [Composer](https://getcomposer.org) installed.
+1. Ensure you have PHP 7.2 or later (PHP 7.3 or later is recommended) with at least 256 MB of memory allocated to it and [Composer](https://getcomposer.org) installed.
 
 1. Choose a directory to contain your package(s), e.g.:
 

example/.travis.yml

@@ -34,7 +34,7 @@ version: ~> 1.0
 # The lowest version of PHP supported by all of Drupal, Acquia, and ORCA itself.
 # @see https://www.drupal.org/docs/8/system-requirements/php-requirements
 # @see https://docs.acquia.com/acquia-cloud/arch/tech-platform/
-php: "7.2"
+php: "7.3"
 
 addons:
   # Chrome is used via ChromeDriver for web testing and browser automation.

src/Domain/Drupal/DrupalCoreVersionFinder.php

@@ -111,7 +111,7 @@ public function getPretty(DrupalCoreVersionEnum $version): string {
    *   The version string.
    */
   public function find(string $target_core_version = NULL, string $minimum_stability = 'stable', string $preferred_stability = 'stable'): string {
-    $best_candidate = $this->getVersionSelector($minimum_stability)
+    $best_candidate = $this->getVersionSelector()
       ->findBestCandidate('drupal/core', $target_core_version, NULL, $preferred_stability);
     if (!$best_candidate) {
       throw new RuntimeException(sprintf('No Drupal core version satisfies the given constraints: version=%s, minimum stability=%s', $target_core_version, $minimum_stability));
@@ -161,7 +161,7 @@ private function getCurrentRecommendedRelease(): string {
     //   version set when Drupal 9 is released, even though it continues to be
     //   a supported version. This quirk of major version rollovers needs to be
     //   solved before Drupal 10 comes out.
-    return '8.9.0';
+    return $this->find('~8.9.0');
   }
 
   /**