Skip to content

Commit

Permalink
Merge 3.x into 4.x
Browse files Browse the repository at this point in the history
  • Loading branch information
SonataCI committed Mar 14, 2023
2 parents eb6a535 + cea96d6 commit a042042
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
#
# It's auto-generated by sonata-project/dev-kit package.

github: [VincentLanglet, greg0ire, core23, jordisala1991]
github: [VincentLanglet, greg0ire, jordisala1991, core23]
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Install PHP with extensions
uses: shivammathur/setup-php@v2
with:
php-version: '8.1'
php-version: '8.2'
coverage: none
tools: composer:v2
extensions: mongodb
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"php": "^8.0"
},
"require-dev": {
"doctrine/annotations": "^1.13",
"doctrine/annotations": "^1.13 || ^2.0",
"doctrine/dbal": "^3.1",
"doctrine/mongodb-odm": "^2.0",
"doctrine/orm": "^2.9",
Expand All @@ -39,8 +39,8 @@
"phpstan/phpstan-strict-rules": "^1.0",
"phpstan/phpstan-symfony": "^1.0",
"phpunit/phpunit": "^9.5",
"psalm/plugin-phpunit": "^0.16",
"psalm/plugin-symfony": "^3.0",
"psalm/plugin-phpunit": "^0.17",
"psalm/plugin-symfony": "^4.0",
"rector/rector": "^0.15",
"symfony/config": "^5.4 || ^6.0",
"symfony/dependency-injection": "^5.4 || ^6.0",
Expand Down

0 comments on commit a042042

Please sign in to comment.