Commit 8f0e4973 authored by Marco Pivetta's avatar Marco Pivetta Committed by GitHub

Merge pull request #2590 from railto/master

Removes support for PHP 5.x
parents b551fcb2 092edc02
...@@ -8,7 +8,6 @@ cache: ...@@ -8,7 +8,6 @@ cache:
- $HOME/.composer/cache - $HOME/.composer/cache
php: php:
- 5.6
- 7.0 - 7.0
- 7.1 - 7.1
- nightly - nightly
...@@ -21,10 +20,6 @@ env: ...@@ -21,10 +20,6 @@ env:
matrix: matrix:
fast_finish: true fast_finish: true
include: include:
- php: 5.6
env: DB=mariadb MARIADB_VERSION=10.0
addons:
mariadb: 10.0
- php: 7.0 - php: 7.0
env: DB=mariadb MARIADB_VERSION=10.0 env: DB=mariadb MARIADB_VERSION=10.0
addons: addons:
...@@ -45,10 +40,6 @@ matrix: ...@@ -45,10 +40,6 @@ matrix:
mariadb: 10.0 mariadb: 10.0
env: DB=mariadb MARIADB_VERSION=10.0 env: DB=mariadb MARIADB_VERSION=10.0
- php: 5.6
env: DB=mariadb MARIADB_VERSION=10.1
addons:
mariadb: 10.1
- php: 7.0 - php: 7.0
env: DB=mariadb MARIADB_VERSION=10.1 env: DB=mariadb MARIADB_VERSION=10.1
addons: addons:
...@@ -69,12 +60,6 @@ matrix: ...@@ -69,12 +60,6 @@ matrix:
mariadb: 10.1 mariadb: 10.1
env: DB=mariadb MARIADB_VERSION=10.1 env: DB=mariadb MARIADB_VERSION=10.1
- php: 5.6
addons:
postgresql: "9.2"
services:
- postgresql
env: DB=pgsql POSTGRESQL_VERSION=9.2
- php: 7.0 - php: 7.0
addons: addons:
postgresql: "9.2" postgresql: "9.2"
...@@ -94,12 +79,6 @@ matrix: ...@@ -94,12 +79,6 @@ matrix:
- postgresql - postgresql
env: DB=pgsql POSTGRESQL_VERSION=9.2 env: DB=pgsql POSTGRESQL_VERSION=9.2
- php: 5.6
addons:
postgresql: "9.3"
services:
- postgresql
env: DB=pgsql POSTGRESQL_VERSION=9.3
- php: 7.0 - php: 7.0
addons: addons:
postgresql: "9.3" postgresql: "9.3"
...@@ -119,12 +98,6 @@ matrix: ...@@ -119,12 +98,6 @@ matrix:
- postgresql - postgresql
env: DB=pgsql POSTGRESQL_VERSION=9.3 env: DB=pgsql POSTGRESQL_VERSION=9.3
- php: 5.6
addons:
postgresql: "9.4"
services:
- postgresql
env: DB=pgsql POSTGRESQL_VERSION=9.4
- php: 7.0 - php: 7.0
addons: addons:
postgresql: "9.4" postgresql: "9.4"
...@@ -144,15 +117,6 @@ matrix: ...@@ -144,15 +117,6 @@ matrix:
- postgresql - postgresql
env: DB=pgsql POSTGRESQL_VERSION=9.4 env: DB=pgsql POSTGRESQL_VERSION=9.4
- php: 5.6
sudo: true
dist: trusty
group: edge # until the next update
addons:
postgresql: "9.5"
services:
- postgresql
env: DB=pgsql POSTGRESQL_VERSION=9.5
- php: 7.0 - php: 7.0
sudo: true sudo: true
dist: trusty dist: trusty
...@@ -251,7 +215,6 @@ matrix: ...@@ -251,7 +215,6 @@ matrix:
allow_failures: allow_failures:
- php: hhvm - php: hhvm
- php: nightly - php: nightly
- php: 5.6
env: DB=pgsql POSTGRESQL_VERSION=9.5 env: DB=pgsql POSTGRESQL_VERSION=9.5
- php: 7.0 - php: 7.0
env: DB=pgsql POSTGRESQL_VERSION=9.5 env: DB=pgsql POSTGRESQL_VERSION=9.5
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
{"name": "Jonathan Wage", "email": "jonwage@gmail.com"} {"name": "Jonathan Wage", "email": "jonwage@gmail.com"}
], ],
"require": { "require": {
"php": "^5.6 || ^7.0", "php": "^7.0",
"doctrine/common": "^2.7.1" "doctrine/common": "^2.7.1"
}, },
"require-dev": { "require-dev": {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment