Skip to content

Commit

Permalink
Merge branch 'release/2.7.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
TravisCarden committed Jun 3, 2020
2 parents b5b122d + 9697961 commit ea3303c
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 13 deletions.
2 changes: 1 addition & 1 deletion config/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v2.6.0
v2.7.0
26 changes: 14 additions & 12 deletions src/Utility/DrupalCoreVersionFinder.php
Original file line number Diff line number Diff line change
Expand Up @@ -154,11 +154,11 @@ private function getPreviousDevVersion(): string {
* @see \Acquia\Orca\Enum\DrupalCoreVersion::CURRENT_RECOMMENDED
*/
private function getCurrentRecommendedRelease(): string {
if ($this->currentRecommendedRelease) {
return $this->currentRecommendedRelease;
}
$this->currentRecommendedRelease = $this->find();
return $this->currentRecommendedRelease;
// @todo This is hardcoded in order to prevent 8.8.x being dropped from the
// 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";
}

/**
Expand All @@ -182,11 +182,10 @@ private function getCurrentDevVersion(): string {
* @see \Acquia\Orca\Enum\DrupalCoreVersion::NEXT_RELEASE
*/
private function getNextRelease(): string {
if ($this->nextRelease) {
return $this->nextRelease;
}
$this->nextRelease = $this->find(">{$this->getCurrentRecommendedRelease()}", 'alpha');
return $this->nextRelease;
// @todo This is hardcoded in order to prevent 9.0.x from becoming the "next the
// version" in the version set when Drupal 9 is released. This quirk of
// major version rollovers needs to be solved before Drupal 10 comes out.
return "8.9.0";
}

/**
Expand All @@ -198,8 +197,11 @@ private function getNextRelease(): string {
* @see \Acquia\Orca\Enum\DrupalCoreVersion::NEXT_DEV
*/
private function getNextDevVersion(): string {
$previous_minor_version = (float) $this->getCurrentMinorVersion() + 0.1;
return "{$previous_minor_version}.x-dev";
// @todo This is hardcoded in order to prevent 9.x-dev from becoming the
// "next the dev version" in the version set when Drupal 9 is released.
// This quirk of major version rollovers needs to be solved before Drupal
// 10 comes out.
return "8.9.x-dev";
}

/**
Expand Down

0 comments on commit ea3303c

Please sign in to comment.