Skip to content

Commit

Permalink
Updated the bundle to use http-cache 2.5 (#484)
Browse files Browse the repository at this point in the history
* Updated the bundle to use http-cache 2.5
* Added conflict with monolog-bridge
* Require at least symfony 3.4.4 components
  • Loading branch information
Toflar authored and dbu committed Oct 1, 2018
1 parent 19e8057 commit 911bce4
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 20 deletions.
5 changes: 1 addition & 4 deletions .travis.yml
Expand Up @@ -45,10 +45,7 @@ matrix:
- COVERAGE=true
- DOCCHECK=true

# Test LTS versions. This makes sure we do not use Symfony packages with version greater
# than 2 or 3 respectively. Read more at https://github.com/symfony/lts
- php: 7.2
env: DEPENDENCIES="symfony/lts:^2"
# Test LTS versions. Read more at https://github.com/symfony/lts
- php: 7.2
env: DEPENDENCIES="symfony/lts:^3"

Expand Down
34 changes: 18 additions & 16 deletions composer.json
Expand Up @@ -22,27 +22,28 @@
],
"require": {
"php": "^7.1",
"friendsofsymfony/http-cache": "^2.3",
"symfony/framework-bundle": "^2.8.18||^3.3||^4.0",
"symfony/http-foundation": "^2.8.18.13||^3.3||^4.0"
"friendsofsymfony/http-cache": "^2.5",
"symfony/framework-bundle": "^3.4.4 || ^4.0",
"symfony/http-foundation": "^3.4.4 || ^4.0",
"symfony/http-kernel": "^3.4.4 || ^4.0"
},
"require-dev": {
"php-http/guzzle6-adapter": "^1.0",
"php-http/message": "^1.0",
"mockery/mockery": "^1.0",
"monolog/monolog": "*",
"sensio/framework-extra-bundle": "^3.0",
"symfony/browser-kit": "^2.8.18||^3.3||^4.0",
"symfony/console": "^2.8.18||^3.3||^4.0",
"symfony/finder": "^2.8.18||^3.3||^4.0",
"symfony/phpunit-bridge": "^3.3||^4.0",
"symfony/security-bundle": "^2.8.18||^3.3||^4.0",
"symfony/twig-bundle": "^2.8.18||^3.3||^4.0",
"symfony/yaml": "^2.8.18||^3.3||^4.0",
"symfony/css-selector": "^2.8.18||^3.3||^4.0",
"symfony/expression-language": "^2.8.18||^3.3||^4.0",
"symfony/monolog-bundle": "^2.8.18||^3.3||^4.0",
"symfony/routing": "^2.8.18||^3.3||^4.0",
"symfony/browser-kit": "^3.4.4 || ^4.0",
"symfony/console": "^3.4.4 || ^4.0",
"symfony/finder": "^3.4.4 || ^4.0",
"symfony/phpunit-bridge": "^3.4.4 || ^4.0",
"symfony/security-bundle": "^3.4.4 || ^4.0",
"symfony/twig-bundle": "^3.4.4 || ^4.0",
"symfony/yaml": "^3.4.4 || ^4.0",
"symfony/css-selector": "^3.4.4 || ^4.0",
"symfony/expression-language": "^3.4.4 || ^4.0",
"symfony/monolog-bundle": "^3.0",
"symfony/routing": "^3.4.4 || ^4.0",
"matthiasnoback/symfony-dependency-injection-test": "^2.3",
"sebastian/exporter": "^2.0"
},
Expand All @@ -52,7 +53,8 @@
"symfony/console": "To send invalidation requests from the command line"
},
"conflict": {
"twig/twig": "<1.12.0"
"twig/twig": "<1.12.0",
"symfony/monolog-bridge": "<3.4.4"
},
"autoload": {
"psr-4": {
Expand All @@ -69,7 +71,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "2.4.x-dev"
"dev-master": "2.5.x-dev"
}
}
}

0 comments on commit 911bce4

Please sign in to comment.