Skip to content

Commit f348ba9

Browse files
committed
chore: add phpunit 9 support fix merge conflicts
2 parents 097357a + 66cc59f commit f348ba9

File tree

3 files changed

+15
-185
lines changed

3 files changed

+15
-185
lines changed

src/Printer.php

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,21 @@ class Printer extends ResultPrinter71
4040
}
4141

4242
$low = version_compare(Version::series(), '8.0', '>=');
43-
$high = true; // version_compare(Version::series(),'8.99.99','<=');
43+
$high = version_compare(Version::series(),'8.99.99','<=');
4444

4545
if ($low && $high) {
4646
class Printer extends ResultPrinter80
4747
{
4848
use PrinterTrait8; // new trait introduced for PHP 8.x
4949
}
5050
}
51+
52+
$low = version_compare(Version::series(), '9.0', '>=');
53+
$high = true; // version_compare(Version::series(),'8.99.99','<=');
54+
55+
if ($low && $high) {
56+
class Printer extends ResultPrinter90
57+
{
58+
use PrinterTrait8; // new trait introduced for PHP 8.x
59+
}
60+
}

src/ResultPrinter80.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@
1111
use PHPUnit\Framework\TestFailure;
1212

1313
$low = version_compare(Version::series(), '8.0', '>=');
14+
<<<<<<< HEAD
1415
$high = true; // version_compare(Version::series(),'7.1.99','<=');
16+
=======
17+
$high = version_compare(Version::series(),'8.99.99','<=');
18+
>>>>>>> php74-phpunit9
1519

1620
if ($low && $high) {
1721
class ResultPrinter80 extends ResultPrinter

src/ResultPrinter90.php

Lines changed: 0 additions & 184 deletions
This file was deleted.

0 commit comments

Comments
 (0)