diff --git a/composer/Generator/Builder/DrupalCoreRecommendedBuilder.php b/composer/Generator/Builder/DrupalCoreRecommendedBuilder.php index 1dc0a0989b454d8553924ea4ee338521767f4851..3b695377eb45579d9c7f9c29146c304eefade762 100644 --- a/composer/Generator/Builder/DrupalCoreRecommendedBuilder.php +++ b/composer/Generator/Builder/DrupalCoreRecommendedBuilder.php @@ -2,6 +2,8 @@ namespace Drupal\Composer\Generator\Builder; +use Drupal\Composer\Composer; + /** * Builder to produce metapackage for drupal/core-recommended. */ @@ -60,7 +62,7 @@ protected function initialPackageMetadata() { "webflo/drupal-core-strict" => "*", ], "require" => [ - "drupal/core" => "self.version", + "drupal/core" => Composer::drupalVersionBranch(), ], ]; } diff --git a/composer/Generator/Builder/DrupalPinnedDevDependenciesBuilder.php b/composer/Generator/Builder/DrupalPinnedDevDependenciesBuilder.php index 9e4c9724d6b4657a42b755f3a8c8840ce5ce0528..73023c74a425cc9b6413a71f92e5576d81f87e3f 100644 --- a/composer/Generator/Builder/DrupalPinnedDevDependenciesBuilder.php +++ b/composer/Generator/Builder/DrupalPinnedDevDependenciesBuilder.php @@ -2,6 +2,8 @@ namespace Drupal\Composer\Generator\Builder; +use Drupal\Composer\Composer; + /** * Builder to produce metapackage for drupal/core-dev-pinned. */ @@ -61,7 +63,7 @@ protected function initialPackageMetadata() { "webflo/drupal-core-require-dev" => "*", ], "require" => [ - "drupal/core" => "self.version", + "drupal/core" => Composer::drupalVersionBranch(), ], ]; } diff --git a/composer/Metapackage/CoreRecommended/composer.json b/composer/Metapackage/CoreRecommended/composer.json index 4e6eb3d609d7d76b438b236151a05a11f696bba2..43da9c49f17264cde768c89d8378697899974954 100644 --- a/composer/Metapackage/CoreRecommended/composer.json +++ b/composer/Metapackage/CoreRecommended/composer.json @@ -7,7 +7,7 @@ "webflo/drupal-core-strict": "*" }, "require": { - "drupal/core": "self.version", + "drupal/core": "9.0.x-dev", "asm89/stack-cors": "1.2.0", "composer/installers": "v1.7.0", "composer/semver": "1.5.0", diff --git a/composer/Metapackage/PinnedDevDependencies/composer.json b/composer/Metapackage/PinnedDevDependencies/composer.json index 4414f639ed9389f412c2f709642fd9380d2b4ef9..48511a89ba7481807d847241addf681cde6be80f 100644 --- a/composer/Metapackage/PinnedDevDependencies/composer.json +++ b/composer/Metapackage/PinnedDevDependencies/composer.json @@ -7,7 +7,7 @@ "webflo/drupal-core-require-dev": "*" }, "require": { - "drupal/core": "self.version", + "drupal/core": "9.0.x-dev", "behat/mink": "1.8.0 | 1.7.1.1 | 1.7.x-dev", "behat/mink-browserkit-driver": "1.3.3", "behat/mink-goutte-driver": "v1.2.1", diff --git a/core/tests/Drupal/Tests/Composer/Generator/BuilderTest.php b/core/tests/Drupal/Tests/Composer/Generator/BuilderTest.php index 1c108659878d97b675e76e46c63465eb04c30dde..f402b9d2c977adc4e7e51951ebb9a143371caa57 100644 --- a/core/tests/Drupal/Tests/Composer/Generator/BuilderTest.php +++ b/core/tests/Drupal/Tests/Composer/Generator/BuilderTest.php @@ -6,6 +6,7 @@ use Drupal\Composer\Generator\Builder\DrupalDevDependenciesBuilder; use Drupal\Composer\Generator\Builder\DrupalPinnedDevDependenciesBuilder; use PHPUnit\Framework\TestCase; +use Drupal\Composer\Composer; /** * Test DrupalCoreRecommendedBuilder @@ -28,7 +29,7 @@ public function builderTestData() { 'license' => 'GPL-2.0-or-later', 'require' => [ - 'drupal/core' => 'self.version', + 'drupal/core' => Composer::drupalVersionBranch(), 'symfony/polyfill-ctype' => 'v1.12.0', 'symfony/yaml' => 'v3.4.32', ], @@ -66,7 +67,7 @@ public function builderTestData() { 'license' => 'GPL-2.0-or-later', 'require' => [ - 'drupal/core' => 'self.version', + 'drupal/core' => Composer::drupalVersionBranch(), 'behat/mink' => '1.8.0 | 1.7.1.1 | 1.7.x-dev', 'symfony/css-selector' => 'v4.3.5', ],