chore: minimum PHP version is now 8.1

drupol · drupol · commit 33bc6e23c5ec · 2023-07-07T12:45:23.000+02:00
diff --git a/.envrc b/.envrc
@@ -1,2 +1,2 @@
 use flake github:loophp/nix-auto-changelog
-use flake github:loophp/nix-shell#env-php81-nts --impure
+use flake github:loophp/nix-shell#env-php81 --impure
diff --git a/.gitignore b/.gitignore
@@ -1,14 +1,7 @@
 /.direnv/
-/composer.lock
-/vendor
-/build
-/docs/_build
+/.phpunit.cache/
+/build/
+/vendor/
 /.php_cs.cache
-/.php-cs-fixer.cache
-/examples/
-/.idea/
-/test.php
-/node_modules/
-/benchmarks/
-/.vscode/
-/.phpunit.result.cache
+/.phpunit.result.cache
+/composer.lock
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2021-2022 Pol Dellaiera
+Copyright (c) 2021-2023 Pol Dellaiera
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
diff --git a/README.md b/README.md
@@ -1,9 +1,8 @@
 [![Latest Stable Version][latest stable version]][1]
 [![GitHub stars][github stars]][1] [![Total Downloads][total downloads]][1]
-[![GitHub Workflow Status][github workflow status]][2]
-[![Scrutinizer code quality][code quality]][3]
-[![Type Coverage][type coverage]][4] [![Code Coverage][code coverage]][3]
-[![License][license]][1] [![Donate!][donate github]][github sponsors link]
+[![GitHub Workflow Status][github workflow status]][github actions link]
+[![Type Coverage][type coverage]][4] [![License][license]][1]
+[![Donate!][donate github]][github sponsors link]
 
 # PHPUnit Iterable Assertions
 
@@ -96,11 +95,8 @@ For more detailed changelogs, please check [the release changelogs][45].
 [total downloads]:
   https://img.shields.io/packagist/dt/loophp/phpunit-iterable-assertions.svg?style=flat-square
 [github workflow status]:
-  https://img.shields.io/github/workflow/status/loophp/phpunit-iterable-assertions/Unit%20tests?style=flat-square
-[code quality]:
-  https://img.shields.io/scrutinizer/quality/g/loophp/phpunit-iterable-assertions/main.svg?style=flat-square
-[3]:
-  https://scrutinizer-ci.com/g/loophp/phpunit-iterable-assertions/?branch=main
+  https://img.shields.io/github/actions/workflow/status/loophp/phpunit-iterable-assertions/tests.yml?branch=main&style=flat-square
+[github actions link]: https://github.com/loophp/collection/actions
 [type coverage]:
   https://img.shields.io/badge/dynamic/json?style=flat-square&color=color&label=Type%20coverage&query=message&url=https%3A%2F%2Fshepherd.dev%2Fgithub%2Floophp%2Fphpunit-iterable-assertions%2Fcoverage
 [4]: https://shepherd.dev/github/loophp/phpunit-iterable-assertions
@@ -110,8 +106,6 @@ For more detailed changelogs, please check [the release changelogs][45].
   https://img.shields.io/packagist/l/loophp/phpunit-iterable-assertions.svg?style=flat-square
 [donate github]:
   https://img.shields.io/badge/Sponsor-Github-brightgreen.svg?style=flat-square
-[donate paypal]:
-  https://img.shields.io/badge/Sponsor-Paypal-brightgreen.svg?style=flat-square
 [33]: https://loophp-iterators.rtfd.io
 [28]: https://loophp-iterators.readthedocs.io/en/stable/pages/api.html
 [32]: https://loophp-iterators.readthedocs.io/en/stable/pages/usage.html
diff --git a/composer.json b/composer.json
@@ -27,16 +27,16 @@
         }
     ],
     "require": {
-        "php": ">= 7.4",
+        "php": ">= 8.1",
         "loophp/iterators": "^2"
     },
     "require-dev": {
         "ext-pcov": "*",
         "drupol/php-conventions": "^5",
-        "infection/infection": "^0.26",
+        "infection/infection": "^0.27",
         "phpstan/phpstan-strict-rules": "^1.0",
-        "phpunit/php-code-coverage": "^9.2",
-        "phpunit/phpunit": "^9.5"
+        "phpunit/php-code-coverage": "^10",
+        "phpunit/phpunit": "^10"
     },
     "autoload": {
         "psr-4": {
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,36 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
-         bootstrap="./vendor/autoload.php"
-         colors="true"
-         executionOrder="random"
-         beStrictAboutChangesToGlobalState="true"
-         beStrictAboutOutputDuringTests="false"
-         beStrictAboutCoversAnnotation="true"
-         forceCoversAnnotation="false"
-         failOnWarning="true"
-         failOnRisky="true"
-         failOnEmptyTestSuite="true"
-         verbose="true"
->
-    <testsuites>
-        <testsuite name="Test Suite">
-            <directory>./tests/unit</directory>
-        </testsuite>
-    </testsuites>
-
-    <coverage processUncoveredFiles="true">
-        <include>
-            <directory suffix=".php">src</directory>
-        </include>
-        <report>
-            <xml outputDirectory="build/logs/coverage/coverage-xml/infection"/>
-            <html outputDirectory="build/logs/coverage/html-coverage"/>
-            <clover outputFile="build/logs/coverage/clover.xml"/>
-        </report>
-    </coverage>
-
-    <logging>
-        <junit outputFile="build/logs/coverage/junit.xml"/>
-    </logging>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.2/phpunit.xsd" bootstrap="./vendor/autoload.php" colors="true" executionOrder="random" beStrictAboutChangesToGlobalState="true" beStrictAboutOutputDuringTests="false" failOnWarning="true" failOnRisky="true" failOnEmptyTestSuite="true" cacheDirectory=".phpunit.cache" requireCoverageMetadata="false" beStrictAboutCoverageMetadata="true">
+  <testsuites>
+    <testsuite name="Test Suite">
+      <directory>./tests/unit</directory>
+    </testsuite>
+  </testsuites>
+  <coverage>
+    <report>
+      <xml outputDirectory="build/logs/coverage/coverage-xml/infection"/>
+      <html outputDirectory="build/logs/coverage/html-coverage"/>
+      <clover outputFile="build/logs/coverage/clover.xml"/>
+    </report>
+  </coverage>
+  <logging>
+    <junit outputFile="build/logs/coverage/junit.xml"/>
+  </logging>
+  <source>
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/renovate.json b/renovate.json
@@ -1,6 +1,4 @@
 {
     "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-    "extends": [
-        "config:base"
-    ]
+    "extends": ["config:base"]
 }
diff --git a/src/Constraint/IsIdenticalIterable.php b/src/Constraint/IsIdenticalIterable.php
@@ -22,28 +22,21 @@
  */
 final class IsIdenticalIterable extends Constraint
 {
-    private int $limit;
-
-    /**
-     * @var iterable<TKey, T>
-     */
-    private iterable $subject;
-
     /**
      * @param iterable<TKey, T> $subject
      */
-    public function __construct(iterable $subject, int $limit = 0)
-    {
-        $this->subject = $subject;
-        $this->limit = $limit;
+    public function __construct(
+        private readonly iterable $subject,
+        private readonly int $limit = 0
+    ) {
     }
 
     public function toString(): string
     {
         return 'has exactly the same keys and values';
     }
 
-    protected function additionalFailureDescription($other): string
+    protected function additionalFailureDescription(mixed $other): string
     {
         [$subject, $other] = array_map(
             static fn (iterable $iterable): Iterator => (new IterableIteratorAggregate($iterable))->getIterator(),
@@ -85,7 +78,7 @@ protected function additionalFailureDescription($other): string
     /**
      * @param iterable<TKey, T> $other
      */
-    protected function matches($other): bool
+    protected function matches(mixed $other): bool
     {
         [$subject, $other] = array_map(
             static fn (iterable $iterable): Iterator => (new IterableIteratorAggregate($iterable))->getIterator(),
diff --git a/src/Constraint/IsNotIdenticalIterable.php b/src/Constraint/IsNotIdenticalIterable.php
@@ -22,20 +22,13 @@
  */
 final class IsNotIdenticalIterable extends Constraint
 {
-    private int $limit;
-
-    /**
-     * @var iterable<TKey, T>
-     */
-    private iterable $subject;
-
     /**
      * @param iterable<TKey, T> $subject
      */
-    public function __construct(iterable $subject, int $limit = 0)
-    {
-        $this->subject = $subject;
-        $this->limit = $limit;
+    public function __construct(
+        private readonly iterable $subject,
+        private readonly int $limit = 0
+    ) {
     }
 
     public function toString(): string
@@ -46,7 +39,7 @@ public function toString(): string
     /**
      * @param iterable<TKey, T> $other
      */
-    protected function matches($other): bool
+    protected function matches(mixed $other): bool
     {
         [$subject, $other] = array_map(
             static fn (iterable $iterable): Iterator => (new IterableIteratorAggregate($iterable))->getIterator(),
diff --git a/tests/unit/Constraint/IsIdenticalIterableTest.php b/tests/unit/Constraint/IsIdenticalIterableTest.php
@@ -22,7 +22,7 @@
  */
 final class IsIdenticalIterableTest extends TestCase
 {
-    public function dataProvider()
+    public static function provideEvaluationCases()
     {
         yield [
             range('a', 'c'),
@@ -56,7 +56,7 @@ public function dataProvider()
     }
 
     /**
-     * @dataProvider dataProvider
+     * @dataProvider provideEvaluationCases
      */
     public function testEvaluation(
         iterable $iterable1,
diff --git a/tests/unit/Constraint/IsNotIdenticalIterableTest.php b/tests/unit/Constraint/IsNotIdenticalIterableTest.php
@@ -22,7 +22,7 @@
  */
 final class IsNotIdenticalIterableTest extends TestCase
 {
-    public function dataProvider()
+    public static function provideEvaluationCases()
     {
         yield [
             range('a', 'c'),
@@ -56,7 +56,7 @@ public function dataProvider()
     }
 
     /**
-     * @dataProvider dataProvider
+     * @dataProvider provideEvaluationCases
      */
     public function testEvaluation(
         iterable $iterable1,

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`use flake github:loophp/nix-auto-changelog`
`2`		`-use flake github:loophp/nix-shell#env-php81-nts --impure`
	`2`	`+use flake github:loophp/nix-shell#env-php81 --impure`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "https://docs.renovatebot.com/renovate-schema.json",`
`3`		`- "extends": [`
`4`		`- "config:base"`
`5`		`- ]`
	`3`	`+ "extends": ["config:base"]`
`6`	`4`	`}`