Verified Commit 4a5a3267 authored by godotislate's avatar godotislate
Browse files

fix: #3625553 Use MAJOR.x-dev for generated dev-main aliases so release... 

fix: #3625553 Use MAJOR.x-dev for generated dev-main aliases so release branches don't break BuilderTest

By: longwave
By: amitgoyal
By: godotislate
parent 6f816179

composer/Composer.php

+10 −0
Changes for composer/Composer.php: 10 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -113,6 +113,16 @@ public static function drupalVersionBranch(): string { 
    return preg_replace('#\.[0-9]+-dev#', '.x-dev', \Drupal::VERSION);

  }



  /**

   * Return the major version branch alias for the current Drupal version.

   *

   * @return string

   *   A branch alias, e.g. 11.x-dev or 12.x-dev.

   */

  public static function drupalMajorVersionBranch(): string {

    return explode('.', \Drupal::VERSION)[0] . '.x-dev';

  }



  /**

   * Return the list of subprojects of a given type.

   *

composer/Generator/Builder/DrupalCoreRecommendedBuilder.php

+1 −1
Changes for composer/Generator/Builder/DrupalCoreRecommendedBuilder.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ protected function initialPackageMetadata() { 
      ],

      "extra" => [

        "branch-alias" => [

          "dev-main" => Composer::drupalVersionBranch(),

          "dev-main" => Composer::drupalMajorVersionBranch(),

        ],

      ],

    ];

composer/Generator/Builder/DrupalDevDependenciesBuilder.php

+1 −1
Changes for composer/Generator/Builder/DrupalDevDependenciesBuilder.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ protected function initialPackageMetadata() { 
      ],

      "extra" => [

        "branch-alias" => [

          "dev-main" => Composer::drupalVersionBranch(),

          "dev-main" => Composer::drupalMajorVersionBranch(),

        ],

      ],

    ];

composer/Metapackage/CoreRecommended/composer.json

+1 −1
Changes for composer/Metapackage/CoreRecommended/composer.json: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
    },

    "extra": {

        "branch-alias": {

            "dev-main": "12.0.x-dev"

            "dev-main": "12.x-dev"

        }

    }

}

composer/Metapackage/DevDependencies/composer.json

+1 −1
Changes for composer/Metapackage/DevDependencies/composer.json: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
    },

    "extra": {

        "branch-alias": {

            "dev-main": "12.0.x-dev"

            "dev-main": "12.x-dev"

        }

    },

    "require": {