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

Remove EOL PHP 5.4 from `.travis.yml` and `composer.json` - Fixes #5862
doctrine · Jun 8, 2016 · 9b90226 · 9b90226
2 parents 3bc61d5 + 650d49e
commit 9b90226
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git 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:

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