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

Issue #3364646 by dww, catch, longwave: Add a branch alias for 11.x

merge-requests/4177/merge
catch 2023-07-24 09:15:06 +01:00
parent c8deebc1d5
commit b28e3b7651
15 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@ -68,6 +68,9 @@
} }
}, },
"extra": { "extra": {
"branch-alias": {
"dev-11.x": "10.2.x-dev"
},
"_readme": [ "_readme": [
"By default Drupal loads the autoloader from ./vendor/autoload.php.", "By default Drupal loads the autoloader from ./vendor/autoload.php.",
"To change the autoloader you can edit ./autoload.php.", "To change the autoloader you can edit ./autoload.php.",

2
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "e98db90afbd0b05e99c667319f2f2eba", "content-hash": "d5d9a4f206c270584532c37f9ec140fc",
"packages": [ "packages": [
{ {
"name": "asm89/stack-cors", "name": "asm89/stack-cors",

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

@ -7,7 +7,7 @@
"webflo/drupal-core-strict": "*" "webflo/drupal-core-strict": "*"
}, },
"require": { "require": {
"drupal/core": "11.x-dev", "drupal/core": "10.2.x-dev",
"asm89/stack-cors": "~v2.1.1", "asm89/stack-cors": "~v2.1.1",
"composer/semver": "~3.3.2", "composer/semver": "~3.3.2",
"doctrine/annotations": "~1.14.3", "doctrine/annotations": "~1.14.3",

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

@ -7,7 +7,7 @@
"webflo/drupal-core-require-dev": "*" "webflo/drupal-core-require-dev": "*"
}, },
"require": { "require": {
"drupal/core": "11.x-dev", "drupal/core": "10.2.x-dev",
"behat/mink": "v1.10.0", "behat/mink": "v1.10.0",
"behat/mink-browserkit-driver": "v2.1.0", "behat/mink-browserkit-driver": "v2.1.0",
"behat/mink-selenium2-driver": "v1.6.0", "behat/mink-selenium2-driver": "v1.6.0",

10
composer/Template/LegacyProject/composer.json
View File

@ -16,13 +16,13 @@
], ],
"require": { "require": {
"composer/installers": "^2.0", "composer/installers": "^2.0",
"drupal/core-composer-scaffold": "^11", "drupal/core-composer-scaffold": "^10.2",
"drupal/core-project-message": "^11", "drupal/core-project-message": "^10.2",
"drupal/core-recommended": "^11", "drupal/core-recommended": "^10.2",
"drupal/core-vendor-hardening": "^11" "drupal/core-vendor-hardening": "^10.2"
}, },
"require-dev": { "require-dev": {
"drupal/core-dev": "^11" "drupal/core-dev": "^10.2"
}, },
"conflict": { "conflict": {
"drupal/drupal": "*" "drupal/drupal": "*"

8
composer/Template/RecommendedProject/composer.json
View File

@ -16,12 +16,12 @@
], ],
"require": { "require": {
"composer/installers": "^2.0", "composer/installers": "^2.0",
"drupal/core-composer-scaffold": "^11", "drupal/core-composer-scaffold": "^10.2",
"drupal/core-project-message": "^11", "drupal/core-project-message": "^10.2",
"drupal/core-recommended": "^11" "drupal/core-recommended": "^10.2"
}, },
"require-dev": { "require-dev": {
"drupal/core-dev": "^11" "drupal/core-dev": "^10.2"
}, },
"conflict": { "conflict": {
"drupal/drupal": "*" "drupal/drupal": "*"

2
core/lib/Drupal.php
View File

@ -75,7 +75,7 @@ class Drupal {
/** /**
* The current system version. * The current system version.
*/ */
const VERSION = '11.0-dev'; const VERSION = '10.2.0-dev';
/** /**
* Core API compatibility. * Core API compatibility.

6
core/lib/Drupal/Component/Annotation/composer.json
View File

@ -9,9 +9,9 @@
"require": { "require": {
"php": ">=8.1.0", "php": ">=8.1.0",
"doctrine/annotations": "^1.14", "doctrine/annotations": "^1.14",
"drupal/core-file-cache": "11.x-dev", "drupal/core-file-cache": "10.2.x-dev",
"drupal/core-plugin": "11.x-dev", "drupal/core-plugin": "10.2.x-dev",
"drupal/core-utility": "11.x-dev" "drupal/core-utility": "10.2.x-dev"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

2
core/lib/Drupal/Component/Datetime/composer.json
View File

@ -8,7 +8,7 @@
"license": "GPL-2.0-or-later", "license": "GPL-2.0-or-later",
"require": { "require": {
"php": ">=8.1.0", "php": ">=8.1.0",
"drupal/core-utility": "11.x-dev" "drupal/core-utility": "10.2.x-dev"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

4
core/lib/Drupal/Component/Discovery/composer.json
View File

@ -8,8 +8,8 @@
"license": "GPL-2.0-or-later", "license": "GPL-2.0-or-later",
"require": { "require": {
"php": ">=8.1.0", "php": ">=8.1.0",
"drupal/core-file-cache": "11.x-dev", "drupal/core-file-cache": "10.2.x-dev",
"drupal/core-serialization": "11.x-dev" "drupal/core-serialization": "10.2.x-dev"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

2
core/lib/Drupal/Component/FrontMatter/composer.json
View File

@ -8,7 +8,7 @@
"license": "GPL-2.0-or-later", "license": "GPL-2.0-or-later",
"require": { "require": {
"php": ">=8.1.0", "php": ">=8.1.0",
"drupal/core-serialization": "11.x-dev" "drupal/core-serialization": "10.2.x-dev"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

2
core/lib/Drupal/Component/Gettext/composer.json
View File

@ -9,7 +9,7 @@
}, },
"require": { "require": {
"php": ">=8.1.0", "php": ">=8.1.0",
"drupal/core-render": "11.x-dev" "drupal/core-render": "10.2.x-dev"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

2
core/lib/Drupal/Component/PhpStorage/composer.json
View File

@ -8,7 +8,7 @@
"license": "GPL-2.0-or-later", "license": "GPL-2.0-or-later",
"require": { "require": {
"php": ">=8.1.0", "php": ">=8.1.0",
"drupal/core-file-security": "11.x-dev" "drupal/core-file-security": "10.2.x-dev"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

2
core/lib/Drupal/Component/Render/composer.json
View File

@ -8,7 +8,7 @@
"license": "GPL-2.0-or-later", "license": "GPL-2.0-or-later",
"require": { "require": {
"php": ">=8.1.0", "php": ">=8.1.0",
"drupal/core-utility": "11.x-dev" "drupal/core-utility": "10.2.x-dev"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

10
core/tests/Drupal/BuildTests/Composer/Component/ComponentsIsolatedBuildTest.php
View File

@ -66,12 +66,10 @@ class ComponentsIsolatedBuildTest extends ComposerBuildTestBase {
* The working directory. * The working directory.
*/ */
protected function addExpectedRepositories(string $working_dir): void { protected function addExpectedRepositories(string $working_dir): void {
$repo_paths = [ foreach ($this->provideComponentPaths() as $path) {
'Render' => 'drupal/core-render', $path = $path[0];
'Utility' => 'drupal/core-utility', $package_name = 'drupal/core' . strtolower(preg_replace('/[A-Z]/', '-$0', substr($path, 1)));
]; $path_repo = $this->getWorkingPath() . static::$componentsPath . $path;
foreach ($repo_paths as $path => $package_name) {
$path_repo = $this->getWorkingPath() . static::$componentsPath . '/' . $path;
$repo_name = strtolower($path); $repo_name = strtolower($path);
// Add path repositories with the current version number to the current // Add path repositories with the current version number to the current
// package under test. // package under test.