Merge pull request #10 from LeoVie/php-81-compatibility

Add support for PHP 8.1
LeoVie · Apr 27, 2023 · 0d4657c · 0d4657c
2 parents 55aaf4b + 19ccd94
commit 0d4657c
Show file tree

Hide file tree

Showing 14 changed files with 44 additions and 32 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,8 +11,11 @@ jobs:
         php-version: [ '8.2' ]
         coverage-driver: [ xdebug ]
         include:
+          - { operating-system: 'ubuntu-20.04', php-version: '8.1', coverage-driver: 'xdebug'}
           - { operating-system: 'ubuntu-20.04', php-version: '8.2', coverage-driver: 'xdebug'}
+          - { operating-system: 'windows-2022', php-version: '8.1', coverage-driver: 'xdebug'}
           - { operating-system: 'windows-2022', php-version: '8.2', coverage-driver: 'xdebug'}
+          - { operating-system: 'macos-12', php-version: '8.1', coverage-driver: 'xdebug'}
           - { operating-system: 'macos-12', php-version: '8.2', coverage-driver: 'xdebug'}
 
     name: CI on ${{ matrix.operating-system }} with PHP ${{ matrix.php-version }}, using ${{ matrix.coverage-driver }}

diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
         }
     ],
     "require": {
-        "php": ">=8.2",
+        "php": ">=8.1",
         "symfony/console": "^6.2",
         "symfony/css-selector": "^6.2",
         "symfony/dom-crawler": "^6.2",

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,9 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- https://phpunit.readthedocs.io/en/latest/configuration.html -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" backupGlobals="false" colors="true"
-         executionOrder="random" resolveDependencies="true" failOnRisky="true" failOnWarning="true"
-         beStrictAboutOutputDuringTests="true" bootstrap="vendor/autoload.php" cacheDirectory=".phpunit.cache">
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         executionOrder="random"
+         resolveDependencies="true"
+         failOnRisky="true"
+         failOnWarning="true"
+         beStrictAboutOutputDuringTests="true"
+         bootstrap="vendor/autoload.php"
+         cacheDirectory=".phpunit.cache">
     <testsuites>
         <testsuite name="Functional">
             <directory>tests/Functional</directory>
@@ -13,19 +20,21 @@
         </testsuite>
     </testsuites>
     <coverage>
-        <include>
-            <directory suffix=".php">src</directory>
-        </include>
         <report>
             <html outputDirectory="./build/coverage/coverage-html"/>
             <xml outputDirectory="./build/coverage/coverage-xml"/>
             <clover outputFile="./build/coverage/clover.xml"/>
         </report>
-        <exclude>
-            <directory>src/Command</directory>
-        </exclude>
     </coverage>
     <logging>
         <junit outputFile="./build/coverage/junit.xml"/>
     </logging>
+    <source>
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+        <exclude>
+            <directory>src/Command</directory>
+        </exclude>
+    </source>
 </phpunit>
diff --git a/src/DTO/Baseline.php b/src/DTO/Baseline.php
@@ -4,10 +4,10 @@
 
 namespace Leovie\PhpunitCrapCheck\DTO;
 
-readonly class Baseline
+class Baseline
 {
     public function __construct(
-        public CrapCheckResult $crapCheckResult
+        public readonly CrapCheckResult $crapCheckResult
     )
     {
     }

diff --git a/src/DTO/BaselineDiffersResult.php b/src/DTO/BaselineDiffersResult.php
@@ -4,7 +4,7 @@
 
 namespace Leovie\PhpunitCrapCheck\DTO;
 
-readonly class BaselineDiffersResult implements BaselineCompareResult
+class BaselineDiffersResult implements BaselineCompareResult
 {
     /**
      * @param array<Method> $methodsNotOccurringAnymore
@@ -13,10 +13,10 @@
      * @param array<Method> $methodsGotLessCrappy
      */
     public function __construct(
-        public array $methodsNotOccurringAnymore,
-        public array $methodsNewlyOccurring,
-        public array $methodsGotCrappier,
-        public array $methodsGotLessCrappy
+        public readonly array $methodsNotOccurringAnymore,
+        public readonly array $methodsNewlyOccurring,
+        public readonly array $methodsGotCrappier,
+        public readonly array $methodsGotLessCrappy
     )
     {
     }

diff --git a/src/DTO/BaselineEqualsResult.php b/src/DTO/BaselineEqualsResult.php
@@ -4,6 +4,6 @@
 
 namespace Leovie\PhpunitCrapCheck\DTO;
 
-readonly class BaselineEqualsResult implements BaselineCompareResult
+class BaselineEqualsResult implements BaselineCompareResult
 {
 }
diff --git a/src/DTO/Method.php b/src/DTO/Method.php
@@ -4,12 +4,12 @@
 
 namespace Leovie\PhpunitCrapCheck\DTO;
 
-readonly class Method
+class Method
 {
     public function __construct(
-        public string $classFQN,
-        public string $name,
-        public int    $crap,
+        public readonly string $classFQN,
+        public readonly string $name,
+        public readonly int    $crap,
     )
     {
     }

diff --git a/src/DTO/NonEmptyCrapCheckResult.php b/src/DTO/NonEmptyCrapCheckResult.php
@@ -4,11 +4,11 @@
 
 namespace Leovie\PhpunitCrapCheck\DTO;
 
-readonly class NonEmptyCrapCheckResult implements CrapCheckResult
+class NonEmptyCrapCheckResult implements CrapCheckResult
 {
     /** @param array<Method> $tooCrappyMethods */
     public function __construct(
-        public array $tooCrappyMethods
+        public readonly array $tooCrappyMethods
     )
     {
     }

diff --git a/src/Generator/BaselineOutputGenerator.php b/src/Generator/BaselineOutputGenerator.php
@@ -8,7 +8,7 @@
 use Leovie\PhpunitCrapCheck\DTO\EmptyCrapCheckResult;
 use Leovie\PhpunitCrapCheck\DTO\NonEmptyCrapCheckResult;
 
-readonly class BaselineOutputGenerator implements BaselineOutputGeneratorInterface
+class BaselineOutputGenerator implements BaselineOutputGeneratorInterface
 {
     public function generate(Baseline $baseline): string
     {

diff --git a/src/Parser/BaselineParser.php b/src/Parser/BaselineParser.php
@@ -15,7 +15,7 @@
  *   }
  * >
  */
-readonly class BaselineParser implements BaselineParserInterface
+class BaselineParser implements BaselineParserInterface
 {
     public function parse(string $baselineContent): Baseline
     {

diff --git a/src/Parser/CloverParser.php b/src/Parser/CloverParser.php
@@ -7,7 +7,7 @@
 use Leovie\PhpunitCrapCheck\DTO\Method;
 use Symfony\Component\DomCrawler\Crawler;
 
-readonly class CloverParser implements CloverParserInterface
+class CloverParser implements CloverParserInterface
 {
     /** @return array<Method> */
     public function parseMethods(string $cloverReportContent): array

diff --git a/src/Service/BaselineCompareService.php b/src/Service/BaselineCompareService.php
@@ -13,7 +13,7 @@
 use Leovie\PhpunitCrapCheck\DTO\Method;
 use Leovie\PhpunitCrapCheck\DTO\NonEmptyCrapCheckResult;
 
-readonly class BaselineCompareService
+class BaselineCompareService
 {
     private const COMPARE_RESULT_EQUAL = 0;
     private const COMPARE_RESULT_SMALLER = -1;

diff --git a/src/Service/BaselineOutputService.php b/src/Service/BaselineOutputService.php
@@ -7,10 +7,10 @@
 use Leovie\PhpunitCrapCheck\DTO\Baseline;
 use Leovie\PhpunitCrapCheck\Generator\BaselineOutputGeneratorInterface;
 
-readonly class BaselineOutputService
+class BaselineOutputService
 {
     public function __construct(
-        private BaselineOutputGeneratorInterface $baselineOutputGenerator
+        private readonly BaselineOutputGeneratorInterface $baselineOutputGenerator
     )
     {
     }

diff --git a/src/Service/CrapCheckService.php b/src/Service/CrapCheckService.php
@@ -10,10 +10,10 @@
 use Leovie\PhpunitCrapCheck\DTO\Method;
 use Leovie\PhpunitCrapCheck\Parser\CloverParserInterface;
 
-readonly class CrapCheckService
+class CrapCheckService
 {
     public function __construct(
-        private CloverParserInterface $cloverParser
+        private readonly CloverParserInterface $cloverParser
     )
     {
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ @@
      *   }
      * >
      */
-    readonly class BaselineParser implements BaselineParserInterface
+    class BaselineParser implements BaselineParserInterface
     {
         public function parse(string $baselineContent): Baseline
         {
@@ Expand Down @@