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.

Sign up for GitHub

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

Jump to bottom

Drop conflict with symfony/cache >=6 #39

Merged
merged 1 commit into from
Jun 27, 2024
Merged

Drop conflict with symfony/cache >=6 #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,7 @@
]
},
"require-dev": {
"psr/simple-cache": "^1 || ^2 || ^3",
"symfony/event-dispatcher-contracts": "^1 || ^2 || ^3"
},
"conflict": {
"symfony/cache": ">=6"
}
}
10 changes: 0 additions & 10 deletions composer.json.md
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions tests/docker-prepare.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,8 @@ else
fi

cd "$EXT_DIR"
# In the container used for tests there seems to be psr/cache 1 installed somewhere.
# This conflicts with symfony/cache >=6, thus we use version 5 here.
composer require --no-update 'symfony/cache:^5'
composer update --no-progress --prefer-dist --optimize-autoloader --no-dev
composer composer-phpunit -- update --no-progress --prefer-dist
Loading