composer.json

@@ -31,11 +31,18 @@
     "test": [
       "Composer\\Config::disableProcessTimeout",
       "scripts/phpunit.sh"
-    ]
+    ],
+    "core-convert": "Drupal\\automatic_updates\\CoreCovert\\Converter::doConvert"
   },
   "scripts-descriptions": {
     "phpcbf": "Automatically fixes standards violations where possible.",
     "phpcs": "Checks code for standards compliance.",
-    "test": "Runs PHPUnit tests."
-  }
+    "test": "Runs PHPUnit tests.",
+    "core-convert": "Converts this module to a core merge request. Excepts 2 arguments. 1) The core clone directory. 2) The core merge request branch."
+  },
+    "autoload": {
+        "psr-4": {
+            "Drupal\\automatic_updates\\CoreCovert\\": "scripts/src"
+        }
+    }
 }

dictionary.txt

@@ -4,3 +4,4 @@ stager's
 syncer
 syncers
 kirk
+unwritable

package_manager/src/ProjectInfo.php

@@ -199,4 +199,15 @@ final class ProjectInfo {
     return FALSE;
   }
 
+  /**
+   * Gets the supported branches of the project.
+   *
+   * @return string[]
+   *   The supported branches.
+   */
+  public function getSupportedBranches(): array {
+    $available_updates = $this->getAvailableProjects()[$this->name];
+    return isset($available_updates['supported_branches']) ? explode(',', $available_updates['supported_branches']) : [];
+  }
+
 }

package_manager/tests/fixtures/release-history/drupal.10.0.0.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Contains metadata about the following (fake) releases of Drupal core, all of which are secure, in order:
+* 10.0.0
+* 9.7.2
+* 9.7.1
+* 9.7.0
+* 9.6.1
+* 9.6.0
+* 9.5.1
+* 9.5.0
+* 9.4.0, which is in an unsupported branch
+* 9.7.x-dev
+-->
+<project xmlns:dc="http://purl.org/dc/elements/1.1/">
+    <title>Drupal</title>
+    <short_name>drupal</short_name>
+    <dc:creator>Drupal</dc:creator>
+    <supported_branches>9.5.,9.6.,9.7.,10.0.</supported_branches>
+    <project_status>published</project_status>
+    <link>http://example.com/project/drupal</link>
+    <terms>
+        <term>
+            <name>Projects</name>
+            <value>Drupal project</value>
+        </term>
+    </terms>
+    <releases>
+        <release>
+          <name>Drupal 10.0.0</name>
+          <version>10.0.0</version>
+          <status>published</status>
+          <release_link>http://example.com/drupal-10-0-0-release</release_link>
+          <download_link>http://example.com/drupal-10-0-0.tar.gz</download_link>
+          <date>1250425521</date>
+          <terms>
+            <term>
+              <name>Release type</name>
+              <value>New features</value>
+            </term>
+            <term>
+              <name>Release type</name>
+              <value>Bug fixes</value>
+            </term>
+          </terms>
+        </release>
+        <release>
+            <name>Drupal 9.7.2</name>
+            <version>9.7.2</version>
+            <status>published</status>
+            <release_link>http://example.com/drupal-9-7-2-release</release_link>
+            <download_link>http://example.com/drupal-9-7-2.tar.gz</download_link>
+            <date>1250425521</date>
+            <terms>
+                <term>
+                    <name>Release type</name>
+                    <value>New features</value>
+                </term>
+                <term>
+                    <name>Release type</name>
+                    <value>Bug fixes</value>
+                </term>
+            </terms>
+        </release>
+        <release>
+            <name>Drupal 9.7.1</name>
+            <version>9.7.1</version>
+            <status>published</status>
+            <release_link>http://example.com/drupal-9-7-1-release</release_link>
+            <download_link>http://example.com/drupal-9-7-1.tar.gz</download_link>
+            <date>1250425521</date>
+            <terms>
+                <term>
+                    <name>Release type</name>
+                    <value>New features</value>
+                </term>
+                <term>
+                    <name>Release type</name>
+                    <value>Bug fixes</value>
+                </term>
+            </terms>
+        </release>
+        <release>
+            <name>Drupal 9.7.0</name>
+            <version>9.7.0</version>
+            <status>published</status>
+            <release_link>http://example.com/drupal-9-7-0-release</release_link>
+            <download_link>http://example.com/drupal-9-7-0.tar.gz</download_link>
+            <date>1250424521</date>
+            <terms>
+                <term>
+                    <name>Release type</name>
+                    <value>New features</value>
+                </term>
+                <term>
+                    <name>Release type</name>
+                    <value>Bug fixes</value>
+                </term>
+            </terms>
+        </release>
+        <release>
+            <name>Drupal 9.6.1</name>
+            <version>9.6.1</version>
+            <status>published</status>
+            <release_link>http://example.com/drupal-9-6-1-release</release_link>
+            <download_link>http://example.com/drupal-9-6-1.tar.gz</download_link>
+            <date>1250425521</date>
+            <terms>
+                <term>
+                    <name>Release type</name>
+                    <value>New features</value>
+                </term>
+                <term>
+                    <name>Release type</name>
+                    <value>Bug fixes</value>
+                </term>
+            </terms>
+        </release>
+        <release>
+            <name>Drupal 9.6.0</name>
+            <version>9.6.0</version>
+            <status>published</status>
+            <release_link>http://example.com/drupal-9-6-0-release</release_link>
+            <download_link>http://example.com/drupal-9-6-0.tar.gz</download_link>
+            <date>1250424521</date>
+            <terms>
+                <term>
+                    <name>Release type</name>
+                    <value>New features</value>
+                </term>
+                <term>
+                    <name>Release type</name>
+                    <value>Bug fixes</value>
+                </term>
+            </terms>
+        </release>
+        <release>
+            <name>Drupal 9.5.1</name>
+            <version>9.5.1</version>
+            <status>published</status>
+            <release_link>http://example.com/drupal-9-5-1-release</release_link>
+            <download_link>http://example.com/drupal-9-5-1.tar.gz</download_link>
+            <date>1250425521</date>
+            <terms>
+                <term>
+                    <name>Release type</name>
+                    <value>New features</value>
+                </term>
+                <term>
+                    <name>Release type</name>
+                    <value>Bug fixes</value>
+                </term>
+            </terms>
+        </release>
+        <release>
+            <name>Drupal 9.5.0</name>
+            <version>9.5.0</version>
+            <status>published</status>
+            <release_link>http://example.com/drupal-9-5-0-release</release_link>
+            <download_link>http://example.com/drupal-9-5-0.tar.gz</download_link>
+            <date>1250424521</date>
+            <terms>
+                <term>
+                    <name>Release type</name>
+                    <value>New features</value>
+                </term>
+                <term>
+                    <name>Release type</name>
+                    <value>Bug fixes</value>
+                </term>
+            </terms>
+        </release>
+        <release>
+          <name>Drupal 9.4.0</name>
+          <version>9.4.0</version>
+          <status>published</status>
+          <release_link>http://example.com/drupal-9-4-0-release</release_link>
+          <download_link>http://example.com/drupal-9-4-0.tar.gz</download_link>
+          <date>1240424421</date>
+          <terms>
+            <term>
+              <name>Release type</name>
+              <value>New features</value>
+            </term>
+            <term>
+              <name>Release type</name>
+              <value>Bug fixes</value>
+            </term>
+          </terms>
+        </release>
+        <release>
+            <name>Drupal 9.7.x-dev</name>
+            <version>9.7.x-dev</version>
+            <status>published</status>
+            <release_link>http://example.com/drupal-9-7-x-dex-release</release_link>
+            <download_link>http://example.com/drupal-9-7-x-dex.tar.gz</download_link>
+            <date>1250424521</date>
+            <terms>
+                <term>
+                    <name>Release type</name>
+                    <value>New features</value>
+                </term>
+                <term>
+                    <name>Release type</name>
+                    <value>Bug fixes</value>
+                </term>
+            </terms>
+        </release>
+    </releases>
+</project>

package_manager/tests/fixtures/release-history/drupal.9.8.1-empty_supported_branches.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Contains metadata about releases of Drupal core with no supported branches:
+-->
+<project xmlns:dc="http://purl.org/dc/elements/1.1/">
+    <title>Drupal</title>
+    <short_name>drupal</short_name>
+    <dc:creator>Drupal</dc:creator>
+    <supported_branches/>
+    <project_status>published</project_status>
+    <link>http://example.com/project/drupal</link>
+    <terms>
+        <term>
+            <name>Projects</name>
+            <value>Drupal project</value>
+        </term>
+    </terms>
+</project>

package_manager/tests/fixtures/release-history/drupal.9.8.1-supported_branches_not_set.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Contains metadata about releases of Drupal core with <supported_branches></supported_branches> not set:
+-->
+<project xmlns:dc="http://purl.org/dc/elements/1.1/">
+    <title>Drupal</title>
+    <short_name>drupal</short_name>
+    <dc:creator>Drupal</dc:creator>
+    <project_status>published</project_status>
+    <link>http://example.com/project/drupal</link>
+    <terms>
+        <term>
+            <name>Projects</name>
+            <value>Drupal project</value>
+        </term>
+    </terms>
+</project>

package_manager/tests/src/Build/TemplateProjectTestBase.php

@@ -251,7 +251,6 @@ END;
     // Now that we know the project was created successfully, we can set the
     // web root with confidence.
     $this->webRoot = 'project/' . $this->runComposer('composer config extra.drupal-scaffold.locations.web-root', 'project');
-
     // BEGIN: DELETE FROM CORE MERGE REQUEST
     // Install Automatic Updates into the test project and ensure it wasn't
     // symlinked.
@@ -441,7 +440,7 @@ END;
     return $temp_directory;
   }
 
-  // BEGIN: DELETE FROM CORE MERGE REQUEST
+  // BEGIN: DELETE FROM CORE MERGE REQUEST.
 
   /**
    * {@inheritdoc}
@@ -463,5 +462,5 @@ END;
     file_put_contents($file, json_encode($data, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
   }
 
-  // END: DELETE FROM CORE MERGE REQUEST
+  // END: DELETE FROM CORE MERGE REQUEST.
 }

package_manager/tests/src/Kernel/FakeSiteFixtureTest.php

+<?php
+
+namespace Drupal\Tests\package_manager\Kernel;
+
+/**
+ * Test that the 'fake-site' fixture is a valid starting point.
+ *
+ * @group package_manager
+ */
+class FakeSiteFixtureTest extends PackageManagerKernelTestBase {
+
+  /**
+   * Tests the complete stage life cycle using the 'fake-site' fixture.
+   */
+  public function testLifeCycle(): void {
+    $this->assertStatusCheckResults([]);
+    $this->assertResults([]);
+    // Ensure there are no validation errors after the stage lifecycle has been
+    // completed.
+    $this->assertStatusCheckResults([]);
+  }
+
+}

package_manager/tests/src/Kernel/ProjectInfoTest.php

@@ -242,4 +242,52 @@ class ProjectInfoTest extends PackageManagerKernelTestBase {
     $this->assertSame($expected_to_be_safe, $project_info->isInstalledVersionSafe());
   }
 
+  /**
+   * Data provider for testGetSupportedBranches().
+   *
+   * @return mixed[][]
+   *   The test cases.
+   */
+  public function providerGetSupportedBranches(): array {
+    $dir = __DIR__ . '/../../fixtures/release-history/';
+
+    return [
+      'xml with supported branches' => [
+        $dir . 'drupal.10.0.0.xml',
+        [
+          '9.5.',
+          '9.6.',
+          '9.7.',
+          '10.0.',
+        ],
+      ],
+      'xml with supported branches not set' => [
+        $dir . 'drupal.9.8.1-supported_branches_not_set.xml',
+        [],
+      ],
+      'xml with empty supported branches' => [
+        $dir . 'drupal.9.8.1-empty_supported_branches.xml',
+        [
+          '',
+        ],
+      ],
+    ];
+  }
+
+  /**
+   * @covers ::getSupportedBranches()
+   *
+   * @param string $release_xml
+   *   The path of the release metadata.
+   * @param string[] $expected_supported_branches
+   *   The expected supported branches.
+   *
+   * @dataProvider providerGetSupportedBranches
+   */
+  public function testGetSupportedBranches(string $release_xml, array $expected_supported_branches): void {
+    $this->setReleaseMetadata(['drupal' => $release_xml]);
+    $project_info = new ProjectInfo('drupal');
+    $this->assertSame($expected_supported_branches, $project_info->getSupportedBranches());
+  }
+
 }

scripts/src/Converter.php

+<?php
+
+namespace Drupal\automatic_updates\CoreCovert;
+
+use Composer\Script\Event;
+use Symfony\Component\Filesystem\Filesystem;
+
+/**
+ * Converts the contrib module to core merge request.
+ *
+ * File usage:
+ *
+ * @code
+ * composer core-covert /path/to/core merge-request-branch
+ * @endcode
+ *
+ * The core clone should already have the core merge request locally.
+ */
+class Converter {
+
+  /**
+   * Prints message.
+   *
+   * @param string $msg
+   *   The message to print.
+   */
+  private static function info(string $msg): void {
+    print "\n$msg";
+  }
+
+  /**
+   * Converts the contrib module to core merge request.
+   *
+   * @param \Composer\Script\Event $event
+   *   The Composer event.
+   */
+  public static function doConvert(Event $event): void {
+    $args = $event->getArguments();
+    if (count($args) !== 2) {
+      throw new \Exception("This scripts 2 arguments, a directory that is a core clone and the branch.");
+    }
+    $core_dir = $args[0];
+    $core_branch = $args[1];
+    if (!is_dir($core_dir)) {
+      throw new \Exception("$core_dir is not a directory.");
+    }
+    $old_machine_name = 'automatic_updates';
+    $new_machine_name = 'auto_updates';
+
+    static::switchToBranches($core_dir, $core_branch);
+    self::info('Switched branches');
+    $fs = new Filesystem();
+
+    $core_module_path = static::getCoreModulePath($core_dir);
+    $package_manager_core_path = $core_dir . "/core/modules/package_manager";
+    // Remove old module.
+    $fs->remove($core_module_path);
+    self::info('Removed old core module');
+    $fs->remove($package_manager_core_path);
+    self::info("Removed package manager");
+
+    $fs->mirror(self::getContribDir(), $core_module_path);
+    self::info('Mirrored into core module');
+
+    // Remove unneeded.
+    $removals = [
+      'package_manager/package_manager.install',
+      'automatic_updates_9_3_shim',
+      'automatic_updates_extensions',
+      'drupalci.yml',
+      'README.md',
+      '.git',
+      'pcre.ini',
+      'composer.json',
+      '.gitattributes',
+      '.gitignore',
+      'DEVELOPING.md',
+      'scripts',
+      'dictionary.txt',
+    ];
+    $removals = array_map(function ($path) use ($core_module_path) {
+      return "$core_module_path/$path";
+    }, $removals);
+    $fs->remove($removals);
+    self::info('Remove not needed');
+
+    // Replace in file names and contents.
+    $replacements = [
+      $old_machine_name => $new_machine_name,
+      'AutomaticUpdates' => 'AutoUpdates',
+      "core_version_requirement: ^9.3" => "package: Core\nversion: VERSION\nlifecycle: experimental",
+    ];
+    foreach ($replacements as $search => $replace) {
+      static::renameFiles($core_module_path, $search, $replace);
+      static::replaceContents($core_module_path, $search, $replace);
+    }
+    self::info('Replacements done.');
+
+    static::removeLines($core_dir);
+    self::info('Remove unneeded lines');
+    $fs->rename("$core_module_path/package_manager", $core_dir . "/core/modules/package_manager");
+    self::info('Move package manager');
+
+    static::addWordsToDictionary($core_dir, self::getContribDir() . "/dictionary.txt");
+    self::info("Added to dictionary");
+    static::runCoreChecks($core_dir);
+    self::info('Ran core checks');
+    static::makeCommit($core_dir);
+    self::info('Make commit');
+    self::info("Done. Probably good but you should check before you push.");
+  }
+
+  /**
+   * Returns the path to the root of the contrib module.
+   *
+   * @return string
+   *   The full path to the root of the contrib module.
+   */
+  private static function getContribDir(): string {
+    return realpath(__DIR__ . '/../..');
+  }
+
+  /**
+   * Returns the path where the contrib module will be placed in Drupal Core.
+   *
+   * @param string $core_dir
+   *   The path to the root of Drupal Core.
+   *
+   * @return string
+   *   The path where the contrib module will be placed in Drupal Core
+   */
+  private static function getCoreModulePath(string $core_dir): string {
+    return $core_dir . '/core/modules/auto_updates';
+  }
+
+  /**
+   * Replaces a string in the contents of the module files.
+   *
+   * @param string $core_module_path
+   *   The path of module in Drupal Core.
+   * @param string $search
+   *   The string to be replaced.
+   * @param string $replace
+   *   The string to replace.
+   */
+  private static function replaceContents(string $core_module_path, string $search, string $replace): void {
+    $files = static::getDirContents($core_module_path, TRUE);
+    foreach ($files as $file) {
+      $filePath = $file->getRealPath();
+      file_put_contents($filePath, str_replace($search, $replace, file_get_contents($filePath)));
+    }
+  }
+
+  /**
+   * Renames the module files.
+   *
+   * @param string $core_module_path
+   *   The path of module in Drupal Core.
+   * @param string $old_pattern
+   *   The old file name.
+   * @param string $new_pattern
+   *   The new file name.
+   */
+  private static function renameFiles(string $core_module_path, string $old_pattern, string $new_pattern): void {
+
+    $files = static::getDirContents($core_module_path);
+
+    // Keep a record of the files and directories to change.
+    // We will change all the files first, so we don't change the location of
+    // any files in the middle. This probably won't work if we had nested
+    // folders with the pattern on 2 folder levels, but we don't.
+    $filesToChange = [];
+    $dirsToChange = [];
+    foreach ($files as $file) {
+      $fileName = $file->getFilename();
+      if ($fileName === '.') {
+        $fullPath = $file->getPath();
+        $parts = explode('/', $fullPath);
+        $name = array_pop($parts);
+        $path = "/" . implode('/', $parts);
+      }
+      else {
+        $name = $fileName;
+        $path = $file->getPath();
+      }
+      if (strpos($name, $old_pattern) !== FALSE) {
+        $new_filename = str_replace($old_pattern, $new_pattern, $name);
+        if ($file->isFile()) {
+          $filesToChange[$file->getRealPath()] = $file->getPath() . "/$new_filename";
+        }
+        else {
+          // Store directories by path depth.
+          $depth = count(explode('/', $path));
+          $dirsToChange[$depth][$file->getRealPath()] = "$path/$new_filename";
+        }
+      }
+    }
+    foreach ($filesToChange as $old => $new) {
+      (new Filesystem())->rename($old, $new);
+    }
+    // Rename directories starting with the most nested to avoid renaming
+    // parents directories first.
+    krsort($dirsToChange);
+    foreach ($dirsToChange as $dirs) {
+      foreach ($dirs as $old => $new) {
+        (new Filesystem())->rename($old, $new);
+      }
+    }
+  }
+
+  /**
+   * Gets the contents of a directory.
+   *
+   * @param string $path
+   *   The path of the directory.
+   * @param bool $excludeDirs
+   *   (optional) If TRUE, all directories will be excluded. Defaults to FALSE.
+   *
+   * @return \SplFileInfo[]
+   *   Array of objects containing file information.
+   */
+  private static function getDirContents(string $path, bool $excludeDirs = FALSE): array {
+    $rii = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($path));
+
+    $files = [];
+    /** @var \SplFileInfo $file */
+    foreach ($rii as $file) {
+      if ($excludeDirs && $file->isDir()) {
+        continue;
+      }
+      $files[] = $file;
+    }
+
+    return $files;
+  }
+
+  /**
+   * Ensures the git status is clean.
+   *
+   * @return bool
+   *   TRUE if git status is clean , otherwise returns a exception.
+   */
+  private static function ensureGitClean(): bool {
+    $status_output = shell_exec('git status');
+    if (strpos($status_output, 'nothing to commit, working tree clean') === FALSE) {
+      throw new \Exception("git not clean: " . $status_output);
+    }
+    return TRUE;
+  }
+
+  /**
+   * Gets the current git branch.
+   *
+   * @return string
+   *   The current git branch.
+   */
+  private static function getCurrentBranch(): string {
+    return trim(shell_exec('git rev-parse --abbrev-ref HEAD'));
+  }
+
+  /**
+   * Switches to the branches we need.
+   *
+   * @param string $core_dir
+   *   The path to the root of Drupal Core.
+   * @param string $core_branch
+   *   The core merge request branch.
+   */
+  private static function switchToBranches(string $core_dir, string $core_branch): void {
+    static::switchToBranch('8.x-2.x');
+    chdir($core_dir);
+    static::switchToBranch($core_branch);
+  }
+
+  /**
+   * Switches to a branches and makes sure it is clean.
+   *
+   * @param string $branch
+   *   The branch to switch to.
+   */
+  private static function switchToBranch(string $branch): void {
+    static::ensureGitClean();
+    shell_exec("git checkout $branch");
+    if ($branch !== static::getCurrentBranch()) {
+      throw new \Exception("could not check $branch");
+    }
+  }
+
+  /**
+   * Makes commit in the root of Drupal Core.
+   *
+   * @param string $core_dir
+   *   The path to the root of Drupal Core.
+   */
+  private static function makeCommit(string $core_dir): void {
+    chdir(self::getContribDir());
+    self::ensureGitClean();
+    $hash = trim(shell_exec('git rev-parse HEAD'));
+    $message = trim(shell_exec("git show -s --format='%s'"));
+    chdir($core_dir);
+    shell_exec('git add core');
+    shell_exec("git commit -m 'Contrib: $message - https://git.drupalcode.org/project/automatic_updates/-/commit/$hash'");
+  }
+
+  /**
+   * Adds new words to cspell dictionary.
+   *
+   * @param string $core_dir
+   *   The path to the root of Drupal Core.
+   * @param string $dict_file_to_merge
+   *   The path to the dictionary file with additional words.
+   */
+  private static function addWordsToDictionary(string $core_dir, string $dict_file_to_merge): void {
+    if (!file_exists($dict_file_to_merge)) {
+      throw new \LogicException(sprintf('%s does not exist', $dict_file_to_merge));
+    }
+    $dict_file = $core_dir . '/core/misc/cspell/dictionary.txt';
+    $contents = file_get_contents($dict_file);
+    $words = explode("\n", $contents);
+    $words = array_filter($words);
+    $new_words = explode("\n", file_get_contents($dict_file_to_merge));
+    $words = array_merge($words, $new_words);
+    $words = array_unique($words);
+    asort($words);
+    file_put_contents($dict_file, implode("\n", $words));
+  }
+
+  /**
+   * Runs code quality checks.
+   *
+   * @param string $core_dir
+   *   The path to the root of Drupal Core.
+   */
+  private static function runCoreChecks(string $core_dir): void {
+    chdir($core_dir);
+    $result = NULL;
+    system(' sh ./core/scripts/dev/commit-code-check.sh --branch 9.5.x', $result);
+    if ($result !== 0) {
+      print "😭commit-code-check.sh failed";
+      exit(1);
+    }
+    print "🎉 commit-code-check.sh passed!";
+  }
+
+  /**
+   * Removes lines from the module based on a starting and ending token
+   * These are lines that are not need in core at all.
+   *
+   * @param string $core_dir
+   *   The path to the root of Drupal Core.
+   */
+  private static function removeLines(string $core_dir): void {
+    $files = static::getDirContents(static::getCoreModulePath($core_dir), TRUE);
+    foreach ($files as $file) {
+      $filePath = $file->getRealPath();
+      $contents = file_get_contents($filePath);
+      $lines = explode("\n", $contents);
+      $skip = FALSE;
+      $newLines = [];
+      foreach ($lines as $line) {
+        if (strpos($line, '// BEGIN: DELETE FROM CORE MERGE REQUEST')) {
+          if ($skip) {
+            throw new \Exception("Already found begin");
+          }
+          $skip = TRUE;
+        }
+        if (!$skip) {
+          $newLines[] = $line;
+        }
+        if (strpos($line, '// END: DELETE FROM CORE MERGE REQUEST')) {
+          if (!$skip) {
+            throw new \Exception("Didn't find matching begin");
+          }
+          $skip = FALSE;
+        }
+      }
+      if ($skip) {
+        throw new \Exception("Didn't find ending token");
+      }
+      file_put_contents($filePath, implode("\n", $newLines));
+    }
+  }
+
+}

src/Form/UpdaterForm.php

@@ -174,13 +174,19 @@ final class UpdaterForm extends UpdateFormBase {
     ];
     $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->getLatestInInstalledMinor($this->updater);
-      $next_minor_release = $this->releaseChooser->getLatestInNextMinor($this->updater);
+      $support_branches = $project_info->getSupportedBranches();
+      $releases = [];
+      foreach ($support_branches as $support_branch) {
+        $support_branch_extension_version = ExtensionVersion::createFromSupportBranch($support_branch);
+        if ($support_branch_extension_version->getMajorVersion() === $installed_version->getMajorVersion() && $support_branch_extension_version->getMinorVersion() >= $installed_version->getMinorVersion()) {
+          $recent_release_in_minor = $this->releaseChooser->getMostRecentReleaseInMinor($this->updater, $support_branch . '0');
+          if ($recent_release_in_minor) {
+            $releases[$support_branch] = $recent_release_in_minor;
+          }
+        }
+      }
     }
     catch (\RuntimeException $e) {
       $form['message'] = [
@@ -197,7 +203,7 @@ final class UpdaterForm extends UpdateFormBase {
     }
     $this->displayResults($results, $this->renderer);
     $project = $project_info->getProjectInfo();
-    if ($installed_minor_release === NULL && $next_minor_release === NULL) {
+    if (empty($releases)) {
       if ($project['status'] === UpdateManagerInterface::CURRENT) {
         $this->messenger()->addMessage($this->t('No update available'));
       }
@@ -249,72 +255,82 @@ final class UpdaterForm extends UpdateFormBase {
         $type = 'update-recommended';
     }
     $create_update_buttons = !$stage_exists && ValidationResult::getOverallSeverity($results) !== SystemManager::REQUIREMENT_ERROR;
-    if ($installed_minor_release) {
-      $installed_version = ExtensionVersion::createFromVersionString($project_info->getInstalledVersion());
-      $form['installed_minor'] = $this->createReleaseTable(
-        $installed_minor_release,
-        $release_status,
-        $this->t('Latest version of Drupal @major.@minor (currently installed):', [
-          '@major' => $installed_version->getMajorVersion(),
-          '@minor' => $installed_version->getMinorVersion(),
-        ]),
-        $type,
-        $create_update_buttons,
-        // Any update in the current minor should be the primary update.
-        TRUE,
-      );
-    }
-    if ($next_minor_release) {
-      // If there is no update in the current minor make the button for the next
-      // minor primary unless the project status is 'CURRENT' or 'NOT_CURRENT'.
-      // 'NOT_CURRENT' does not denote that installed version is not a valid
-      // only that there is newer version available.
-      $is_primary = !$installed_minor_release && !($project['status'] === UpdateManagerInterface::CURRENT || $project['status'] === UpdateManagerInterface::NOT_CURRENT);
-      $next_minor_version = ExtensionVersion::createFromVersionString($next_minor_release->getVersion());
-
-      // Since updating to another minor version of Drupal is more disruptive
-      // than updating within the currently installed minor version, ensure we
-      // display a link to the release notes for the first (x.y.0) release of
-      // the next minor version, which will inform site owners of any potential
-      // pitfalls or major changes. We should always be able to get release info
-      // for it; if we can't, that's an error condition.
-      $first_release_version = $next_minor_version->getMajorVersion() . '.' . $next_minor_version->getMinorVersion() . '.0';
-      $available_updates = update_get_available(TRUE);
-      if (isset($available_updates['drupal']['releases'][$first_release_version])) {
-        $next_minor_first_release = ProjectRelease::createFromArray($available_updates['drupal']['releases'][$first_release_version]);
+
+    $installed_minor_release = FALSE;
+    $next_minor_release_count = 0;
+    foreach ($releases as $release) {
+      $release_version = ExtensionVersion::createFromVersionString($release->getVersion());
+      if ($release_version->getMinorVersion() === $installed_version->getMinorVersion()) {
+        $installed_minor_release = TRUE;
+        $installed_version = ExtensionVersion::createFromVersionString($project_info->getInstalledVersion());
+        $form['installed_minor'] = $this->createReleaseTable(
+          $release,
+          $release_status,
+          $this->t('Latest version of Drupal @major.@minor (currently installed):', [
+            '@major' => $installed_version->getMajorVersion(),
+            '@minor' => $installed_version->getMinorVersion(),
+          ]),
+          $type,
+          $create_update_buttons,
+          // Any update in the current minor should be the primary update.
+          TRUE,
+        );
       }
       else {
-        throw new \LogicException("Release information for Drupal $first_release_version is not available.");
-      }
+        $next_minor_release_count++;
+        if ($next_minor_release_count === 1) {
+          if ($this->moduleHandler->moduleExists('help')) {
+            $url = Url::fromRoute('help.page')
+              ->setRouteParameter('name', 'automatic_updates')
+              ->setOption('fragment', 'minor-update');
+
+            $form['minor_update_help'] = [
+              '#markup' => $this->t('The following updates are in newer minor version of Drupal. <a href=":url">Learn more about updating to another minor version.</a>', [
+                ':url' => $url->toString(),
+              ]),
+              '#prefix' => '<p>',
+              '#suffix' => '</p>',
+            ];
+          }
+        }
+        // If there is no update in the current minor make the button for the
+        // next minor primary unless the project status is 'CURRENT' or
+        // 'NOT_CURRENT'. 'NOT_CURRENT' does not denote that installed version
+        // is not a valid only that there is newer version available.
+        if (!isset($is_primary)) {
+          $is_primary = !$installed_minor_release && !($project['status'] === UpdateManagerInterface::CURRENT || $project['status'] === UpdateManagerInterface::NOT_CURRENT);
+        }
+        else {
+          $is_primary = FALSE;
+        }
 
-      if ($this->moduleHandler->moduleExists('help')) {
-        $url = Url::fromRoute('help.page')
-          ->setRouteParameter('name', 'automatic_updates')
-          ->setOption('fragment', 'minor-update');
+        // Since updating to another minor version of Drupal is more
+        // disruptive than updating within the currently installed minor
+        // version, ensure we display a link to the release notes for the
+        // first (x.y.0) release of the next minor version, which will inform
+        // site owners of any potential pitfalls or major changes. We should
+        // always be able to get release info for it; if we can't, that's an
+        // error condition.
+        $first_release_version = $release_version->getMajorVersion() . '.' . $release_version->getMinorVersion() . '.0';
+        $available_updates = update_get_available(TRUE);
+
+        // @todo In https://www.drupal.org/i/3310666 handle if the .0 release is
+        //   not available, and only pre-releases are available.
+        $next_minor_first_release = ProjectRelease::createFromArray($available_updates['drupal']['releases'][$first_release_version]);
 
-        // @todo Updating this wording in https://www.drupal.org/i/3280403 to
-        //   reflect that multiple minor branches may be visible.
-        $form['minor_update_help'] = [
-          '#markup' => $this->t('The following updates are in the next minor version of Drupal. <a href=":url">Learn more about updating to another minor version.</a>', [
-            ':url' => $url->toString(),
+        $form["next_minor_$next_minor_release_count"] = $this->createReleaseTable(
+          $release,
+          $installed_minor_release ? $this->t('Minor update') : $release_status,
+          $this->t('Latest version of Drupal @major.@minor (next minor) (<a href=":url">Release notes</a>):', [
+            '@major' => $release_version->getMajorVersion(),
+            '@minor' => $release_version->getMinorVersion(),
+            ':url' => $next_minor_first_release->getReleaseUrl(),
           ]),
-          '#prefix' => '<p>',
-          '#suffix' => '</p>',
-        ];
+          $installed_minor_release ? 'update-optional' : $type,
+          $create_update_buttons,
+          $is_primary
+        );
       }
-
-      $form['next_minor'] = $this->createReleaseTable(
-        $next_minor_release,
-        $installed_minor_release ? $this->t('Minor update') : $release_status,
-        $this->t('Latest version of Drupal @major.@minor (next minor) (<a href=":url">Release notes</a>):', [
-          '@major' => $next_minor_version->getMajorVersion(),
-          '@minor' => $next_minor_version->getMinorVersion(),
-          ':url' => $next_minor_first_release->getReleaseUrl(),
-        ]),
-        $installed_minor_release ? 'update-optional' : $type,
-        $create_update_buttons,
-        $is_primary
-      );
     }
 
     $form['backup'] = [

src/ReleaseChooser.php

@@ -75,7 +75,7 @@ final class ReleaseChooser {
    * @throws \InvalidArgumentException
    *   If the given semantic version number does not contain a patch version.
    */
-  protected function getMostRecentReleaseInMinor(Updater $updater, string $version): ?ProjectRelease {
+  public 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");
     }

tests/src/Functional/UpdaterFormTest.php

@@ -130,11 +130,11 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
     $assert_session = $this->assertSession();
 
     $assert_minor_update_help = function () use ($assert_session): void {
-      $assert_session->pageTextContains('The following updates are in the next minor version of Drupal. Learn more about updating to another minor version.');
+      $assert_session->pageTextContainsOnce('The following updates are in newer minor version of Drupal. Learn more about updating to another minor version.');
       $assert_session->linkExists('Learn more about updating to another minor version.');
     };
     $assert_no_minor_update_help = function () use ($assert_session): void {
-      $assert_session->pageTextNotContains('The following updates are in the next minor version of Drupal. Learn more about updating to another minor version.');
+      $assert_session->pageTextNotContains('The following updates are in newer minor version of Drupal. Learn more about updating to another minor version.');
     };
 
     $page = $this->getSession()->getPage();
@@ -158,7 +158,7 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
     // Check the form when there is an update in the installed minor only.
     $assert_session->pageTextContainsOnce('Currently installed: 9.8.0 (Security update required!)');
     $this->checkReleaseTable('#edit-installed-minor', '.update-update-security', '9.8.1', TRUE, 'Latest version of Drupal 9.8 (currently installed):');
-    $assert_session->elementNotExists('css', '#edit-next-minor');
+    $assert_session->elementNotExists('css', '#edit-next-minor-1');
     $assert_no_minor_update_help();
 
     // Check the form when there is an update in the next minor only.
@@ -166,9 +166,9 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
     $this->setCoreVersion('9.7.0');
     $page->clickLink('Check manually');
     $this->checkForMetaRefresh();
-    $this->checkReleaseTable('#edit-next-minor', '.update-update-recommended', '9.8.1', TRUE, 'Latest version of Drupal 9.8 (next minor) (Release notes):');
+    $this->checkReleaseTable('#edit-next-minor-1', '.update-update-recommended', '9.8.1', TRUE, 'Latest version of Drupal 9.8 (next minor) (Release notes):');
     $assert_minor_update_help();
-    $this->assertReleaseNotesLink(9, 8);
+    $this->assertReleaseNotesLink(9, 8, '#edit-next-minor-1');
     $assert_session->pageTextContainsOnce('Currently installed: 9.7.0 (Not supported!)');
     $assert_session->elementNotExists('css', '#edit-installed-minor');
 
@@ -180,7 +180,7 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
     $this->checkForMetaRefresh();
     $assert_session->pageTextContainsOnce('Currently installed: 9.7.0 (Update available)');
     $this->checkReleaseTable('#edit-installed-minor', '.update-update-recommended', '9.7.1', TRUE, 'Latest version of Drupal 9.7 (currently installed):');
-    $assert_session->elementNotExists('css', '#edit-next-minor');
+    $assert_session->elementNotExists('css', '#edit-next-minor-1');
     $assert_no_minor_update_help();
 
     // Check that if minor updates are enabled the update in the next minor will
@@ -188,8 +188,8 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
     $this->config('automatic_updates.settings')->set('allow_core_minor_updates', TRUE)->save();
     $this->getSession()->reload();
     $this->checkReleaseTable('#edit-installed-minor', '.update-update-recommended', '9.7.1', TRUE, 'Latest version of Drupal 9.7 (currently installed):');
-    $this->checkReleaseTable('#edit-next-minor', '.update-update-optional', '9.8.2', FALSE, 'Latest version of Drupal 9.8 (next minor) (Release notes):');
-    $this->assertReleaseNotesLink(9, 8);
+    $this->checkReleaseTable('#edit-next-minor-1', '.update-update-optional', '9.8.2', FALSE, 'Latest version of Drupal 9.8 (next minor) (Release notes):');
+    $this->assertReleaseNotesLink(9, 8, '#edit-next-minor-1');
     $assert_minor_update_help();
 
     $this->setCoreVersion('9.7.1');
@@ -197,8 +197,39 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
     $this->checkForMetaRefresh();
     $assert_session->pageTextContainsOnce('Currently installed: 9.7.1 (Update available)');
     $assert_session->elementNotExists('css', '#edit-installed-minor');
-    $this->checkReleaseTable('#edit-next-minor', '.update-update-recommended', '9.8.2', FALSE, 'Latest version of Drupal 9.8 (next minor) (Release notes):');
-    $this->assertReleaseNotesLink(9, 8);
+    $this->checkReleaseTable('#edit-next-minor-1', '.update-update-recommended', '9.8.2', FALSE, 'Latest version of Drupal 9.8 (next minor) (Release notes):');
+    $this->assertReleaseNotesLink(9, 8, '#edit-next-minor-1');
+    $assert_minor_update_help();
+
+    // Check that if minor updates are enabled then updates in the next minors
+    // are visible.
+    $this->config('automatic_updates.settings')->set('allow_core_minor_updates', TRUE)->save();
+    $this->setReleaseMetadata(__DIR__ . '/../../../package_manager/tests/fixtures/release-history/drupal.10.0.0.xml');
+    $this->setCoreVersion('9.5.0');
+    $page->clickLink('Check manually');
+    $this->checkForMetaRefresh();
+    $assert_session->pageTextNotContains('10.0.0');
+    $assert_session->pageTextContainsOnce('Currently installed: 9.5.0 (Update available)');
+    $this->checkReleaseTable('#edit-installed-minor', '.update-update-recommended', '9.5.1', TRUE, 'Latest version of Drupal 9.5 (currently installed):');
+    $this->checkReleaseTable('#edit-next-minor-1', '.update-update-optional', '9.6.1', FALSE, 'Latest version of Drupal 9.6 (next minor) (Release notes):');
+    $this->assertReleaseNotesLink(9, 6, '#edit-next-minor-1');
+    $this->checkReleaseTable('#edit-next-minor-2', '.update-update-optional', '9.7.2', FALSE, 'Latest version of Drupal 9.7 (next minor) (Release notes):');
+    $this->assertReleaseNotesLink(9, 7, '#edit-next-minor-2');
+    $assert_minor_update_help();
+
+    // Check that if installed version is unsupported and minor updates are
+    // enabled then updates in the next minors are visible.
+    $this->setCoreVersion('9.4.0');
+    $page->clickLink('Check manually');
+    $this->checkForMetaRefresh();
+    $assert_session->pageTextNotContains('10.0.0');
+    $assert_session->pageTextContainsOnce('Currently installed: 9.4.0 (Not supported!)');
+    $this->checkReleaseTable('#edit-next-minor-1', '.update-update-recommended', '9.5.1', TRUE, 'Latest version of Drupal 9.5 (next minor) (Release notes):');
+    $this->assertReleaseNotesLink(9, 5, '#edit-next-minor-1');
+    $this->checkReleaseTable('#edit-next-minor-2', '.update-update-recommended', '9.6.1', FALSE, 'Latest version of Drupal 9.6 (next minor) (Release notes):');
+    $this->assertReleaseNotesLink(9, 6, '#edit-next-minor-2');
+    $this->checkReleaseTable('#edit-next-minor-3', '.update-update-recommended', '9.7.2', FALSE, 'Latest version of Drupal 9.7 (next minor) (Release notes):');
+    $this->assertReleaseNotesLink(9, 7, '#edit-next-minor-3');
     $assert_minor_update_help();
 
     $this->assertUpdateStagedTimes(0);
@@ -898,10 +929,12 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
    *   Major version of next minor release.
    * @param int $minor
    *   Minor version of next minor release.
+   * @param string $selector
+   *   The selector.
    */
-  private function assertReleaseNotesLink(int $major, int $minor): void {
+  private function assertReleaseNotesLink(int $major, int $minor, string $selector): void {
     $assert_session = $this->assertSession();
-    $row = $assert_session->elementExists('css', '#edit-next-minor');
+    $row = $assert_session->elementExists('css', $selector);
     $link_href = $assert_session->elementExists('named', ['link', 'Release notes'], $row)->getAttribute('href');
     $this->assertSame('http://example.com/drupal-' . $major . '-' . $minor . '-0-release', $link_href);
   }

tests/src/Kernel/ReleaseChooserTest.php

@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\automatic_updates\Kernel;
 
+use Drupal\Core\Extension\ExtensionVersion;
 use Drupal\update\ProjectRelease;
 
 /**
@@ -140,6 +141,7 @@ class ReleaseChooserTest extends AutomaticUpdatesKernelTestBase {
    *
    * @covers ::getLatestInInstalledMinor
    * @covers ::getLatestInNextMinor
+   * @covers ::getMostRecentReleaseInMinor
    */
   public function testReleases(string $updater_service, bool $minor_support, string $installed_version, ?string $current_minor, ?string $next_minor): void {
     $this->setCoreVersion($installed_version);
@@ -150,6 +152,14 @@ class ReleaseChooserTest extends AutomaticUpdatesKernelTestBase {
     $updater = $this->container->get($updater_service);
     $this->assertReleaseVersion($current_minor, $chooser->getLatestInInstalledMinor($updater));
     $this->assertReleaseVersion($next_minor, $chooser->getLatestInNextMinor($updater));
+
+    $this->assertReleaseVersion($current_minor, $chooser->getMostRecentReleaseInMinor($updater, $this->getRelativeVersion($installed_version, 0)));
+    $next_minor_version = $this->getRelativeVersion($installed_version, 1);
+    $this->assertReleaseVersion($next_minor, $chooser->getMostRecentReleaseInMinor($updater, $next_minor_version));
+    $previous_minor_version = $this->getRelativeVersion($installed_version, -1);
+    // The chooser should never return a release for a minor before the
+    // currently installed version.
+    $this->assertReleaseVersion(NULL, $chooser->getMostRecentReleaseInMinor($updater, $previous_minor_version));
   }
 
   /**
@@ -170,4 +180,20 @@ class ReleaseChooserTest extends AutomaticUpdatesKernelTestBase {
     }
   }
 
+  /**
+   * Gets a version number in a minor version relative to another version.
+   *
+   * @param string $version
+   *   The version string.
+   * @param int $minor_offset
+   *   The minor offset.
+   *
+   * @return string
+   *   The first patch release in a minor relative to the version string.
+   */
+  private function getRelativeVersion(string $version, int $minor_offset): string {
+    $installed_version_object = ExtensionVersion::createFromVersionString($version);
+    return $installed_version_object->getMajorVersion() . '.' . (((int) $installed_version_object->getMinorVersion()) + $minor_offset) . '.0';
+  }
+
 }