Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3090906 by alexpott, greg.1.anderson, ravi.shankar, xjm, Mixologic, Mile23: self.version in metapackages considered harmful

merge-requests/55/head
xjm 2019-11-22 12:20:20 -06:00
parent f5af770645
commit e588966403
5 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
composer/Generator/Builder/DrupalCoreRecommendedBuilder.php
View File

@ -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 @@ class DrupalCoreRecommendedBuilder extends DrupalPackageBuilder {
"webflo/drupal-core-strict" => "*",
],
"require" => [
"drupal/core" => "self.version",
"drupal/core" => Composer::drupalVersionBranch(),
],
];
}

4
composer/Generator/Builder/DrupalPinnedDevDependenciesBuilder.php
View File

@ -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 @@ class DrupalPinnedDevDependenciesBuilder extends DrupalPackageBuilder {
"webflo/drupal-core-require-dev" => "*",
],
"require" => [
"drupal/core" => "self.version",
"drupal/core" => Composer::drupalVersionBranch(),
],
];
}

2
composer/Metapackage/CoreRecommended/composer.json
View File

@ -7,7 +7,7 @@
"webflo/drupal-core-strict": "*"
},
"require": {
"drupal/core": "self.version",
"drupal/core": "8.8.x-dev",
"asm89/stack-cors": "1.2.0",
"composer/installers": "v1.7.0",
"composer/semver": "1.5.0",

2
composer/Metapackage/PinnedDevDependencies/composer.json
View File

@ -7,7 +7,7 @@
"webflo/drupal-core-require-dev": "*"
},
"require": {
"drupal/core": "self.version",
"drupal/core": "8.8.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",

5
core/tests/Drupal/Tests/Composer/Generator/BuilderTest.php
View File

@ -6,6 +6,7 @@ use Drupal\Composer\Generator\Builder\DrupalCoreRecommendedBuilder;
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 @@ class BuilderTest extends TestCase {
'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 @@ class BuilderTest extends TestCase {
'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',
],