From 454d942c13e1b326b92d72d974b9a904d54b13d7 Mon Sep 17 00:00:00 2001 From: Adrien Crivelli Date: Wed, 24 Jul 2019 23:12:45 -0700 Subject: [PATCH] Drop PHP 5.6 and 7.0 This is according to our formal, published, policy to only support eol PHP after 6 months. See https://phpspreadsheet.readthedocs.io/en/latest/#php-version-support --- .travis.yml | 3 --- composer.json | 6 +++--- composer.lock | 6 +++--- docs/index.md | 9 +++------ samples/index.php | 2 +- src/PhpSpreadsheet/Settings.php | 2 -- tests/PhpSpreadsheetTests/Cell/CoordinateTest.php | 4 ---- 7 files changed, 10 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3fb2dce1..b9ad8de8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,6 @@ language: php dist: trusty php: - - 5.6 - - 7.0 - 7.1 - 7.2 - 7.3 @@ -12,7 +10,6 @@ php: matrix: fast_finish: true allow_failures: - - php: 5.6 - php: 7.4snapshot cache: diff --git a/composer.json b/composer.json index 6f9fd9c3..575fa08f 100644 --- a/composer.json +++ b/composer.json @@ -35,11 +35,11 @@ "php-cs-fixer fix --ansi" ], "versions": [ - "phpcs --report-width=200 samples/ src/ tests/ --ignore=samples/Header.php --standard=PHPCompatibility --runtime-set testVersion 5.6- -n" + "phpcs --report-width=200 samples/ src/ tests/ --ignore=samples/Header.php --standard=PHPCompatibility --runtime-set testVersion 7.1- -n" ] }, "require": { - "php": "^5.6|^7.0", + "php": "^7.1", "ext-ctype": "*", "ext-dom": "*", "ext-gd": "*", @@ -84,4 +84,4 @@ "PhpOffice\\PhpSpreadsheetTests\\": "tests/PhpSpreadsheetTests" } } -} \ No newline at end of file +} diff --git a/composer.lock b/composer.lock index a23c7f8d..6a4b2093 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": "d70247696f417581626dde9641b53bdc", + "content-hash": "844c52e10f1e289de51d2b71cb7fc1ff", "packages": [ { "name": "markbaker/complex", @@ -3192,7 +3192,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^5.6|^7.0", + "php": "^7.1", "ext-ctype": "*", "ext-dom": "*", "ext-gd": "*", @@ -3208,4 +3208,4 @@ "ext-zlib": "*" }, "platform-dev": [] -} \ No newline at end of file +} diff --git a/docs/index.md b/docs/index.md index be4e0fd0..7c276792 100644 --- a/docs/index.md +++ b/docs/index.md @@ -25,12 +25,9 @@ spreadsheet file formats, like Excel and LibreOffice Calc. ## Software requirements -The following software is required to develop using PhpSpreadsheet: - -- PHP version 5.6 or newer -- PHP extension php\_zip enabled -- PHP extension php\_xml enabled -- PHP extension php\_gd2 enabled (if not compiled in) +PHP version 7.1 or newer to develop using PhpSpreadsheet. Other requirements, such as PHP extensions, are enforced by +composer. See the `require` section of [the composer.json file](https://github.com/PHPOffice/PhpSpreadsheet/blob/master/composer.json) +for details. ### PHP version support diff --git a/samples/index.php b/samples/index.php index ec100cf4..598caef4 100644 --- a/samples/index.php +++ b/samples/index.php @@ -3,7 +3,7 @@ require_once 'Header.php'; $requirements = [ - 'PHP 5.6.0' => version_compare(PHP_VERSION, '5.6.0', '>='), + 'PHP 7.1.0' => version_compare(PHP_VERSION, '7.1.0', '>='), 'PHP extension XML' => extension_loaded('xml'), 'PHP extension xmlwriter' => extension_loaded('xmlwriter'), 'PHP extension mbstring' => extension_loaded('mbstring'), diff --git a/src/PhpSpreadsheet/Settings.php b/src/PhpSpreadsheet/Settings.php index c297dd68..03fa6ac2 100644 --- a/src/PhpSpreadsheet/Settings.php +++ b/src/PhpSpreadsheet/Settings.php @@ -30,7 +30,6 @@ class Settings * 7.2 < 7.2.1 * 7.1 < 7.1.13 * 7.0 < 7.0.27 - * 5.6 ANY * then you may need to disable this check to prevent unwanted behaviour in other threads * SECURITY WARNING: Changing this flag is not recommended. * @@ -122,7 +121,6 @@ class Settings * 7.2 < 7.2.1 * 7.1 < 7.1.13 * 7.0 < 7.0.27 - * 5.6 ANY * then you may need to disable this check to prevent unwanted behaviour in other threads * SECURITY WARNING: Changing this flag to false is not recommended. * diff --git a/tests/PhpSpreadsheetTests/Cell/CoordinateTest.php b/tests/PhpSpreadsheetTests/Cell/CoordinateTest.php index 5136226d..8d041c26 100644 --- a/tests/PhpSpreadsheetTests/Cell/CoordinateTest.php +++ b/tests/PhpSpreadsheetTests/Cell/CoordinateTest.php @@ -243,10 +243,6 @@ class CoordinateTest extends TestCase { $this->expectException(\TypeError::class); - if (PHP_MAJOR_VERSION < 7) { - $this->markTestSkipped('Cannot catch type hinting error with PHP 5.6'); - } - $cellRange = ''; Coordinate::buildRange($cellRange); }