Skip to content

Commit

Permalink
Merge pull request #2966 from Majkl578/php-7.2
Browse files Browse the repository at this point in the history
Require PHP 7.2, drop <7.2 in Composer & on CI
  • Loading branch information
Ocramius authored Jan 6, 2018
2 parents 7a2e2c6 + fe62d34 commit 4adca54
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 82 deletions.
2 changes: 1 addition & 1 deletion .scrutinizer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ build:
analysis:
environment:
php:
version: 7.1
version: 7.2
cache:
disabled: false
directories:
Expand Down
82 changes: 2 additions & 80 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ cache:
- $HOME/.composer/cache

php:
- 7.1
- 7.2
- nightly

Expand All @@ -33,12 +32,6 @@ jobs:
- php: nightly

include:
- stage: Test
php: 7.1
env: DB=mysql MYSQL_VERSION=5.7
sudo: required
before_script:
- bash ./tests/travis/install-mysql-5.7.sh
- stage: Test
php: 7.2
env: DB=mysql MYSQL_VERSION=5.7
Expand All @@ -52,12 +45,6 @@ jobs:
before_script:
- bash ./tests/travis/install-mysql-5.7.sh

- stage: Test
php: 7.1
env: DB=mysqli MYSQL_VERSION=5.7
sudo: required
before_script:
- bash ./tests/travis/install-mysql-5.7.sh
- stage: Test
php: 7.2
env: DB=mysqli MYSQL_VERSION=5.7
Expand All @@ -71,11 +58,6 @@ jobs:
before_script:
- bash ./tests/travis/install-mysql-5.7.sh

- stage: Test
php: 7.1
env: DB=mariadb MARIADB_VERSION=10.0
addons:
mariadb: 10.0
- stage: Test
php: 7.2
env: DB=mariadb MARIADB_VERSION=10.0
Expand All @@ -87,11 +69,6 @@ jobs:
addons:
mariadb: 10.0

- stage: Test
php: 7.1
env: DB=mariadb MARIADB_VERSION=10.1
addons:
mariadb: 10.1
- stage: Test
php: 7.2
env: DB=mariadb MARIADB_VERSION=10.1
Expand All @@ -103,11 +80,6 @@ jobs:
addons:
mariadb: 10.1

- stage: Test
php: 7.1
env: DB=mariadb MARIADB_VERSION=10.2
addons:
mariadb: 10.2
- stage: Test
php: 7.2
env: DB=mariadb MARIADB_VERSION=10.2
Expand All @@ -119,11 +91,6 @@ jobs:
addons:
mariadb: 10.2

- stage: Test
php: 7.1
env: DB=mariadb.mysqli MARIADB_VERSION=10.2
addons:
mariadb: 10.2
- stage: Test
php: 7.2
env: DB=mariadb.mysqli MARIADB_VERSION=10.2
Expand All @@ -135,13 +102,6 @@ jobs:
addons:
mariadb: 10.2

- stage: Test
php: 7.1
env: DB=pgsql POSTGRESQL_VERSION=9.2
services:
- postgresql
addons:
postgresql: "9.2"
- stage: Test
php: 7.2
env: DB=pgsql POSTGRESQL_VERSION=9.2
Expand All @@ -157,13 +117,6 @@ jobs:
addons:
postgresql: "9.2"

- stage: Test
php: 7.1
env: DB=pgsql POSTGRESQL_VERSION=9.3
services:
- postgresql
addons:
postgresql: "9.3"
- stage: Test
php: 7.2
env: DB=pgsql POSTGRESQL_VERSION=9.3
Expand All @@ -179,13 +132,6 @@ jobs:
addons:
postgresql: "9.3"

- stage: Test
php: 7.1
env: DB=pgsql POSTGRESQL_VERSION=9.4
services:
- postgresql
addons:
postgresql: "9.4"
- stage: Test
php: 7.2
env: DB=pgsql POSTGRESQL_VERSION=9.4
Expand All @@ -201,13 +147,6 @@ jobs:
addons:
postgresql: "9.4"

- stage: Test
php: 7.1
env: DB=pgsql POSTGRESQL_VERSION=9.5
services:
- postgresql
addons:
postgresql: "9.5"
- stage: Test
php: 7.2
env: DB=pgsql POSTGRESQL_VERSION=9.5
Expand All @@ -223,13 +162,6 @@ jobs:
addons:
postgresql: "9.5"

- stage: Test
php: 7.1
env: DB=pgsql POSTGRESQL_VERSION=9.6
services:
- postgresql
addons:
postgresql: "9.6"
- stage: Test
php: 7.2
env: DB=pgsql POSTGRESQL_VERSION=9.6
Expand All @@ -245,16 +177,6 @@ jobs:
addons:
postgresql: "9.6"

- stage: Test
php: 7.1
env: DB=pgsql POSTGRESQL_VERSION=10.0
sudo: required
services:
- postgresql
addons:
postgresql: "9.6"
before_script:
- bash ./tests/travis/install-postgres-10.sh
- stage: Test
php: 7.2
env: DB=pgsql POSTGRESQL_VERSION=10.0
Expand All @@ -277,7 +199,7 @@ jobs:
- bash ./tests/travis/install-postgres-10.sh

- stage: Test
php: 7.1
php: 7.2
env: DB=sqlite DEPENDENCIES=low
install:
- travis_retry composer update --prefer-dist --prefer-lowest
Expand All @@ -291,7 +213,7 @@ jobs:
- travis_retry composer update --prefer-dist

- stage: Coverage
php: 7.1
php: 7.2
env: DB=sqlite
before_script:
- mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{.disabled,}
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
{"name": "Jonathan Wage", "email": "[email protected]"}
],
"require": {
"php": "^7.1",
"php": "^7.2",
"ext-pdo": "*",
"doctrine/common": "^2.7.1"
},
Expand Down

0 comments on commit 4adca54

Please sign in to comment.