Skip to content

Commit

Permalink
Merge pull request #1579 from bolt/hotfix/allow-both-sf-4.4-and-5.1-f…
Browse files Browse the repository at this point in the history
…or-now

Allow both Symfony 4.4 and 5.1 for now
  • Loading branch information
bobdenotter authored Jun 29, 2020
2 parents e82a52e + b58b1d1 commit 768ff38
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 23 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ Released: 2020-06-29
### ⚙️ Code Quality / Developer Experience

- Better feedback on bolt:setup errors (I-Valchev, [#1551](https://github.com/bolt/core/pull/1551))
- Allow both Symfony 4.4 and 5.1 for now (bobdenotter, [#1578](https://github.com/bolt/core/pull/1578))

## 4.0.0-rc.26

Expand Down
46 changes: 23 additions & 23 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,32 +38,32 @@
"sensiolabs/security-checker": "^6.0",
"siriusphp/upload": "^3.0.1",
"squirrelphp/twig-php-syntax": "^1.5",
"symfony/asset": "^5.1",
"symfony/console": "^5.1",
"symfony/debug-bundle": "^5.1",
"symfony/dependency-injection": "^5.1",
"symfony/dotenv": "^5.1",
"symfony/expression-language": "^5.1",
"symfony/asset": "^4.4 | ^5.1",
"symfony/console": "^4.4 | ^5.1",
"symfony/debug-bundle": "^4.4 | ^5.1",
"symfony/dependency-injection": "^4.4 | ^5.1",
"symfony/dotenv": "^4.4 | ^5.1",
"symfony/expression-language": "^4.4 | ^5.1",
"symfony/flex": "^1.6",
"symfony/form": "^5.1",
"symfony/framework-bundle": "^5.1",
"symfony/http-client": "^5.1",
"symfony/mailer": "^5.1",
"symfony/form": "^4.4 | ^5.1",
"symfony/framework-bundle": "^4.4 | ^5.1",
"symfony/http-client": "^4.4 | ^5.1",
"symfony/mailer": "^4.4 | ^5.1",
"symfony/maker-bundle": "^1.14",
"symfony/monolog-bridge": "^5.1",
"symfony/monolog-bridge": "^4.4 | ^5.1",
"symfony/monolog-bundle": "^3.5",
"symfony/polyfill-php72": "^1.13",
"symfony/security-bundle": "^5.1",
"symfony/serializer": "^5.1",
"symfony/stopwatch": "^5.1",
"symfony/translation": "^5.1",
"symfony/twig-bundle": "^5.1",
"symfony/validator": "^5.1",
"symfony/var-dumper": "^5.1",
"symfony/web-profiler-bundle": "^5.1",
"symfony/security-bundle": "^4.4 | ^5.1",
"symfony/serializer": "^4.4 | ^5.1",
"symfony/stopwatch": "^4.4 | ^5.1",
"symfony/translation": "^4.4 | ^5.1",
"symfony/twig-bundle": "^4.4 | ^5.1",
"symfony/validator": "^4.4 | ^5.1",
"symfony/var-dumper": "^4.4 | ^5.1",
"symfony/web-profiler-bundle": "^4.4 | ^5.1",
"symfony/web-server-bundle": "^4.4",
"symfony/webpack-encore-bundle": "^1.7",
"symfony/yaml": "^5.1",
"symfony/yaml": "^4.4 | ^5.1",
"tightenco/collect": "^7.4",
"twig/twig": "^3.0",
"ua-parser/uap-php": "^3.9",
Expand Down Expand Up @@ -101,8 +101,8 @@
"phpunit/phpunit": "^7.5",
"roave/security-advisories": "dev-master@dev",
"se/selenium-server-standalone": "^3.141",
"symfony/browser-kit": "^5.1",
"symfony/css-selector": "^5.1",
"symfony/browser-kit": "^4.4 | ^5.1",
"symfony/css-selector": "^4.4 | ^5.1",
"symplify/easy-coding-standard": "^8.0",
"vaimo/binary-chromedriver": "^5.0"
},
Expand All @@ -115,7 +115,7 @@
"extra": {
"symfony": {
"allow-contrib": true,
"require": "^5.1"
"require": "^4.4 | ^5.1"
}
},
"autoload": {
Expand Down

0 comments on commit 768ff38

Please sign in to comment.