Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to symfony7 #5951

Merged
merged 22 commits into from
Apr 18, 2024
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion .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 var is unavailable to forked PRs. Maybe implement https://circleci.com/blog/triggering-trusted-ci-jobs-on-untrusted-forks/ or move to Github actions
- 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,6 +80,7 @@ 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: mkdir -p /tmp/results
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 Down
34 changes: 19 additions & 15 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,36 +27,40 @@
"drupal_org": {
"type": "composer",
"url": "https://packages.drupal.org/8"
},
"sf7_yaml-cli": {
"type": "vcs",
"url": "https://github.com/larowlan/yaml-cli"
}
},
"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": "dev-larowlan-symfony7",
"consolidation/site-alias": "^4",
"consolidation/site-process": "^5.3.0",
"grasmash/yaml-cli": "^3.1",
"consolidation/site-process": "^5",
"grasmash/yaml-cli": "dev-symfony7",
"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 +69,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 +97,7 @@
"sort-packages": true,
"process-timeout": 9600,
"platform": {
"php": "8.1"
"php": "8.3"
}
},
"scripts": {
Expand Down
Loading