From f0b351cf5f86bb9378ddd49dd8c447b4a1574825 Mon Sep 17 00:00:00 2001 From: Christian Kuhn Date: Thu, 21 Oct 2021 12:29:44 +0200 Subject: [PATCH 1/4] [!!!][TASK] Raise minimum PHP version to ^7.2 But don't allow ^8.0 for now. --- .github/workflows/tests.yml | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index da0ab94..0cb0fad 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4'] + php: ['7.2', '7.3', '7.4'] steps: - uses: actions/checkout@v2 diff --git a/composer.json b/composer.json index 94cb8e4..4bc28e4 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ ], "type": "library", "require": { - "php": ">=5.3.0" + "php": "^7.2" }, "require-dev": { "mockery/mockery": "*", From 04e6d251b149b3953b74108257e5fa86fac3c4f6 Mon Sep 17 00:00:00 2001 From: Christian Kuhn Date: Thu, 21 Oct 2021 12:32:42 +0200 Subject: [PATCH 2/4] [TASK] Raise minimum phpunit version ^7 php7.4 /usr/local/bin/composer req --dev phpunit/phpunit:^7 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4bc28e4..d98795f 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ }, "require-dev": { "mockery/mockery": "*", - "phpunit/phpunit": ">4.8 <8" + "phpunit/phpunit": "^7" }, "autoload": { "psr-0": { "cogpowered\\FineDiff": "src/" } From 216f83aa64c8d6400af07a0e59e62cf5c89dbe5b Mon Sep 17 00:00:00 2001 From: Christian Kuhn Date: Thu, 21 Oct 2021 12:37:22 +0200 Subject: [PATCH 3/4] [TASK] Drop compat BaseTestCase and use phpunit TestCase --- tests/BaseTestCase.php | 17 ----------------- tests/Delimiters/ConstantsTest.php | 4 ++-- tests/Delimiters/EnumTest.php | 4 ++-- tests/Diff/DefaultsTest.php | 4 ++-- tests/Diff/DependencyInjectTest.php | 4 ++-- tests/Diff/SetTest.php | 4 ++-- tests/Granularity/CharacterTest.php | 4 ++-- tests/Granularity/ParagraphTest.php | 4 ++-- tests/Granularity/SentenceTest.php | 4 ++-- tests/Granularity/WordTest.php | 4 ++-- tests/Parser/OpcodesTest.php | 4 ++-- tests/Parser/Operations/CopyTest.php | 4 ++-- tests/Parser/Operations/DeleteTest.php | 4 ++-- tests/Parser/Operations/InsertTest.php | 4 ++-- tests/Parser/Operations/ReplaceTest.php | 4 ++-- tests/Parser/ParserTest.php | 4 ++-- tests/Render/Html/CallbackTest.php | 4 ++-- tests/Render/Html/ProcessTest.php | 4 ++-- tests/Render/Text/CallbackTest.php | 4 ++-- tests/Render/Text/ProcessTest.php | 4 ++-- tests/Usage/Base.php | 4 ++-- 21 files changed, 40 insertions(+), 57 deletions(-) delete mode 100644 tests/BaseTestCase.php diff --git a/tests/BaseTestCase.php b/tests/BaseTestCase.php deleted file mode 100644 index 087aaa5..0000000 --- a/tests/BaseTestCase.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Thu, 21 Oct 2021 12:39:48 +0200 Subject: [PATCH 4/4] [TASK] Update test status badge from travis to github action --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a22587b..c23c7d3 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ +[![Tests](https://github.com/lolli42/FineDiff/actions/workflows/tests.yml/badge.svg)](https://github.com/lolli42/FineDiff/actions/workflows/tests.yml) + FineDiff ======== Originally written by Raymond Hill ([https://github.com/gorhill/PHP-FineDiff](https://github.com/gorhill/PHP-FineDiff)) FineDiff has been tweaked to bring it up to date with the modern world. That means documented, nicely formatted, tested code that can be easily extended. -[![Build Status](https://travis-ci.org/cogpowered/FineDiff.png?branch=master)](https://travis-ci.org/cogpowered/FineDiff) - Installation ------------