1
0
mirror of synced 2025-02-03 05:49:25 +03:00

Merge pull request #5863 from tPl0ch/feature-drop-54

Remove EOL PHP 5.4 from `.travis.yml` and `composer.json` - Fixes #5862
This commit is contained in:
Marco Pivetta 2016-06-08 12:36:21 +02:00
commit 9b902263d5
2 changed files with 1 additions and 10 deletions

View File

@ -1,7 +1,6 @@
language: php language: php
php: php:
- 5.4
- 5.5 - 5.5
- 5.6 - 5.6
- 7.0 - 7.0
@ -28,10 +27,6 @@ after_script:
matrix: matrix:
include: include:
- php: 5.4
env: DB=mariadb
addons:
mariadb: 5.5
- php: 5.5 - php: 5.5
env: DB=mariadb env: DB=mariadb
addons: addons:
@ -49,10 +44,6 @@ matrix:
addons: addons:
mariadb: 5.5 mariadb: 5.5
- php: 5.4
env: DB=mariadb
addons:
mariadb: 10.1
- php: 5.5 - php: 5.5
env: DB=mariadb env: DB=mariadb
addons: addons:

View File

@ -14,7 +14,7 @@
], ],
"minimum-stability": "dev", "minimum-stability": "dev",
"require": { "require": {
"php": ">=5.4", "php": "^5.5 || ^7.0",
"ext-pdo": "*", "ext-pdo": "*",
"doctrine/collections": "~1.2", "doctrine/collections": "~1.2",
"doctrine/dbal": ">=2.5-dev,<2.7-dev", "doctrine/dbal": ">=2.5-dev,<2.7-dev",