Skip to content

Commit 9a09709

Browse files
committed
Merge pull request #1 from php-http/symfony_3
Add Symfony 3 support, test against multiple symfony versions
2 parents 35418e4 + 99ac5d2 commit 9a09709

File tree

3 files changed

+22
-2
lines changed

3 files changed

+22
-2
lines changed

Diff for: .travis.yml

+9-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ php:
1616
env:
1717
global:
1818
- TEST_COMMAND="composer test"
19+
matrix:
20+
- SYMFONY_VERSION=3.0.*
21+
- SYMFONY_VERSION=2.8.*
22+
- SYMFONY_VERSION=2.7.*
1923

2024
branches:
2125
except:
@@ -25,12 +29,16 @@ matrix:
2529
fast_finish: true
2630
include:
2731
- php: 5.4
28-
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
32+
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci" SYMFONY_VERSION=2.7.*
33+
exclude:
34+
- php: 5.4
35+
env: SYMFONY_VERSION=3.0.*
2936

3037
before_install:
3138
- travis_retry composer self-update
3239

3340
install:
41+
- travis_retry composer require symfony/symfony:${SYMFONY_VERSION} --no-update
3442
- travis_retry composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction
3543

3644
script:

Diff for: CHANGELOG.md

+12
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
# Change Log
22

33

4+
## UNRELEASED
5+
6+
### Added
7+
8+
- Support for Symfony 3
9+
- Tests for various Symfony versions
10+
11+
### Removed
12+
13+
- Symfony 2.3 support
14+
15+
416
## 1.0.0 - 2016-05-05
517

618
- Initial release

Diff for: composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
],
1313
"require": {
1414
"php": ">=5.4",
15-
"symfony/stopwatch": "^2.3",
15+
"symfony/stopwatch": "^2.7|^3.0",
1616
"php-http/client-common": "^1.1"
1717
},
1818
"require-dev": {

0 commit comments

Comments
 (0)