Skip to content

Commit 911bce4

Browse files
Toflardbu
authored andcommitted
Updated the bundle to use http-cache 2.5 (#484)
* Updated the bundle to use http-cache 2.5 * Added conflict with monolog-bridge * Require at least symfony 3.4.4 components
1 parent 19e8057 commit 911bce4

File tree

2 files changed

+19
-20
lines changed

2 files changed

+19
-20
lines changed

.travis.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,7 @@ matrix:
4545
- COVERAGE=true
4646
- DOCCHECK=true
4747

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

composer.json

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,28 @@
2222
],
2323
"require": {
2424
"php": "^7.1",
25-
"friendsofsymfony/http-cache": "^2.3",
26-
"symfony/framework-bundle": "^2.8.18||^3.3||^4.0",
27-
"symfony/http-foundation": "^2.8.18.13||^3.3||^4.0"
25+
"friendsofsymfony/http-cache": "^2.5",
26+
"symfony/framework-bundle": "^3.4.4 || ^4.0",
27+
"symfony/http-foundation": "^3.4.4 || ^4.0",
28+
"symfony/http-kernel": "^3.4.4 || ^4.0"
2829
},
2930
"require-dev": {
3031
"php-http/guzzle6-adapter": "^1.0",
3132
"php-http/message": "^1.0",
3233
"mockery/mockery": "^1.0",
3334
"monolog/monolog": "*",
3435
"sensio/framework-extra-bundle": "^3.0",
35-
"symfony/browser-kit": "^2.8.18||^3.3||^4.0",
36-
"symfony/console": "^2.8.18||^3.3||^4.0",
37-
"symfony/finder": "^2.8.18||^3.3||^4.0",
38-
"symfony/phpunit-bridge": "^3.3||^4.0",
39-
"symfony/security-bundle": "^2.8.18||^3.3||^4.0",
40-
"symfony/twig-bundle": "^2.8.18||^3.3||^4.0",
41-
"symfony/yaml": "^2.8.18||^3.3||^4.0",
42-
"symfony/css-selector": "^2.8.18||^3.3||^4.0",
43-
"symfony/expression-language": "^2.8.18||^3.3||^4.0",
44-
"symfony/monolog-bundle": "^2.8.18||^3.3||^4.0",
45-
"symfony/routing": "^2.8.18||^3.3||^4.0",
36+
"symfony/browser-kit": "^3.4.4 || ^4.0",
37+
"symfony/console": "^3.4.4 || ^4.0",
38+
"symfony/finder": "^3.4.4 || ^4.0",
39+
"symfony/phpunit-bridge": "^3.4.4 || ^4.0",
40+
"symfony/security-bundle": "^3.4.4 || ^4.0",
41+
"symfony/twig-bundle": "^3.4.4 || ^4.0",
42+
"symfony/yaml": "^3.4.4 || ^4.0",
43+
"symfony/css-selector": "^3.4.4 || ^4.0",
44+
"symfony/expression-language": "^3.4.4 || ^4.0",
45+
"symfony/monolog-bundle": "^3.0",
46+
"symfony/routing": "^3.4.4 || ^4.0",
4647
"matthiasnoback/symfony-dependency-injection-test": "^2.3",
4748
"sebastian/exporter": "^2.0"
4849
},
@@ -52,7 +53,8 @@
5253
"symfony/console": "To send invalidation requests from the command line"
5354
},
5455
"conflict": {
55-
"twig/twig": "<1.12.0"
56+
"twig/twig": "<1.12.0",
57+
"symfony/monolog-bridge": "<3.4.4"
5658
},
5759
"autoload": {
5860
"psr-4": {
@@ -69,7 +71,7 @@
6971
},
7072
"extra": {
7173
"branch-alias": {
72-
"dev-master": "2.4.x-dev"
74+
"dev-master": "2.5.x-dev"
7375
}
7476
}
7577
}

0 commit comments

Comments
 (0)