Fix compat issues

exussum12 · Jun 25, 2024 · 185cea9 · 185cea9
1 parent 57c2aa2
commit 185cea9
Show file tree

Hide file tree

Showing 16 changed files with 90 additions and 109 deletions.
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
     },
     "bin": ["bin/diffFilter"],
     "require": {
-        "php": ">=7.0",
+        "php": ">=8.0",
         "ext-xmlreader": "*",
         "ext-json": "*",
         "nikic/php-parser": "^3.1||^4.0||^5.0"

diff --git a/src/functions.php b/src/functions.php
@@ -92,7 +92,7 @@ function handleOutput(array $lines, float $minimumPercentCovered, Output $output
 
     if ($coveredLines + $uncoveredLines == 0) {
         error_log('No lines found!');
-        
+
         $output->output(
             $lines['uncoveredLines'],
             100,
@@ -126,14 +126,19 @@ function calculateLines(array $lines)
 
 function addExceptionHandler()
 {
-    set_exception_handler(
-        function ($exception) {
-            // @codeCoverageIgnoreStart
-            error_log($exception->getMessage());
-            exit($exception->getCode());
-            // @codeCoverageIgnoreEnd
-        }
-    );
+    if (
+        !defined('PHPUNIT_COMPOSER_INSTALL') &&
+        !defined('__PHPUNIT_PHAR__')
+    ) {
+        set_exception_handler(
+            function ($exception) {
+                // @codeCoverageIgnoreStart
+                error_log($exception->getMessage());
+                exit($exception->getCode());
+                // @codeCoverageIgnoreEnd
+            }
+        );
+    }
 }
 
 function getFileChecker(

diff --git a/tests/ArgParserTest.php b/tests/ArgParserTest.php
@@ -1,6 +1,7 @@
 <?php
 namespace exussum12\CoverageChecker\tests;
 
+use PHPUnit\Framework\Attributes\Before;
 use PHPUnit\Framework\TestCase;
 use exussum12\CoverageChecker\ArgParser;
 use exussum12\CoverageChecker\Exceptions\ArgumentNotFound;
@@ -9,9 +10,7 @@ class ArgParserTest extends TestCase
 {
     protected $parser;
 
-    /**
-     * @before
-     */
+    #[Before]
     public function setUpTest()
     {
         $args = [

diff --git a/tests/CoverageCheckTest.php b/tests/CoverageCheckTest.php
@@ -28,22 +28,20 @@ public function testCoverage()
             ]);
 
         $xmlReport->method('getErrorsOnLine')
-            ->will(
-                $this->returnCallback(
-                    function () {
-                        $file = func_get_arg(0);
-                        $line = func_get_arg(1);
+            ->willReturnCallback(
+                function () {
+                    $file = func_get_arg(0);
+                    $line = func_get_arg(1);
 
-                        if ($file == '/full/path/to/testFile1.php' && $line == 2) {
-                            return $this->errorMessage;
-                        }
-                        if ($file == '/full/path/to/testFile2.php' && $line == 4) {
-                            return $this->errorMessage;
-                        }
-
-                        return [];
+                    if ($file == '/full/path/to/testFile1.php' && $line == 2) {
+                        return $this->errorMessage;
+                    }
+                    if ($file == '/full/path/to/testFile2.php' && $line == 4) {
+                        return $this->errorMessage;
                     }
-                )
+
+                    return [];
+                }
             );
 
         $matcher = new FileMatchers\EndsWith;
@@ -87,19 +85,17 @@ public function testCoverageFailed()
             ->willReturn(null);
 
         $xmlReport->method('getErrorsOnLine')
-            ->will(
-                $this->returnCallback(
-                    function () {
-                        $file = func_get_arg(0);
-                        $line = func_get_arg(1);
+            ->willReturnCallback(
+                function () {
+                    $file = func_get_arg(0);
+                    $line = func_get_arg(1);
 
-                        if ($file == '/full/path/to/testFile1.php' && $line == 2) {
-                            return $this->errorMessage;
-                        }
-
-                        return [];
+                    if ($file == '/full/path/to/testFile1.php' && $line == 2) {
+                        return $this->errorMessage;
                     }
-                )
+
+                    return [];
+                }
             );
 
         $matcher = new FileMatchers\EndsWith;
@@ -141,19 +137,17 @@ public function testAddingAllUnknownsCovered()
             ->willReturn(true);
 
         $xmlReport->method('getErrorsOnLine')
-            ->will(
-                $this->returnCallback(
-                    function () {
-                        $file = func_get_arg(0);
-                        $line = func_get_arg(1);
+            ->willReturnCallback(
+                function () {
+                    $file = func_get_arg(0);
+                    $line = func_get_arg(1);
 
-                        if ($file == '/full/path/to/testFile1.php' && $line == 2) {
-                            return $this->errorMessage;
-                        }
-
-                        return [];
+                    if ($file == '/full/path/to/testFile1.php' && $line == 2) {
+                        return $this->errorMessage;
                     }
-                )
+
+                    return [];
+                }
             );
 
         $matcher = new FileMatchers\EndsWith;
@@ -196,19 +190,17 @@ public function testAddingAllUnknownsUnCovered()
             ->willReturn(false);
 
         $xmlReport->method('getErrorsOnLine')
-            ->will(
-                $this->returnCallback(
-                    function () {
-                        $file = func_get_arg(0);
-                        $line = func_get_arg(1);
-
-                        if ($file == '/full/path/to/testFile1.php' && $line == 2) {
-                            return $this->errorMessage;
-                        }
+            ->willReturnCallback(
+                function () {
+                    $file = func_get_arg(0);
+                    $line = func_get_arg(1);
 
-                        return [];
+                    if ($file == '/full/path/to/testFile1.php' && $line == 2) {
+                        return $this->errorMessage;
                     }
-                )
+
+                    return [];
+                }
             );
 
         $matcher = new FileMatchers\EndsWith;
@@ -254,8 +246,7 @@ public function testCoverageForContextLines()
             ->willReturn(false);
 
         $xmlReport->method('getErrorsOnLine')
-            ->will(
-                $this->returnCallback(
+            ->willReturnCallback(
                     function () {
                         $file = func_get_arg(0);
                         $line = func_get_arg(1);
@@ -266,7 +257,6 @@ function () {
 
                         return [];
                     }
-                )
             );
 
         $matcher = new FileMatchers\EndsWith;

diff --git a/tests/DiffFileLoadOldVersionTest.php b/tests/DiffFileLoadOldVersionTest.php
@@ -1,14 +1,14 @@
 <?php
 namespace exussum12\CoverageChecker\tests;
 
-use exussum12\CoverageChecker\DiffFileLoaderOldVersion;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
+use exussum12\CoverageChecker\DiffFileLoaderOldVersion;
+
 
 class DiffFileLoadOldVersionTest extends TestCase
 {
-    /**
-     * @dataProvider getResults
-     */
+    #[DataProvider('getResults')]
     public function testDiffResultsMatch($file, $expected)
     {
         $changed = $this->getChangedLines($file);

diff --git a/tests/DiffFileLoadTest.php b/tests/DiffFileLoadTest.php
@@ -2,16 +2,15 @@
 namespace exussum12\CoverageChecker\tests;
 
 use InvalidArgumentException;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use exussum12\CoverageChecker\DiffFileLoader;
 use exussum12\CoverageChecker\DiffFileState;
 use exussum12\CoverageChecker\DiffLineHandle\ContextLine;
 
 class DiffFileLoadTest extends TestCase
 {
-    /**
-     * @dataProvider getResults
-     */
+    #[DataProvider('getResults')]
     public function testDiffResultsMatch($file, $expected)
     {
         $changed = $this->getChangedLines($file);

diff --git a/tests/Loaders/CheckstyleTest.php b/tests/Loaders/CheckstyleTest.php
@@ -2,16 +2,15 @@
 namespace exussum12\CoverageChecker\tests\Loaders;
 
 use exussum12\CoverageChecker\Loaders\Checkstyle;
+use PHPUnit\Framework\Attributes\Before;
 
 class CheckstyleTest extends PhanTextTest
 {
     /** @var  Checkstyle */
     protected $phan;
     protected $prefix = '';
 
-    /**
-     * @before
-     */
+    #[Before]
     protected function setUpTest()
     {
         $this->phan = new Checkstyle(__DIR__ . '/../fixtures/checkstyle.xml');

diff --git a/tests/Loaders/CodeClimateTest.php b/tests/Loaders/CodeClimateTest.php
@@ -2,16 +2,15 @@
 namespace exussum12\CoverageChecker\tests\Loaders;
 
 use exussum12\CoverageChecker\Loaders\CodeClimate;
+use PHPUnit\Framework\Attributes\Before;
 
 class CodeClimateTest extends PhanTextTest
 {
     /** @var  CodeClimate */
     protected $phan;
     protected $prefix = '';
 
-    /**
-     * @before
-     */
+    #[Before]
     protected function setUpTest()
     {
         $this->phan = new CodeClimate(__DIR__ . '/../fixtures/codeclimate.json');

diff --git a/tests/Loaders/PhanJsonTest.php b/tests/Loaders/PhanJsonTest.php
@@ -2,15 +2,14 @@
 namespace exussum12\CoverageChecker\tests\Loaders;
 
 use exussum12\CoverageChecker\Loaders\PhanJson;
+use PHPUnit\Framework\Attributes\Before;
 
 class PhanJsonTest extends PhanTextTest
 {
     /** @var  PhanJsonTest */
     protected $phan;
 
-    /**
-     * @before
-     */
+    #[Before]
     protected function setUpTest()
     {
         $this->phan = new PhanJson(__DIR__ . '/../fixtures/phan.json');

diff --git a/tests/Loaders/PhanTextTest.php b/tests/Loaders/PhanTextTest.php
@@ -1,6 +1,7 @@
 <?php
 namespace exussum12\CoverageChecker\tests\Loaders;
 
+use PHPUnit\Framework\Attributes\Before;
 use PHPUnit\Framework\TestCase;
 use exussum12\CoverageChecker\Loaders\PhanText;
 use exussum12\CoverageChecker\tests\TestShim;
@@ -11,9 +12,7 @@ class PhanTextTest extends TestCase
     /** @var  PhanText */
     protected $phan;
 
-    /**
-     * @before
-     */
+    #[Before]
     protected function setUpTest()
     {
         $this->phan = new PhanText(__DIR__ . '/../fixtures/phan.txt');

diff --git a/tests/Loaders/PhpMndTest.php b/tests/Loaders/PhpMndTest.php
@@ -1,16 +1,16 @@
 <?php
 namespace exussum12\CoverageChecker\tests;
 
+use PHPUnit\Framework\Attributes\Before;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use exussum12\CoverageChecker\Loaders\PhpMnd;
 
 class PhpMndTest extends TestCase
 {
     private $mnd;
 
-    /**
-     * @before
-     */
+    #[Before]
     public function setUpTest()
     {
         $file = __DIR__ . '/../fixtures/phpmnd.txt';
@@ -29,9 +29,7 @@ public function testGetOutput()
         $this->assertSame($expected, $this->mnd->parseLines());
     }
 
-    /**
-     * @dataProvider fileInputs
-     */
+    #[DataProvider('fileInputs')]
     public function testLinesReturnCorrect($filename, $lineNo, $expected)
     {
         $this->mnd->parseLines();
@@ -44,7 +42,7 @@ public function testInvalidFile()
         $this->assertTrue($this->mnd->handleNotFoundFile());
     }
 
-    public function fileInputs()
+    public static function fileInputs()
     {
         return [
             'found file, valid line' => ['test.php', 2, []],

diff --git a/tests/Loaders/PhpStanTest.php b/tests/Loaders/PhpStanTest.php
@@ -1,6 +1,7 @@
 <?php
 namespace exussum12\CoverageChecker\tests;
 
+use PHPUnit\Framework\Attributes\Before;
 use PHPUnit\Framework\TestCase;
 use exussum12\CoverageChecker\Loaders\PhpStan;
 
@@ -9,9 +10,7 @@ class PhpStanTest extends TestCase
     /** @var  PhpStan */
     protected $stan;
 
-    /**
-     * @before
-     */
+    #[Before]
     public function setUpTest()
     {
         $file = __DIR__ . '/../fixtures/phpstan.txt';

diff --git a/tests/Loaders/PhpcpdTest.php b/tests/Loaders/PhpcpdTest.php
@@ -1,6 +1,7 @@
 <?php
 namespace exussum12\CoverageChecker\tests\Loaders;
 
+use PHPUnit\Framework\Attributes\Before;
 use PHPUnit\Framework\TestCase;
 use exussum12\CoverageChecker\Loaders\Phpcpd;
 
@@ -9,10 +10,8 @@ class PhpcpdTest extends TestCase
     /** @var  Phpcpd */
     protected $cpd;
 
-    /**
-     * @before
-     */
-    protected function setUpTest()
+    #[Before]
+    protected function setUpTest(): void
     {
         $this->cpd = new Phpcpd(__DIR__ . '/../fixtures/phpcpd.txt');