From 88d2ec639242b2550b2574a896a7b5f8e6e65003 Mon Sep 17 00:00:00 2001 From: Coen Jacobs Date: Mon, 23 Dec 2019 11:49:03 +0100 Subject: [PATCH 1/6] Bump required PHP to 7.2 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 420fb161..8c88231d 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "prefer-stable": true, "license": "MIT", "require": { - "php": "^7.1", + "php": "^7.2", "symfony/console": "^4", "symfony/finder": "^4", "league/flysystem": "^1.0" From e2d684f541a001f62dd2c9b9f6a239655cdd5d54 Mon Sep 17 00:00:00 2001 From: Coen Jacobs Date: Mon, 23 Dec 2019 11:49:27 +0100 Subject: [PATCH 2/6] Drop 7.1 testing, add 7.4 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b343ef2d..569c4ee1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,9 @@ language: php php: - - 7.1 - 7.2 - 7.3 + - 7.4 install: - composer selfupdate --no-interaction From cb4bb49be0f924d65e9a10e2637cb4bc14d874b3 Mon Sep 17 00:00:00 2001 From: Coen Jacobs Date: Mon, 23 Dec 2019 11:57:39 +0100 Subject: [PATCH 3/6] Symfony components can now also run 5.x --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 8c88231d..49fb9720 100644 --- a/composer.json +++ b/composer.json @@ -13,8 +13,8 @@ "license": "MIT", "require": { "php": "^7.2", - "symfony/console": "^4", - "symfony/finder": "^4", + "symfony/console": "^4|^5", + "symfony/finder": "^4|^5", "league/flysystem": "^1.0" }, "autoload": { From 90ad8ead4956a7d21e8fa524e67379764ae624bf Mon Sep 17 00:00:00 2001 From: Coen Jacobs Date: Mon, 23 Dec 2019 11:59:05 +0100 Subject: [PATCH 4/6] phpunit/phpunit can now run ^8.5 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 49fb9720..3ff2f417 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ } }, "require-dev": { - "phpunit/phpunit": "^7.5", + "phpunit/phpunit": "^8.5", "coenjacobs/php-composter-phpcs": "^0.1.0" } } From 537650d79041a95823d79fd3478f85df44c5dd9f Mon Sep 17 00:00:00 2001 From: Coen Jacobs Date: Mon, 23 Dec 2019 11:59:35 +0100 Subject: [PATCH 5/6] Ignore phpunit result cache file --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index cfbeda98..3d6c7cac 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ vendor/ .DS_Store -composer.lock \ No newline at end of file +composer.lock +.phpunit.result.cache From b76acaa464db4e451617d89c979a00cb65a0f054 Mon Sep 17 00:00:00 2001 From: Coen Jacobs Date: Mon, 23 Dec 2019 12:05:04 +0100 Subject: [PATCH 6/6] Strip obsolete composter package --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 3ff2f417..502f416a 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,6 @@ } }, "require-dev": { - "phpunit/phpunit": "^8.5", - "coenjacobs/php-composter-phpcs": "^0.1.0" + "phpunit/phpunit": "^8.5" } }