Skip to content

Commit

Permalink
Update to symfony7 (#5951)
Browse files Browse the repository at this point in the history
  • Loading branch information
larowlan authored Apr 18, 2024
1 parent ca3eef4 commit 5add16e
Show file tree
Hide file tree
Showing 13 changed files with 753 additions and 821 deletions.
25 changes: 19 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ defaults: &defaults
PHPUNIT_ARGS: ""
PHP_SENDMAIL_PATH: /dev/null
# https://drupal.slack.com/archives/CGKLP028K/p1702031434143329?thread_ts=1702024395.751479&cid=CGKLP028K
WODBY_TAG: 8.1-dev-4.40.9
WODBY_TAG: 8.3
# These are not working. We disable the mode in .docker/zz-php.ini
PHP_EXTENSIONS_DISABLE: xdebug
PHP_XDEBUG_MODE: off
Expand All @@ -26,6 +26,16 @@ post_steps: &poststeps
- store_artifacts:
path: /tmp/results

commands:
# https://support.circleci.com/hc/en-us/articles/360046718553-PHP-Composer-Fails-With-Could-not-authenticate-against-github-com
composer-auth:
steps:
# This env var is available to forked PRs as it has no special perms.
- run: |
if [ -n "$GITHUB_PAT" ]; then
composer config --auth github-oauth.github.com $GITHUB_PAT
fi
executors:
mysql-stable:
docker:
Expand Down Expand Up @@ -70,8 +80,9 @@ jobs:
steps:
- checkout
- run: cp .docker/zz-php.ini /usr/local/etc/php/conf.d/
- composer-auth
- run: composer -n validate --no-check-all
- run: composer -n install
- run: composer -n -v install
- run: mkdir -p /tmp/results
- run: composer -n cs -- --report=junit --report-file=/tmp/results/junit.phpcs.xml
- run: vendor/bin/phpstan --error-format=junit > /tmp/results/phpstan.junit.xml
Expand Down Expand Up @@ -102,6 +113,7 @@ jobs:
- run: cp .docker/zz-php.ini /usr/local/etc/php/conf.d/
- run: php -i
- run: mkdir -p /tmp/results
- composer-auth
- when:
condition:
and:
Expand All @@ -114,9 +126,9 @@ jobs:
- equal: [ stable, << parameters.release >> ]
steps:
- run: composer -n config platform.php --unset
- run: composer -n require --dev drupal/core-recommended:11.x-dev --no-update
# - run: composer -n require --dev drupal/core-recommended:11.x-dev --no-update
- run: composer -n update
- run: composer -n require chi-teck/drupal-code-generator:3.x-dev
#- run: composer -n require chi-teck/drupal-code-generator:3.x-dev
- run: composer -n unit -- --log-junit /tmp/results/unit/junit.xml
- run: composer -n << parameters.suite >> -- --log-junit /tmp/results/<< parameters.suite >>/junit.xml

Expand Down Expand Up @@ -150,11 +162,12 @@ workflows:
<<: *poststeps
matrix:
parameters:
dbms: [sqlite, mysql, postgres]
#sqlite removed pending https://github.com/wodby/php/issues/194
dbms: [ mysql, postgres ]
suite: [integration, functional]
release: [stable, highest]
exclude:
# Only run highest test on sqlite. Excluding each suite is unfortunate but needed.
# Only run highest test on mysql. Excluding each suite is unfortunate but needed.
- release: highest
dbms: sqlite
suite: integration
Expand Down
30 changes: 15 additions & 15 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,33 +30,33 @@
}
},
"require": {
"php": ">=8.1",
"php": ">=8.3",
"ext-dom": "*",
"composer-runtime-api": "^2.2",
"chi-teck/drupal-code-generator": "^3.0",
"chi-teck/drupal-code-generator": "4.x-dev",
"composer/semver": "^1.4 || ^3",
"consolidation/annotated-command": "^4.9.2",
"consolidation/config": "^2.1.2",
"consolidation/annotated-command": "^4",
"consolidation/config": "^3",
"consolidation/filter-via-dot-access-data": "^2.0.2",
"consolidation/output-formatters": "^4.3.2",
"consolidation/robo": "^4.0.6",
"consolidation/robo": "^5",
"consolidation/site-alias": "^4",
"consolidation/site-process": "^5.3.0",
"grasmash/yaml-cli": "^3.1",
"consolidation/site-process": "^5",
"grasmash/yaml-cli": "^3",
"guzzlehttp/guzzle": "^7.0",
"laravel/prompts": "^0.1.15",
"league/container": "^4",
"psy/psysh": "~0.11",
"symfony/event-dispatcher": "^6",
"symfony/filesystem": "^6.1",
"symfony/finder": "^6",
"symfony/var-dumper": "^6.0",
"symfony/yaml": "^6.0"
"symfony/event-dispatcher": "^7",
"symfony/filesystem": "^7",
"symfony/finder": "^7",
"symfony/var-dumper": "^7",
"symfony/yaml": "^7"
},
"require-dev": {
"composer/installers": "^2",
"cweagans/composer-patches": "~1.0",
"drupal/core-recommended": "^10.2.4",
"drupal/core-recommended": "11.x-dev",
"drupal/semver_example": "2.3.0",
"jetbrains/phpstorm-attributes": "^1.0",
"mglaman/phpstan-drupal": "^1.2",
Expand All @@ -65,7 +65,7 @@
"squizlabs/php_codesniffer": "^3.7"
},
"conflict": {
"drupal/core": "< 10.1",
"drupal/core": "< 11.x-dev",
"drupal/migrate_run": "*",
"drupal/migrate_tools": "<= 5"
},
Expand Down Expand Up @@ -93,7 +93,7 @@
"sort-packages": true,
"process-timeout": 9600,
"platform": {
"php": "8.1"
"php": "8.3"
}
},
"scripts": {
Expand Down
Loading

0 comments on commit 5add16e

Please sign in to comment.