From 4f593a28eb02b345bd3c148c28dc0941bf0d4e8f Mon Sep 17 00:00:00 2001 From: Michael Moravec Date: Fri, 5 Jan 2018 03:49:59 +0100 Subject: [PATCH] Require PHP 7.2, drop <7.2 in Composer & on CI --- .scrutinizer.yml | 2 +- .travis.yml | 72 ++++-------------------------------------------- composer.json | 2 +- composer.lock | 4 +-- 4 files changed, 9 insertions(+), 71 deletions(-) diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 68b7f344399..a3b8a5621ca 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -3,7 +3,7 @@ build: analysis: environment: php: - version: 7.1 + version: 7.2 cache: disabled: false directories: diff --git a/.travis.yml b/.travis.yml index 6be26170ae5..b87a282d332 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,73 +45,6 @@ jobs: - php: nightly include: - - stage: Test - php: 7.1 - env: DB=mysql MYSQL_VERSION=8.0 - dist: xenial - sudo: required - before_script: - - bash ./tests/travis/install-mysql-8.0.sh - - stage: Test - php: 7.1 - env: DB=mysqli MYSQL_VERSION=8.0 - dist: xenial - sudo: required - before_script: - - bash ./tests/travis/install-mysql-8.0.sh - - stage: Test - php: 7.1 - env: DB=mariadb MARIADB_VERSION=10.3 - addons: - mariadb: 10.3 - - stage: Test - php: 7.1 - env: DB=mariadb.mysqli MARIADB_VERSION=10.3 - addons: - mariadb: 10.3 - - stage: Test - php: 7.1 - env: DB=pgsql POSTGRESQL_VERSION=11.0 - sudo: required - services: - - docker - before_script: - - bash ./tests/travis/install-postgres-11.sh - - stage: Test - php: 7.1 - env: DB=sqlite - - stage: Test - php: 7.1 - env: DB=sqlsrv - sudo: required - services: - - docker - before_script: - - bash ./tests/travis/install-mssql-sqlsrv.sh - - bash ./tests/travis/install-mssql.sh - - stage: Test - php: 7.1 - env: DB=pdo_sqlsrv - sudo: required - services: - - docker - before_script: - - bash ./tests/travis/install-mssql-pdo_sqlsrv.sh - - bash ./tests/travis/install-mssql.sh - - stage: Test - php: 7.1 - env: DB=ibm_db2 - sudo: required - services: - - docker - before_script: - - bash ./tests/travis/install-db2.sh - - bash ./tests/travis/install-db2-ibm_db2.sh - - stage: Test - php: 7.1 - env: DB=sqlite DEPENDENCIES=low - install: - - travis_retry composer update --prefer-dist --prefer-lowest - stage: Test php: 7.2 env: DB=mysql COVERAGE=yes @@ -267,6 +200,11 @@ jobs: before_script: - bash ./tests/travis/install-db2.sh - bash ./tests/travis/install-db2-ibm_db2.sh + - stage: Test + php: 7.2 + env: DB=sqlite DEPENDENCIES=low + install: + - travis_retry composer update --prefer-dist --prefer-lowest - stage: Test php: 7.3 env: DB=mysql MYSQL_VERSION=5.7 diff --git a/composer.json b/composer.json index 9d5f610c2b8..bec40c7e7f2 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ {"name": "Jonathan Wage", "email": "jonwage@gmail.com"} ], "require": { - "php": "^7.1", + "php": "^7.2", "ext-pdo": "*", "doctrine/cache": "^1.0", "doctrine/event-manager": "^1.0" diff --git a/composer.lock b/composer.lock index 0c15627967d..a17fed1ffbe 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1147a9427c03f98ca063806250633645", + "content-hash": "3ebc0109174963fe21391619cdae7254", "packages": [ { "name": "doctrine/cache", @@ -2959,7 +2959,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^7.1", + "php": "^7.2", "ext-pdo": "*" }, "platform-dev": []