Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/1.24.x' into bc-fix-redis-check
Browse files Browse the repository at this point in the history
Signed-off-by: Tim Visser <[email protected]>
  • Loading branch information
Sacrome committed Jan 17, 2023
2 parents ca849a7 + 9e00fc7 commit fddceab
Show file tree
Hide file tree
Showing 9 changed files with 453 additions and 434 deletions.
16 changes: 8 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"config": {
"sort-packages": true,
"platform": {
"php": "7.4.99"
"php": "8.0.99"
},
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true
Expand All @@ -33,20 +33,20 @@
}
},
"require": {
"php": "^7.4 || ~8.0.0 || ~8.1.0",
"php": "~8.0.0 || ~8.1.0 || ~8.2.0",
"enlightn/security-checker": "^1.10"
},
"require-dev": {
"doctrine/migrations": "^2.0 || ^3.0",
"doctrine/migrations": "^2.0 || ^3.5.2",
"guzzlehttp/guzzle": "^7.5.0",
"laminas/laminas-coding-standard": "~2.4.0",
"laminas/laminas-loader": "^2.0",
"laminas/laminas-coding-standard": "~2.5.0",
"laminas/laminas-loader": "^2.9",
"mikey179/vfsstream": "^1.6.11",
"php-amqplib/php-amqplib": "^2.0 || ^3.0",
"php-amqplib/php-amqplib": "^2.0 || ^3.4",
"phpunit/phpunit": "^9.5.26",
"psalm/plugin-phpunit": "^0.18.0",
"psalm/plugin-phpunit": "^0.18.3",
"predis/predis": "^2.0.3",
"symfony/yaml": "^2.7 || ^3.0 || ^4.0 || ^5.0 || ^6.0",
"symfony/yaml": "^2.7 || ^3.0 || ^4.0 || ^5.0 || ^6.0.14",
"vimeo/psalm": "^4.29.0"
},
"conflict": {
Expand Down
Loading

0 comments on commit fddceab

Please sign in to comment.