Skip to content

Commit 42d3420

Browse files
author
Gianluca Arbezzano
committed
Merge pull request #458 from doctrine/feature/drop_php5.6
Drop PHP 5.4 and update TravisCI build
2 parents a754eb9 + 79d7ced commit 42d3420

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

.travis.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
language: php
22

33
php:
4-
- 5.4
54
- 5.5
65
- 5.6
76
- 7
87
- hhvm
98

109
matrix:
1110
allow_failures:
12-
- php: 7
1311
- php: hhvm
1412

1513
before_script:
16-
- composer update --prefer-source
14+
- composer update --prefer-dist
1715

1816
script:
1917
- ./vendor/bin/phpunit --coverage-clover ./build/clover.xml

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
}
3333
],
3434
"require": {
35-
"php": ">=5.4",
35+
"php": "^5.5 || ^7.0",
3636
"doctrine/doctrine-module": "~1.0",
3737
"doctrine/orm": ">=2.5,<2.7",
3838
"doctrine/dbal": ">=2.4,<2.7",

0 commit comments

Comments
 (0)