From 649ff94b387201d0991c989965b0c97eeae7ed90 Mon Sep 17 00:00:00 2001 From: Thomas Ploch Date: Wed, 8 Jun 2016 12:08:50 +0200 Subject: [PATCH 1/3] Remove EOL PHP 5.4 from .travis.yml - Fixes #5862 --- .travis.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7d54f4386..5ecefb6cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: php php: - - 5.4 - 5.5 - 5.6 - 7.0 @@ -28,10 +27,6 @@ after_script: matrix: include: - - php: 5.4 - env: DB=mariadb - addons: - mariadb: 5.5 - php: 5.5 env: DB=mariadb addons: @@ -49,10 +44,6 @@ matrix: addons: mariadb: 5.5 - - php: 5.4 - env: DB=mariadb - addons: - mariadb: 10.1 - php: 5.5 env: DB=mariadb addons: From 68b0060595fe42804cd5648cd60f8ae56907a943 Mon Sep 17 00:00:00 2001 From: Thomas Ploch Date: Wed, 8 Jun 2016 12:11:11 +0200 Subject: [PATCH 2/3] Fixing PHP version constraint in composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index cd1f81ade..1a943b871 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ ], "minimum-stability": "dev", "require": { - "php": ">=5.4", + "php": ">=5.5", "ext-pdo": "*", "doctrine/collections": "~1.2", "doctrine/dbal": ">=2.5-dev,<2.7-dev", From 650d49ee818b3c56d8efc101c11ab2c4f87a9522 Mon Sep 17 00:00:00 2001 From: Thomas Ploch Date: Wed, 8 Jun 2016 12:19:31 +0200 Subject: [PATCH 3/3] Tightened PHP version constraint in composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1a943b871..1313f7b1b 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ ], "minimum-stability": "dev", "require": { - "php": ">=5.5", + "php": "^5.5 || ^7.0", "ext-pdo": "*", "doctrine/collections": "~1.2", "doctrine/dbal": ">=2.5-dev,<2.7-dev",