From 25949acd7e0362ee0c09d68d753311206de692d2 Mon Sep 17 00:00:00 2001 From: Oliver Klee Date: Tue, 1 Oct 2019 20:37:17 +0200 Subject: [PATCH 1/2] [TASK] Drop support for PHP 5.6 Now PHP >= 7.0 is required. Changes to the code and to the php-cs-fixer configuratoin will come in separate changes. --- .travis.yml | 12 ++---------- CHANGELOG.md | 3 +++ composer.json | 3 ++- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index f53b2401..ca1ce606 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ sudo: false language: php php: -- "5.6" - "7.0" - "7.1" - "7.2" @@ -53,15 +52,8 @@ script: - > echo; - function version_gte() { test "$(printf '%s\n' "$@" | sort -n -t. -r | head -n 1)" = "$1"; }; - if version_gte $(composer php:version) 7; then - echo "Installing slevomat/coding-standard only for PHP 7.x"; - composer require $IGNORE_PLATFORM_REQS --dev slevomat/coding-standard:^4.0 $DEPENDENCIES_PREFERENCE; - echo "Running PHP_CodeSniffer"; - composer ci:php:sniff; - else - echo "Skipped PHP_CodeSniffer due to insufficient PHP version: $(composer php:version)"; - fi; + echo "Running PHP_CodeSniffer"; + composer ci:php:sniff; - > echo; diff --git a/CHANGELOG.md b/CHANGELOG.md index 26b04cf1..fed8e20d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,8 +10,11 @@ This project adheres to [Semantic Versioning](https://semver.org/). ### Changed ### Deprecated +- Support for PHP 7.0 will be removed in Emogrifier 5.0. ### Removed +- Drop support for PHP 5.6 + ([#773](https://github.com/MyIntervals/emogrifier/pull/773)) ### Fixed diff --git a/composer.json b/composer.json index 490d50db..3a738d2d 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ "source": "https://github.com/MyIntervals/emogrifier" }, "require": { - "php": "^5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0", + "php": "~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0", "ext-dom": "*", "ext-libxml": "*", "symfony/css-selector": "^2.8 || ^3.0 || ^4.0" @@ -45,6 +45,7 @@ "require-dev": { "friendsofphp/php-cs-fixer": "^2.15.3", "squizlabs/php_codesniffer": "^3.5.0", + "slevomat/coding-standard": "5.0.4", "phpmd/phpmd": "^2.7.0", "phpunit/phpunit": "^5.7.27" }, From 49e72833bdfccbb1536dc6e27b764bf5c5571899 Mon Sep 17 00:00:00 2001 From: Oliver Klee Date: Tue, 1 Oct 2019 20:53:46 +0200 Subject: [PATCH 2/2] Add missing ^ to requirement --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3a738d2d..4579e994 100644 --- a/composer.json +++ b/composer.json @@ -45,7 +45,7 @@ "require-dev": { "friendsofphp/php-cs-fixer": "^2.15.3", "squizlabs/php_codesniffer": "^3.5.0", - "slevomat/coding-standard": "5.0.4", + "slevomat/coding-standard": "^5.0.4", "phpmd/phpmd": "^2.7.0", "phpunit/phpunit": "^5.7.27" },