Skip to content

Commit

Permalink
DevKit updates for 4.x branch (#1021)
Browse files Browse the repository at this point in the history
* DevKit updates

* Bump dep

Co-authored-by: Vincent Langlet <vincentlanglet@hotmail.fr>
  • Loading branch information
SonataCI and VincentLanglet authored Feb 19, 2022
1 parent 32bfb63 commit 38db04e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ jobs:
strategy:
matrix:
php-version:
- '7.3'
- '7.4'
- '8.0'
- '8.1'
Expand All @@ -36,7 +35,7 @@ jobs:
symfony-require: ['']
variant: [normal]
include:
- php-version: '7.3'
- php-version: '7.4'
dependencies: lowest
allowed-to-fail: false
variant: normal
Expand Down
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
],
"homepage": "https://docs.sonata-project.org/projects/SonataBlockBundle",
"require": {
"php": "^7.3 || ^8.0",
"php": "^7.4 || ^8.0",
"doctrine/collections": "^1.6",
"doctrine/common": "^2.7.1 || ^3.0",
"psr/cache": "^1.0 || ^2.0 || ^3.0",
Expand Down Expand Up @@ -51,7 +51,7 @@
"phpstan/phpstan-phpunit": "^1.0",
"phpstan/phpstan-strict-rules": "^1.0",
"phpstan/phpstan-symfony": "^1.0",
"phpunit/phpunit": "^9.5",
"phpunit/phpunit": "^9.5.13",
"psalm/plugin-phpunit": "^0.16",
"psalm/plugin-symfony": "^3.0",
"sonata-project/doctrine-extensions": "^1.10.1",
Expand All @@ -62,6 +62,7 @@
"vimeo/psalm": "^4.1"
},
"conflict": {
"doctrine/annotations": "<1.7",
"knplabs/knp-menu-bundle": "<3.0"
},
"suggest": {
Expand Down

0 comments on commit 38db04e

Please sign in to comment.