Skip to content

Commit c3f8d80

Browse files
authored
Make ^10.0 the default constraint for Drupal core (#727)
* Make ^10.0 the default constraint for Drupal core * fix lints * modify drupal/core before install * downgrade drupal/core if linting on PHP 7.4 * downgrade drupal/core if linting on PHP 7.4 * fix missing experimental: false * remove rule changes
1 parent a42bd7c commit c3f8d80

File tree

2 files changed

+21
-27
lines changed

2 files changed

+21
-27
lines changed

.github/workflows/php.yml

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ jobs:
2929
php-version: "${{ matrix.php-version }}"
3030
tools: composer:v2
3131
extensions: dom, curl, libxml, mbstring, zip, pdo, mysql, pdo_mysql, gd
32-
- name: "Upgrade to drupal/core:^10"
33-
run: "composer require drupal/core-recommended:^10 --with-all-dependencies --dev --no-update"
34-
if: ${{ matrix.php-version == '8.3' }}
32+
- name: "Downgrade drupal/core to ^9"
33+
run: "composer require drupal/core-recommended:^9 --with-all-dependencies --dev --no-update"
34+
if: ${{ matrix.php-version == '7.4' }}
3535
- name: "Add phpspec/prophecy-phpunit"
3636
run: "composer require phpspec/prophecy-phpunit:^2 --dev --no-update"
37-
if: ${{ matrix.php-version == '8.3' }}
37+
if: ${{ matrix.php-version == '7.4' }}
3838
- name: "Install dependencies"
3939
uses: "ramsey/composer-install@v3"
4040
- name: "PHPCS"
@@ -49,21 +49,16 @@ jobs:
4949
matrix:
5050
experimental: [false]
5151
php-version:
52-
- "7.4"
52+
- "8.1"
53+
- "8.2"
5354
drupal:
54-
- "^9.0"
55+
- "^10"
5556
include:
56-
- php-version: "8.0"
57+
- php-version: "7.4"
5758
drupal: "^9.0"
5859
experimental: false
59-
- php-version: "8.1"
60-
drupal: "^10.0"
61-
experimental: false
62-
- php-version: "8.1"
63-
drupal: "~10.1.0"
64-
experimental: false
65-
- php-version: "8.2"
66-
drupal: "^10.0"
60+
- php-version: "8.0"
61+
drupal: "^9.0"
6762
experimental: false
6863
- php-version: "8.2"
6964
drupal: "11.x-dev"
@@ -81,11 +76,11 @@ jobs:
8176
php-version: "${{ matrix.php-version }}"
8277
tools: composer:v2
8378
extensions: dom, curl, libxml, mbstring, zip, pdo, mysql, pdo_mysql, gd
84-
- name: "Upgrade to drupal/core:${{ matrix.drupal }}"
79+
- name: "Set drupal/core to ${{ matrix.drupal }}"
8580
run: "composer require drupal/core-recommended:${{ matrix.drupal }} --with-all-dependencies --dev --no-update"
86-
if: ${{ matrix.drupal == '^10.0' || matrix.drupal == '11.x-dev' }}
8781
- name: "Add phpspec/prophecy-phpunit"
8882
run: "composer require phpspec/prophecy-phpunit:^2 --dev --no-update"
83+
if: ${{ matrix.drupal == '^9.0' }}
8984
- name: "Install dependencies"
9085
uses: "ramsey/composer-install@v3"
9186
- name: "PHPUnit"
@@ -102,16 +97,14 @@ jobs:
10297
matrix:
10398
experimental: [false]
10499
php-version:
105-
- "7.4"
100+
- "8.1"
101+
- "8.2"
106102
drupal:
107-
- "^9.0"
103+
- "^10"
108104
include:
109105
- php-version: "8.0"
110106
drupal: "^9.0"
111107
experimental: false
112-
- php-version: "8.1"
113-
drupal: "^10.0"
114-
experimental: false
115108
- php-version: "8.2"
116109
drupal: "11.x-dev"
117110
experimental: true
@@ -183,12 +176,13 @@ jobs:
183176
matrix:
184177
experimental: [false]
185178
php-version:
186-
- "7.4"
179+
- "8.1"
180+
- "8.2"
187181
drupal:
188-
- "^9.0"
182+
- "^10"
189183
include:
190-
- php-version: "8.1"
191-
drupal: "^10.0"
184+
- php-version: "8.0"
185+
drupal: "^9.0"
192186
experimental: false
193187
- php-version: "8.2"
194188
drupal: "11.x-dev"

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"require-dev": {
2121
"behat/mink": "^1.8",
2222
"composer/installers": "^1.9",
23-
"drupal/core-recommended": "^9.0",
23+
"drupal/core-recommended": "^10",
2424
"drush/drush": "^10.0 || ^11 || ^12",
2525
"phpstan/extension-installer": "^1.1",
2626
"phpstan/phpstan-strict-rules": "^1.0",

0 commit comments

Comments
 (0)