Skip to content

Commit 2a27134

Browse files
committed
Merge branch '2.1' of github.com:php-tmdb/api into 2.1
2 parents b0725fb + 8d7edb2 commit 2a27134

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ matrix:
5454
env: [SF_EVT_DISPATCHER_VERSION="3.2.*", SF_OPT_RESOLVER_VERSION="3.2.*"]
5555
- php: 7.1
5656
env: [SF_EVT_DISPATCHER_VERSION="^3.3", SF_OPT_RESOLVER_VERSION="^3.3"]
57+
- php: 7.1
58+
env: [SF_EVT_DISPATCHER_VERSION="^4.0", SF_OPT_RESOLVER_VERSION="^4.0"]
5759

5860
- php: hhvm
5961
env: [SF_EVT_DISPATCHER_VERSION="2.7.*", SF_OPT_RESOLVER_VERSION="2.7.*"]
@@ -67,6 +69,8 @@ matrix:
6769
env: [SF_EVT_DISPATCHER_VERSION="3.2.*", SF_OPT_RESOLVER_VERSION="3.2.*"]
6870
- php: hhvm
6971
env: [SF_EVT_DISPATCHER_VERSION="^3.3", SF_OPT_RESOLVER_VERSION="^3.3"]
72+
- php: hhvm
73+
env: [SF_EVT_DISPATCHER_VERSION="^4.0", SF_OPT_RESOLVER_VERSION="^4.0"]
7074

7175
allow_failures:
7276
- php: nightly

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
"require": {
1616
"php": ">=5.6.0",
1717
"ext-curl": "*",
18-
"symfony/event-dispatcher": ">=2.4,<4",
19-
"symfony/options-resolver": ">=2.6,<4",
18+
"symfony/event-dispatcher": ">=2.4,<5",
19+
"symfony/options-resolver": ">=2.6,<5",
2020
"guzzlehttp/guzzle": "~6.0",
2121
"psr/log": "~1.0",
2222
"doctrine/cache": "^1.6",
23-
"kevinrob/guzzle-cache-middleware": "^1.2",
23+
"kevinrob/guzzle-cache-middleware": "^1.2 || ^2.0",
2424
"rtheunissen/guzzle-log-middleware": "^0.4.0"
2525
},
2626
"require-dev": {

0 commit comments

Comments
 (0)