Enhancement: Add support for PHP 8.0

Co-authored-by: Andreas Möller <am@localheinz.com> Co-authored-by: Michael Voříšek <mvorisek@mvorisek.cz>
ergebnis · Dec 1, 2023 · 4e08471 · 4e08471
1 parent f475e8b
commit 4e08471
Show file tree

Hide file tree

Showing 19 changed files with 69 additions and 73 deletions.
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
+          - "8.0"
 
         phpunit-version:
           - "9.6.0"
@@ -86,7 +86,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
+          - "8.0"
 
         dependencies:
           - "locked"
@@ -158,7 +158,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
+          - "8.0"
 
         dependencies:
           - "locked"
@@ -230,7 +230,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
+          - "8.0"
 
         dependencies:
           - "locked"
@@ -286,7 +286,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
+          - "8.0"
 
         dependencies:
           - "locked"
@@ -348,7 +348,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
+          - "8.0"
 
         dependencies:
           - "locked"
@@ -398,7 +398,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
+          - "8.0"
 
         dependencies:
           - "locked"
@@ -451,6 +451,7 @@ jobs:
     strategy:
       matrix:
         php-version:
+          - "8.0"
           - "8.1"
           - "8.2"
           - "8.3"

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
+          - "8.0"
 
         dependencies:
           - "locked"

diff --git a/.github/workflows/renew.yaml b/.github/workflows/renew.yaml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
+          - "8.0"
 
         dependencies:
           - "locked"

diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -26,7 +26,7 @@
 
 $license->save();
 
-$ruleSet = PhpCsFixer\Config\RuleSet\Php81::create()
+$ruleSet = PhpCsFixer\Config\RuleSet\Php80::create()
     ->withHeader($license->header())
     ->withRules(PhpCsFixer\Config\Rules::fromArray([
         'mb_str_functions' => false,

diff --git a/composer.json b/composer.json
@@ -24,11 +24,11 @@
     "security": "https://github.com/ergebnis/phpunit-slow-test-detector/blob/main/.github/SECURITY.md"
   },
   "require": {
-    "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
+    "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
     "phpunit/phpunit": "^9.6.0 || ^10.4.0"
   },
   "require-dev": {
-    "ergebnis/composer-normalize": "^2.39.0",
+    "ergebnis/composer-normalize": "^2.31.0",
     "ergebnis/data-provider": "^3.2.0",
     "ergebnis/license": "^2.4.0",
     "ergebnis/php-cs-fixer-config": "^6.13.0",

diff --git a/composer.lock b/composer.lock
diff --git a/rector.php b/rector.php
@@ -13,7 +13,6 @@
 
 use Rector\Config;
 use Rector\Core;
-use Rector\Php81;
 use Rector\PHPUnit;
 
 return static function (Config\RectorConfig $rectorConfig): void {
@@ -26,9 +25,5 @@
         __DIR__ . '/test/',
     ]);
 
-    $rectorConfig->phpVersion(Core\ValueObject\PhpVersion::PHP_81);
-
-    $rectorConfig->rules([
-        Php81\Rector\Property\ReadOnlyPropertyRector::class,
-    ]);
+    $rectorConfig->phpVersion(Core\ValueObject\PhpVersion::PHP_80);
 };
diff --git a/src/Attribute/MaximumDuration.php b/src/Attribute/MaximumDuration.php
@@ -21,7 +21,7 @@ final class MaximumDuration
     /**
      * @throws Exception\InvalidMilliseconds
      */
-    public function __construct(private readonly int $milliseconds)
+    public function __construct(private int $milliseconds)
     {
         if (0 >= $milliseconds) {
             throw Exception\InvalidMilliseconds::notGreaterThanZero($milliseconds);

diff --git a/src/Count.php b/src/Count.php
@@ -18,7 +18,7 @@
  */
 final class Count
 {
-    private function __construct(private readonly int $value)
+    private function __construct(private int $value)
     {
     }
 

diff --git a/src/Duration.php b/src/Duration.php
@@ -19,8 +19,8 @@
 final class Duration
 {
     private function __construct(
-        private readonly int $seconds,
-        private readonly int $nanoseconds,
+        private int $seconds,
+        private int $nanoseconds,
     ) {
     }
 

diff --git a/src/Extension.php b/src/Extension.php
@@ -85,9 +85,9 @@ final class Extension implements
         Runner\BeforeFirstTestHook
     {
         private int $suites = 0;
-        private readonly Duration $maximumDuration;
-        private readonly Collector\Collector $collector;
-        private readonly Reporter\Reporter $reporter;
+        private Duration $maximumDuration;
+        private Collector\Collector $collector;
+        private Reporter\Reporter $reporter;
 
         public function __construct(array $options = [])
         {

diff --git a/src/Reporter/DefaultReporter.php b/src/Reporter/DefaultReporter.php
@@ -27,9 +27,9 @@ final class DefaultReporter implements Reporter
     private Comparator\DurationComparator $durationComparator;
 
     public function __construct(
-        private readonly Formatter\DurationFormatter $durationFormatter,
-        private readonly Duration $maximumDuration,
-        private readonly Count $maximumCount,
+        private Formatter\DurationFormatter $durationFormatter,
+        private Duration $maximumDuration,
+        private Count $maximumCount,
     ) {
         $this->durationComparator = new Comparator\DurationComparator();
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ @@
      */
     final class Count
     {
-        private function __construct(private readonly int $value)
+        private function __construct(private int $value)
         {
         }
@@ Expand Down @@