From da55f419d33b6eb230f2e2a74dc22a736517100f Mon Sep 17 00:00:00 2001
From: Ted Bowman <ted+git@tedbow.com>
Date: Tue, 21 Jun 2022 15:55:37 -0400
Subject: [PATCH] Revert: make getMostRecentReleaseInMinor() public
---
src/Form/UpdaterForm.php | 5 ++---
src/ReleaseChooser.php | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/Form/UpdaterForm.php b/src/Form/UpdaterForm.php
index e0c3927155..95c8e96398 100644
--- a/src/Form/UpdaterForm.php
+++ b/src/Form/UpdaterForm.php
@@ -151,14 +151,13 @@ final class UpdaterForm extends FormBase {
];
$project_info = new ProjectInfo('drupal');
- $installed_version = ExtensionVersion::createFromVersionString($project_info->getInstalledVersion());
try {
// @todo Until https://www.drupal.org/i/3264849 is fixed, we can only show
// one release on the form. First, try to show the latest release in the
// currently installed minor. Failing that, try to show the latest
// release in the next minor.
- $installed_minor_release = $this->releaseChooser->getMostRecentReleaseInMinor($this->updater, $project_info->getInstalledVersion());
- $next_minor_release = $this->releaseChooser->getMostRecentReleaseInMinor($this->updater, $installed_version->getMajorVersion() . '.' . (((int) $installed_version->getMinorVersion()) + 1) . '.0');
+ $installed_minor_release = $this->releaseChooser->getLatestInInstalledMinor($this->updater);
+ $next_minor_release = $this->releaseChooser->getLatestInNextMinor($this->updater);
}
catch (\RuntimeException $e) {
$form['message'] = [
diff --git a/src/ReleaseChooser.php b/src/ReleaseChooser.php
index 78ade56d12..0aad2c2c60 100644
--- a/src/ReleaseChooser.php
+++ b/src/ReleaseChooser.php
@@ -74,7 +74,7 @@ class ReleaseChooser {
* @throws \InvalidArgumentException
* If the given semantic version number does not contain a patch version.
*/
- public function getMostRecentReleaseInMinor(Updater $updater, string $version): ?ProjectRelease {
+ protected function getMostRecentReleaseInMinor(Updater $updater, string $version): ?ProjectRelease {
if (static::getPatchVersion($version) === NULL) {
throw new \InvalidArgumentException("The version number $version does not contain a patch version");
}
--
GitLab