Skip to content

Commit

Permalink
[5.0.x] compatibility with Symfony components ^6 (#489)
Browse files Browse the repository at this point in the history
* allow symfony/cache ^6 (#415)

(cherry picked from commit 652440a)

* Allow symfony/expression-language v6 (#443)

Allow symfony/expression-language v6 and replaces | with || (in composer.json file), | is not documented in composer docs but is allowed for BC

(cherry picked from commit 88bc035)

* Drop ad-hoc for install  `ecodev/graphql-upload` with PHP 8. Full support for PHP 8.0 are introduced in upstream

Co-authored-by: Stéphane <[email protected]>
Co-authored-by: Faizan Akram Dar <[email protected]>
  • Loading branch information
3 people committed Jun 15, 2022
1 parent 21bc850 commit 84b6e13
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/continuous_integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,6 @@ jobs:
- name: "Install dependencies with composer"
run: |
composer update ${{ matrix.install-args }} --no-interaction --no-progress --prefer-dist
if: ${{ matrix.php-version != '8.0' }}

- name: "Install dependencies with composer. Ignoring platform reqs to bypass a problem with ecodev/graphql-upload available only with latest Webonyx on PHP8."
run: |
composer update ${{ matrix.install-args }} --no-interaction --no-progress --prefer-dist --ignore-platform-reqs
if: ${{ matrix.php-version == '8.0' }}
- name: "Run tests with phpunit/phpunit"
run: "vendor/bin/phpunit"
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
"psr/http-server-handler": "^1",
"psr/http-server-middleware": "^1",
"psr/simple-cache": "^1.0.1",
"symfony/cache": "^4.3 | ^5",
"symfony/expression-language": "^4 | ^5",
"symfony/cache": "^4.3 || ^5 || ^6",
"symfony/expression-language": "^4 || ^5 || ^6",
"thecodingmachine/cache-utils": "^1",
"thecodingmachine/class-explorer": "^1.1.0",
"webmozart/assert": "^1.10",
Expand Down

0 comments on commit 84b6e13

Please sign in to comment.