Merge branch 'hotfix/3.27.3'

acquia · Jan 31, 2023 · 2dd8f0e · 2dd8f0e
2 parents 7fa4986 + 82b46b0
commit 2dd8f0e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/config/VERSION b/config/VERSION
@@ -1 +1 @@
-v3.27.2
+v3.27.3
diff --git a/src/Options/FixtureOptions.php b/src/Options/FixtureOptions.php
@@ -300,13 +300,14 @@ public function getProjectTemplate(): string {
       return $this->options['project-template'];
     }
 
-    // @todo Point to latest version of DRP once 2.x for D10 stable fixtures
-    //   and "dev-master" for D10 dev fixtures.
-    if ($this->coreVersionParsedMatches('^10')) {
-      $this->options['project-template'] = 'acquia/drupal-recommended-project:dev-drupal10';
+    if ($this->coreVersionParsedMatches('^9')) {
+      $this->options['project-template'] = 'acquia/drupal-recommended-project:^1';
+    }
+    elseif ($this->coreVersionParsedMatches('^10') && $this->isDev()) {
+      $this->options['project-template'] = 'acquia/drupal-recommended-project:dev-master';
     }
     else {
-      $this->options['project-template'] = 'acquia/drupal-recommended-project:^1';
+      $this->options['project-template'] = 'acquia/drupal-recommended-project';
     }
 
     return $this->options['project-template'];

diff --git a/tests/Options/FixtureOptionsTest.php b/tests/Options/FixtureOptionsTest.php
@@ -58,7 +58,7 @@ private function createFixtureOptions(array $options): FixtureOptions {
    * @covers ::validate
    */
   public function testDefaults(): void {
-    $core = '9.0.0';
+    $core = '10.0.0';
     $this->drupalCoreVersionFinder
       ->resolvePredefined(DrupalCoreVersionEnum::CURRENT())
       ->willReturn($core);
@@ -76,7 +76,7 @@ public function testDefaults(): void {
     self::assertFalse($options->symlinkAll(), 'Set/got default "symlink-all" option.');
     self::assertEquals($core, $options->getCore(), 'Set/got default "core" option.');
     self::assertEquals('orca', $options->getProfile(), 'Set/got default "profile" option.');
-    self::assertEquals('acquia/drupal-recommended-project:^1', $options->getProjectTemplate(), 'Set/got default "project-template" option.');
+    self::assertEquals('acquia/drupal-recommended-project', $options->getProjectTemplate(), 'Set/got default "project-template" option.');
     self::assertNull($options->getSut(), 'Set/got default "sut" option.');
     self::assertTrue($options->installSite(), 'Set/got default "no-site-install" option.');
     self::assertTrue($options->useSqlite(), 'Set/got default "no-sqlite" option.');