From 40422d29c514a7dee6043c12f8f788ca0ed65fdb Mon Sep 17 00:00:00 2001 From: Kosta Harlan Date: Wed, 1 Dec 2021 14:42:43 +0100 Subject: [PATCH] Adjust PHPUnit 5 check to be consistent with others This is consistent with how other versions are checked, and also reduces esoteric bugs when PHPUnit_TextUI_ResultPrinter exists, even though the PHPUnit version is newer. --- src/Printer.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Printer.php b/src/Printer.php index da99c5f..544ff1c 100755 --- a/src/Printer.php +++ b/src/Printer.php @@ -3,16 +3,21 @@ namespace Codedungeon\PHPUnitPrettyResultPrinter; use PHPUnit\Runner\Version; -use PHPUnit_TextUI_ResultPrinter; -if (class_exists(PHPUnit_TextUI_ResultPrinter::class)) { +$low = version_compare(Version::series(), '5.0', '>='); +$high = version_compare(Version::series(), '5.99.99', '<='); + +if ($low && $high) { class Printer extends ResultPrinter5 { use PrinterTrait; } } -if (version_compare(Version::series(), '6.99.99', '<=')) { +$low = version_compare(Version::series(), '6.0', '>='); +$high = version_compare(Version::series(), '6.99.99', '<='); + +if ($low && $high) { class Printer extends ResultPrinter6 { use PrinterTrait;