Skip to content

Commit 946cccc

Browse files
authored
Backport non src/Commands changes from 14.x (#6407)
1 parent 5b43242 commit 946cccc

File tree

109 files changed

+2222
-333
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+2222
-333
lines changed

.circleci/config.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ defaults: &defaults
99
PHPUNIT_ARGS: ""
1010
PHP_SENDMAIL_PATH: /dev/null
1111
# https://drupal.slack.com/archives/CGKLP028K/p1702031434143329?thread_ts=1702024395.751479&cid=CGKLP028K
12-
WODBY_TAG: 8.2
12+
WODBY_TAG: 8.3
13+
WODBY_LATEST: 8.4
1314
# These are not working. We disable the mode in .docker/zz-php.ini
1415
PHP_EXTENSIONS_DISABLE: xdebug
1516
PHP_XDEBUG_MODE: off
@@ -39,7 +40,7 @@ executors:
3940
- "UNISH_DB_URL=sqlite://localhost/:memory:?module=sqlite"
4041
sqlite-highest:
4142
docker:
42-
- image: wodby/php:latest
43+
- image: wodby/php:$WODBY_LATEST
4344
environment:
4445
- "UNISH_DB_URL=sqlite://localhost/:memory:?module=sqlite"
4546
mysql-lowest:
@@ -51,7 +52,7 @@ executors:
5152
- image: cimg/mysql:5.7.38
5253
mysql-highest:
5354
docker:
54-
- image: wodby/php:latest
55+
- image: wodby/php:$WODBY_LATEST
5556
environment:
5657
- MYSQL_HOST=127.0.0.1
5758
- UNISH_DB_URL=mysql://root:@127.0.0.1/unish_dev?module=mysql
@@ -69,7 +70,7 @@ executors:
6970
POSTGRES_USER: unish
7071
postgres-highest:
7172
docker:
72-
- image: wodby/php:latest
73+
- image: wodby/php:$WODBY_LATEST
7374
environment:
7475
- UNISH_DB_URL=pgsql://unish:[email protected]/unish_dev?module=pgsql
7576
- image: wodby/postgres:latest
@@ -87,7 +88,7 @@ jobs:
8788
code_style:
8889
<<: *defaults
8990
docker:
90-
- image: wodby/php:8.2
91+
- image: wodby/php:$WODBY_LATEST
9192
steps:
9293
- checkout
9394
- run: cp .docker/zz-php.ini /usr/local/etc/php/conf.d/
@@ -136,9 +137,7 @@ jobs:
136137
and:
137138
- equal: [ lowest, << parameters.release >> ]
138139
steps:
139-
- run: composer -n config platform.php --unset
140-
- run: composer -n require --dev drupal/core-recommended:11.x-dev --no-update
141-
- run: composer -n update --with-all-dependencies
140+
- run: $HOME/drush/.circleci/highest.sh
142141
- run: composer -n unit -- --log-junit /tmp/results/unit/junit.xml
143142
- run: composer -n << parameters.suite >> -- --log-junit /tmp/results/<< parameters.suite >>/junit.xml
144143

.circleci/highest.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/usr/bin/env bash
2+
3+
composer -n config platform.php --unset
4+
composer -n require --dev drupal/core-recommended:11.x-dev --no-update
5+
composer -n update --with-all-dependencies

.ddev/web-build/Dockerfile

Lines changed: 0 additions & 11 deletions
This file was deleted.

appveyor.yml

Lines changed: 0 additions & 80 deletions
This file was deleted.

composer.json

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,20 @@
3131
}
3232
},
3333
"require": {
34-
"php": ">=8.2",
34+
"php": ">=8.3",
3535
"ext-dom": "*",
3636
"composer-runtime-api": "^2.2",
3737
"chi-teck/drupal-code-generator": "^3.6 || ^4@alpha",
3838
"composer/semver": "^1.4 || ^3",
39-
"consolidation/annotated-command": "^4.9.2",
40-
"consolidation/config": "^2.1.2 || ^3",
39+
"consolidation/annotated-command": "^4.10.2",
40+
"consolidation/config": "^2.1.2 || ^3.1.1",
4141
"consolidation/filter-via-dot-access-data": "^2.0.2",
42-
"consolidation/output-formatters": "^4.3.2",
43-
"consolidation/robo": "^4.0.6 || ^5",
44-
"consolidation/site-alias": "^4",
45-
"consolidation/site-process": "^5.2.0",
42+
"consolidation/output-formatters": "^4.6.1",
43+
"consolidation/robo": "^4.0.6 || ^5.1.0",
44+
"consolidation/site-alias": "^4.1.1",
45+
"consolidation/site-process": "^5.4.2",
4646
"dflydev/dot-access-data": "^3.0.2",
47-
"grasmash/yaml-cli": "^3.1",
47+
"grasmash/yaml-cli": "^3.2",
4848
"guzzlehttp/guzzle": "^7.0",
4949
"laravel/prompts": "^0.3.5",
5050
"league/container": "^4.2",
@@ -58,16 +58,16 @@
5858
"require-dev": {
5959
"composer/installers": "^2",
6060
"cweagans/composer-patches": "~1.7.3",
61-
"drupal/core-recommended": "^10.3.0 || 11.x-dev",
61+
"drupal/core-recommended": "^10.4.0 || 11.x-dev",
6262
"drupal/semver_example": "2.3.0",
6363
"jetbrains/phpstorm-attributes": "^1.0",
64-
"mglaman/phpstan-drupal": "^1.2",
64+
"mglaman/phpstan-drupal": "^2",
6565
"phpunit/phpunit": "^9 || ^10 || ^11",
66-
"rector/rector": "^1",
66+
"rector/rector": "^2",
6767
"squizlabs/php_codesniffer": "^3.7"
6868
},
6969
"conflict": {
70-
"drupal/core": "< 10.2",
70+
"drupal/core": "< 10.4",
7171
"drupal/migrate_run": "*",
7272
"drupal/migrate_tools": "<= 5"
7373
},
@@ -97,7 +97,7 @@
9797
"sort-packages": true,
9898
"process-timeout": 9600,
9999
"platform": {
100-
"php": "8.2"
100+
"php": "8.3"
101101
}
102102
},
103103
"scripts": {
@@ -134,6 +134,7 @@
134134
"sut/profiles/contrib/{$name}": ["type:drupal-profile"],
135135
"sut/themes/contrib/{$name}": ["type:drupal-theme"],
136136
"sut/drush/contrib/{$name}": ["type:drupal-drush"]
137-
}
137+
},
138+
"patches-file": "composer.patches.json"
138139
}
139140
}

composer.patches.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"patches": {
3+
}
4+
}

0 commit comments

Comments
 (0)