Skip to content
Snippets Groups Projects
Unverified Commit 7d71991c authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3090684 by Mixologic, greg.1.anderson, opdavies, alexpott: Rename... 

Issue #3090684 by Mixologic, greg.1.anderson, opdavies, alexpott: Rename drupal/dev-dependencies and drupal/pinned-dev-dependencies
parent f995409b
No related branches found
No related tags found
6 merge requests!7452Issue #1797438. HTML5 validation is preventing form submit and not fully...,!1012Issue #3226887: Hreflang on non-canonical content pages,!789Issue #3210310: Adjust Database API to remove deprecated Drupal 9 code in Drupal 10,!596Issue #3046532: deleting an entity reference field, used in a contextual view, makes the whole site unrecoverable,!496Issue #2463967: Use .user.ini file for PHP settings,!144Issue #2666286: Clean up menu_ui to conform to Drupal coding standards
Hide whitespace changes
Inline Side-by-side
Showing
with 26 additions and 26 deletions
composer/Generator/Builder/DrupalCoreRecommendedBuilder.php
+ 2
− 2
View file @ 7d71991c
...@@ -33,8 +33,8 @@ public function getPackage() { ...@@ -33,8 +33,8 @@ public function getPackage() {
// Copy the 'packages' section from the Composer lock into our 'require' // Copy the 'packages' section from the Composer lock into our 'require'
// section. There is also a 'packages-dev' section, but we do not need // section. There is also a 'packages-dev' section, but we do not need
// to pin 'require-dev' versions, as 'require-dev' dependencies are never // to pin 'require-dev' versions, as 'require-dev' dependencies are never
// included from subprojects. Use 'drupal/core-dev-dependencies' to get // included from subprojects. Use 'drupal/core-dev' to get Drupal's
// Drupal's dev dependencies. // dev dependencies.
foreach ($composerLockData['packages'] as $package) { foreach ($composerLockData['packages'] as $package) {
// If there is no 'source' record, then this is a path repository // If there is no 'source' record, then this is a path repository
// or something else that we do not want to include. // or something else that we do not want to include.
......
composer/Generator/Builder/DrupalDevDependenciesBuilder.php
+ 2
− 2
View file @ 7d71991c
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
namespace Drupal\Composer\Generator\Builder; namespace Drupal\Composer\Generator\Builder;
/** /**
* Builder to produce metapackage for drupal/dev-dependencies. * Builder to produce metapackage for drupal/core-dev.
*/ */
class DrupalDevDependenciesBuilder extends DrupalPackageBuilder { class DrupalDevDependenciesBuilder extends DrupalPackageBuilder {
...@@ -49,7 +49,7 @@ public function getPackage() { ...@@ -49,7 +49,7 @@ public function getPackage() {
*/ */
protected function initialPackageMetadata() { protected function initialPackageMetadata() {
return [ return [
"name" => "drupal/dev-dependencies", "name" => "drupal/core-dev",
"type" => "metapackage", "type" => "metapackage",
"description" => "require-dev dependencies from drupal/drupal; use in addition to drupal/core-recommended to run tests from drupal/core.", "description" => "require-dev dependencies from drupal/drupal; use in addition to drupal/core-recommended to run tests from drupal/core.",
"license" => "GPL-2.0-or-later", "license" => "GPL-2.0-or-later",
......
composer/Generator/Builder/DrupalPinnedDevDependenciesBuilder.php
+ 2
− 2
View file @ 7d71991c
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
namespace Drupal\Composer\Generator\Builder; namespace Drupal\Composer\Generator\Builder;
/** /**
* Builder to produce metapackage for drupal/pinned-dev-dependencies. * Builder to produce metapackage for drupal/core-dev-pinned.
*/ */
class DrupalPinnedDevDependenciesBuilder extends DrupalPackageBuilder { class DrupalPinnedDevDependenciesBuilder extends DrupalPackageBuilder {
...@@ -53,7 +53,7 @@ public function getPackage() { ...@@ -53,7 +53,7 @@ public function getPackage() {
*/ */
protected function initialPackageMetadata() { protected function initialPackageMetadata() {
return [ return [
"name" => "drupal/pinned-dev-dependencies", "name" => "drupal/core-dev-pinned",
"type" => "metapackage", "type" => "metapackage",
"description" => "Pinned require-dev dependencies from drupal/drupal; use in addition to drupal/core-recommended to run tests from drupal/core.", "description" => "Pinned require-dev dependencies from drupal/drupal; use in addition to drupal/core-recommended to run tests from drupal/core.",
"license" => "GPL-2.0-or-later", "license" => "GPL-2.0-or-later",
......
composer/Metapackage/DevDependencies/composer.json
+ 1
− 1
View file @ 7d71991c
{ {
"name": "drupal/dev-dependencies", "name": "drupal/core-dev",
"type": "metapackage", "type": "metapackage",
"description": "require-dev dependencies from drupal/drupal; use in addition to drupal/core-recommended to run tests from drupal/core.", "description": "require-dev dependencies from drupal/drupal; use in addition to drupal/core-recommended to run tests from drupal/core.",
"license": "GPL-2.0-or-later", "license": "GPL-2.0-or-later",
......
composer/Metapackage/PinnedDevDependencies/composer.json
+ 1
− 1
View file @ 7d71991c
{ {
"name": "drupal/pinned-dev-dependencies", "name": "drupal/core-dev-pinned",
"type": "metapackage", "type": "metapackage",
"description": "Pinned require-dev dependencies from drupal/drupal; use in addition to drupal/core-recommended to run tests from drupal/core.", "description": "Pinned require-dev dependencies from drupal/drupal; use in addition to drupal/core-recommended to run tests from drupal/core.",
"license": "GPL-2.0-or-later", "license": "GPL-2.0-or-later",
......
composer/Metapackage/README.txt
+ 14
− 14
View file @ 7d71991c
...@@ -15,20 +15,20 @@ Drupal Core provides three metapackages that serve different purposes. ...@@ -15,20 +15,20 @@ Drupal Core provides three metapackages that serve different purposes.
diagram below. This relationship makes it easier for Composer to update diagram below. This relationship makes it easier for Composer to update
a Drupal project. a Drupal project.
- drupal/dev-dependencies: This project provides the same version constraints - drupal/core-dev: This project provides the same version constraints as Drupal
as Drupal uses for testing. It is useful for projects that either wish to uses for testing. It is useful for projects that either wish to run some of
run some of the Drupal tests directly, or for projects that may wish to use the Drupal tests directly, or for projects that may wish to use the same
the same components that Drupal does for testing. components that Drupal does for testing.
- drupal/pinned-dev-dependencies: This project should be used INSTEAD OF - drupal/core-dev-pinned: This project should be used INSTEAD OF
drupal/dev-dependencies in instances where a project wishes to pin to the drupal/core-dev in instances where a project wishes to pin to the exact
exact version of each testing dependency used in Drupal. This in general version of each testing dependency used in Drupal. This in general should not
should not be necessary. be necessary.
Note that a project that uses both drupal/core-recommended and Note that a project that uses both drupal/core-recommended and
drupal/pinned-dev-dependencies must update them both at the same time, e.g.: drupal/core-dev-pinned must update them both at the same time, e.g.:
composer update drupal/core-recommended drupal/pinned-dev-dependencies --with-updates composer update drupal/core-recommended drupal/core-dev-pinned --with-updates
Composer may have trouble with the update if one of these projects is listed Composer may have trouble with the update if one of these projects is listed
on the command line without the other. Running composer update without any on the command line without the other. Running composer update without any
...@@ -39,8 +39,8 @@ updated. ...@@ -39,8 +39,8 @@ updated.
## Metapackage Usage in Template Projects ## Metapackage Usage in Template Projects
The relationship between the metapackages drupal/core-recommended and The relationship between the metapackages drupal/core-recommended and
drupal/dev-dependencies and the project (subtree split) drupal/core, as drupal/core-dev and the project (subtree split) drupal/core, as used in the
used in the drupal/recommended-project is shown below: drupal/recommended-project is shown below:
+----------------------------+ +----------------------------+
| drupal/recommended-project | | drupal/recommended-project |
...@@ -55,7 +55,7 @@ used in the drupal/recommended-project is shown below: ...@@ -55,7 +55,7 @@ used in the drupal/recommended-project is shown below:
+--"require-dev": +--"require-dev":
| |
| +-------------------------+ | +-------------------------+
+-->| drupal/dev-dependencies | +-->| drupal/core-dev |
+-------------------------+ +-------------------------+
If a user does not wish to pin their Drupal project's dependencies to the same If a user does not wish to pin their Drupal project's dependencies to the same
...@@ -63,4 +63,4 @@ versions used in drupal/core, then they should replace drupal/core-recommended ...@@ -63,4 +63,4 @@ versions used in drupal/core, then they should replace drupal/core-recommended
with drupal/core in their "require" section. with drupal/core in their "require" section.
If a user does not need the testing dependencies in their Drupal project, then If a user does not need the testing dependencies in their Drupal project, then
they may simply remove drupal/dev-dependencies from the "require-dev" section. they may simply remove drupal/core-dev from the "require-dev" section.
composer/Template/LegacyProject/composer.json
+ 1
− 1
View file @ 7d71991c
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
"drupal/core-vendor-hardening": "^8.8" "drupal/core-vendor-hardening": "^8.8"
}, },
"require-dev": { "require-dev": {
"drupal/dev-dependencies": "^8.8" "drupal/core-dev": "^8.8"
}, },
"conflict": { "conflict": {
"drupal/drupal": "*" "drupal/drupal": "*"
......
composer/Template/RecommendedProject/composer.json
+ 1
− 1
View file @ 7d71991c
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
"drupal/core-composer-scaffold": "^8.8" "drupal/core-composer-scaffold": "^8.8"
}, },
"require-dev": { "require-dev": {
"drupal/dev-dependencies": "^8.8" "drupal/core-dev": "^8.8"
}, },
"conflict": { "conflict": {
"drupal/drupal": "*" "drupal/drupal": "*"
......
core/tests/Drupal/Tests/Composer/Generator/BuilderTest.php
+ 2
− 2
View file @ 7d71991c
...@@ -42,7 +42,7 @@ public function builderTestData() { ...@@ -42,7 +42,7 @@ public function builderTestData() {
[ [
DrupalDevDependenciesBuilder::class, DrupalDevDependenciesBuilder::class,
[ [
'name' => 'drupal/dev-dependencies', 'name' => 'drupal/core-dev',
'type' => 'metapackage', 'type' => 'metapackage',
'description' => 'require-dev dependencies from drupal/drupal; use in addition to drupal/core-recommended to run tests from drupal/core.', 'description' => 'require-dev dependencies from drupal/drupal; use in addition to drupal/core-recommended to run tests from drupal/core.',
'license' => 'GPL-2.0-or-later', 'license' => 'GPL-2.0-or-later',
...@@ -60,7 +60,7 @@ public function builderTestData() { ...@@ -60,7 +60,7 @@ public function builderTestData() {
[ [
DrupalPinnedDevDependenciesBuilder::class, DrupalPinnedDevDependenciesBuilder::class,
[ [
'name' => 'drupal/pinned-dev-dependencies', 'name' => 'drupal/core-dev-pinned',
'type' => 'metapackage', 'type' => 'metapackage',
'description' => 'Pinned require-dev dependencies from drupal/drupal; use in addition to drupal/core-recommended to run tests from drupal/core.', 'description' => 'Pinned require-dev dependencies from drupal/drupal; use in addition to drupal/core-recommended to run tests from drupal/core.',
'license' => 'GPL-2.0-or-later', 'license' => 'GPL-2.0-or-later',
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment