update dev deps

mathroc · mathroc · commit e0d930ba2cd4 · 2024-09-23T22:51:08.000Z
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
@@ -11,7 +11,7 @@ ARG USER_GID=${USER_UID}
 RUN groupadd --gid ${USER_GID} ${USERNAME} && \
     useradd -s /bin/bash --uid ${USER_UID} --gid ${USERNAME} -m ${USERNAME}
 
-COPY --from=composer:2.2.7 /usr/bin/composer /usr/bin/composer
+COPY --from=composer:2.7.9 /usr/bin/composer /usr/bin/composer
 
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive && \
     bash /tmp/library-scripts/dev.sh "${USERNAME}"
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -81,7 +81,7 @@ jobs:
         run: echo "$GITHUB_CONTEXT"; env
 
       - name: Setup Pages
-        uses: actions/configure-pages@v1
+        uses: actions/configure-pages@v5
 
       - name: Deploy to GitHub Pages
         id: deployment
diff --git a/composer.json b/composer.json
@@ -24,17 +24,17 @@
         "php": "^8.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^10.3",
         "phpspec/prophecy-phpunit": "^2.0",
         "squizlabs/php_codesniffer": "^3.6",
         "slevomat/coding-standard": "^8.0",
         "phpstan/phpstan": "^1.4",
         "phpstan/extension-installer": "^1.1",
         "phpstan/phpstan-strict-rules": "^1.1",
         "phpstan/phpstan-phpunit": "^1.0",
-        "vimeo/psalm": "^4.22",
-        "symfony/finder": "^6.1",
-        "symfony/console": "^6.1",
+        "vimeo/psalm": "^5.0",
+        "symfony/finder": "^6.0|^7.0",
+        "symfony/console": "^6.0|^7.0",
         "texthtml/doctest": "^0.2"
     },
     "config": {
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -89,6 +89,7 @@
     </rule>
 
     <rule ref="SlevomatCodingStandard.Classes.ClassStructure">
+        <exclude-pattern>/tests/</exclude-pattern>
         <properties>
             <property name="groups" type="array">
                 <element value="uses"/>
diff --git a/psalm.xml b/psalm.xml
@@ -8,6 +8,7 @@
     findUnusedBaselineEntry="true"
     disableSuppressAll="true"
     findUnusedPsalmSuppress="true"
+    findUnusedCode="false"
     ensureArrayStringOffsetsExist="true"
     ensureArrayIntOffsetsExist="true"
     sealAllMethods="true"
diff --git a/src/Option/None.php b/src/Option/None.php
@@ -141,7 +141,6 @@ public function mapOrElse(callable $callback, callable $default): mixed
      * @template U
      * @param Option<U> $option
      * @return $this
-     * @psalm-suppress ImplementedReturnTypeMismatch
      */
     public function zip(Option $option): self
     {
diff --git a/src/Option/Some.php b/src/Option/Some.php
@@ -157,7 +157,6 @@ public function zip(Option $option): Option
             return Option\some([$this->value, $value]);
         }
 
-        /** @psalm-suppress InvalidReturnStatement */
         return Option\none();
     }
 
diff --git a/src/functions/option.php b/src/functions/option.php
@@ -152,11 +152,9 @@ function tryOf(
  * @template U
  * @param Option<Option<U>> $option
  * @return Option<U>
- * @psalm-suppress InvalidReturnType
  */
 function flatten(Option $option): Option
 {
-    /** @psalm-suppress InvalidReturnStatement */
     return $option instanceof Option\None
         ? $option
         /** @phpstan-ignore missingType.checkedException */
diff --git a/tests/Assert.php b/tests/Assert.php
@@ -4,7 +4,6 @@
 
 use PHPUnit\Framework\Assert as PHPUnitAssert;
 use PHPUnit\Framework\ExpectationFailedException;
-use SebastianBergmann\RecursionContext\InvalidArgumentException;
 use TH\Maybe\Result;
 
 final class Assert extends PHPUnitAssert
@@ -13,7 +12,7 @@ final class Assert extends PHPUnitAssert
      * @template T
      * @template E
      * @param Result<T,E> $result
-     * @throws InvalidArgumentException|ExpectationFailedException
+     * @throws ExpectationFailedException
      */
     public static function assertResultUsed(Result $result): void
     {
@@ -28,7 +27,7 @@ public static function assertResultUsed(Result $result): void
      * @template T
      * @template E
      * @param Result<T,E> $result
-     * @throws InvalidArgumentException|ExpectationFailedException
+     * @throws ExpectationFailedException
      */
     public static function assertResultNotUsed(Result $result): void
     {
diff --git a/tests/Provider/Options.php b/tests/Provider/Options.php
@@ -13,7 +13,7 @@ trait Options
      *   expected:Option<string>
      * }>
      */
-    public function andMatrix(): iterable
+    public static function andMatrix(): iterable
     {
         /** @var Option<string> $none */
         $none = Option\none();
@@ -52,7 +52,7 @@ public function andMatrix(): iterable
      *   expected:Option<string>
      * }>
      */
-    public function orMatrix(): iterable
+    public static function orMatrix(): iterable
     {
         /** @var Option<string> $none */
         $none = Option\none();
@@ -91,7 +91,7 @@ public function orMatrix(): iterable
      *   expected:Option<string>
      * }>
      */
-    public function xorMatrix(): iterable
+    public static function xorMatrix(): iterable
     {
         /** @var Option<string> $none */
         $none = Option\none();
@@ -126,7 +126,7 @@ public function xorMatrix(): iterable
     /**
      * @return iterable<array{0:Option<mixed>, 1:mixed, 2:mixed, 3?:bool}>
      */
-    public function fromValueMatrix(): iterable
+    public static function fromValueMatrix(): iterable
     {
         $o = (object)[];
 
diff --git a/tests/Provider/Results.php b/tests/Provider/Results.php
@@ -13,7 +13,7 @@ trait Results
      *   expected:Result<string, null>
      * }>
      */
-    public function andMatrix(): iterable
+    public static function andMatrix(): iterable
     {
         yield "err-err" => [
             "left"     => Result\err("left"),
@@ -47,7 +47,7 @@ public function andMatrix(): iterable
      *   expected:Result<string, null>
      * }>
      */
-    public function orMatrix(): iterable
+    public static function orMatrix(): iterable
     {
         yield "err-err" => [
             "left"     => Result\err("left"),
@@ -77,7 +77,7 @@ public function orMatrix(): iterable
     /**
      * @return iterable<string, array{class-string<Result<mixed,mixed>>}>
      */
-    public function resultClasses(): iterable
+    public static function resultClasses(): iterable
     {
         yield "Ok" => [Result\Ok::class];
         yield "Err" => [Result\Err::class];
@@ -86,7 +86,7 @@ public function resultClasses(): iterable
     /**
      * @return iterable<string, array{string}>
      */
-    public function resultMethods(): iterable
+    public static function resultMethods(): iterable
     {
         $rc = new \ReflectionClass(Result::class);
 
diff --git a/tests/Provider/Serializable.php b/tests/Provider/Serializable.php
@@ -7,7 +7,7 @@ trait Serializable
     /**
      * @return iterable<mixed>
      */
-    public function serializableValues(): iterable
+    public static function serializableValues(): iterable
     {
         yield "null" => [null];
 
diff --git a/tests/Provider/Transpose.php b/tests/Provider/Transpose.php
@@ -10,16 +10,16 @@ trait Transpose
     /**
      * @return iterable<array{option:Option<mixed>, result:Result<mixed, mixed>}>
      */
-    public function transposeMatrix(): iterable
+    public static function transposeMatrix(): iterable
     {
         yield "none" => [
             "option" => Option\none(),
-            "result" => Result\ok(Option\none()),
+            "expected" => Result\ok(Option\none()),
         ];
 
         yield "some-ok" => [
             "option" => Option\some(Result\ok(42)),
-            "result" => Result\ok(Option\some(42)),
+            "expected" => Result\ok(Option\some(42)),
         ];
 
         yield "some-err" => [
diff --git a/tests/Provider/Values.php b/tests/Provider/Values.php
@@ -7,7 +7,7 @@ trait Values
     /**
      * @return iterable<string, array{mixed}>
      */
-    public function values(): iterable
+    public static function values(): iterable
     {
         yield "null" => [null];
         yield "int" => [42];
diff --git a/tests/Unit/Option/ContainsTest.php b/tests/Unit/Option/ContainsTest.php
@@ -23,7 +23,7 @@ public function testContains(Option $option, mixed $value, bool $expect, bool $s
     /**
      * @return iterable<array{0:Option<mixed>, 1:mixed, 2:bool}>
      */
-    public function containsMatrix(): iterable
+    public static function containsMatrix(): iterable
     {
         $o = (object)[];
 
diff --git a/tests/Unit/Option/ConvertToResultTest.php b/tests/Unit/Option/ConvertToResultTest.php
@@ -49,7 +49,7 @@ public function testOkOrElse(Option $option, mixed $err, Result $expected, int $
     /**
      * @return iterable<array{Option<mixed>, mixed, Result<mixed, mixed>, int}>
      */
-    public function okOrMatrix(): iterable
+    public static function okOrMatrix(): iterable
     {
         yield "none" => [
             Option\none(),
diff --git a/tests/Unit/Option/FilterTest.php b/tests/Unit/Option/FilterTest.php
@@ -38,7 +38,7 @@ public function testFilter(Option $option, bool $filterResult, bool $expectNone,
      *   array<mixed>
      * }>
      */
-    public function filterMatrix(): iterable
+    public static function filterMatrix(): iterable
     {
         yield "none-true" => [
             Option\none(),
diff --git a/tests/Unit/Option/FlattenTest.php b/tests/Unit/Option/FlattenTest.php
@@ -21,7 +21,7 @@ public function testFlatten(Option $expected, Option $option): void
     /**
      * @return iterable<array{Option<mixed>, Option<Option<mixed>>}>
      */
-    public function flattenMatrix(): iterable
+    public static function flattenMatrix(): iterable
     {
         /** @var Option<mixed> $none */
         $none = Option\none();
diff --git a/tests/Unit/Option/MapTest.php b/tests/Unit/Option/MapTest.php
@@ -41,7 +41,7 @@ public function testMap(Option $option, mixed $mapResult, Option $expected, arra
      *   array<mixed>
      * }>
      */
-    public function mapMatrix(): iterable
+    public static function mapMatrix(): iterable
     {
         yield "none" => [
             Option\none(),
@@ -98,7 +98,7 @@ public function testMapOr(
      *   array<mixed>
      * }>
      */
-    public function mapOrMatrix(): iterable
+    public static function mapOrMatrix(): iterable
     {
         yield "none" => [
             Option\none(),
diff --git a/tests/Unit/Option/ZipTest.php b/tests/Unit/Option/ZipTest.php
@@ -28,7 +28,7 @@ public function testZip(Option $left, Option $right, Option $expected): void
      *   Option<array{mixed, mixed}>,
      * }>
      */
-    public function zipMatrix(): iterable
+    public static function zipMatrix(): iterable
     {
         yield "none-none" => [
             Option\none(),
@@ -75,7 +75,7 @@ public function testUnzip(Option $zipped, Option $left, Option $right): void
      *   Option<mixed>,
      * }>
      */
-    public function unzipMatrix(): iterable
+    public static function unzipMatrix(): iterable
     {
         yield "none" => [
             Option\none(),
diff --git a/tests/Unit/Result/ContainsTest.php b/tests/Unit/Result/ContainsTest.php
@@ -25,7 +25,7 @@ public function testContains(Result $result, mixed $value, bool $expect, bool $s
     /**
      * @return iterable<array{0:Result<mixed, null>, 1:mixed, 2:bool}>
      */
-    public function containsMatrix(): iterable
+    public static function containsMatrix(): iterable
     {
         $o = (object)[];
 
@@ -66,7 +66,7 @@ public function testContainsErr(Result $result, mixed $value, bool $expect, bool
     /**
      * @return iterable<array{0:Result<mixed, mixed>, 1:mixed, 2:bool}>
      */
-    public function containsErrMatrix(): iterable
+    public static function containsErrMatrix(): iterable
     {
         $o = (object)[];
 
diff --git a/tests/Unit/Result/ConvertToOptionTest.php b/tests/Unit/Result/ConvertToOptionTest.php
@@ -25,7 +25,7 @@ public function testOk(Result $result, Option $expected): void
     /**
      * @return iterable<array{Option<mixed>, mixed, Result<mixed, mixed>, int}>
      */
-    public function okMatrix(): iterable
+    public static function okMatrix(): iterable
     {
         yield "err" => [
             Result\err("Don't panic !"),
@@ -51,7 +51,7 @@ public function testErr(Result $result, Option $expected): void
     /**
      * @return iterable<array{Option<mixed>, mixed, Result<mixed, mixed>, int}>
      */
-    public function errMatrix(): iterable
+    public static function errMatrix(): iterable
     {
         yield "err" => [
             Result\err("Don't panic !"),
@@ -68,14 +68,14 @@ public function errMatrix(): iterable
      * @template T
      * @template E
      * @dataProvider transposeMatrix
-     * @param Result<Option<T>, E> $result
+     * @param Result<Option<T>, E> $expected
      * @param Option<Result<T,E>> $option
      */
-    public function testTranspose(Option $option, Result $result): void
+    public function testTranspose(Option $option, Result $expected): void
     {
-        Assert::assertEquals($option, $option2 = Result\transpose($result));
+        Assert::assertEquals($option, $option2 = Result\transpose($expected));
 
-        Assert::assertResultUsed($result);
+        Assert::assertResultUsed($expected);
         // @phpstan-ignore-next-line
         $option->map(Assert::assertResultNotUsed(...));
         // @phpstan-ignore-next-line
diff --git a/tests/Unit/Result/FlattenTest.php b/tests/Unit/Result/FlattenTest.php
@@ -27,7 +27,7 @@ public function testFlatten(Result $expected, Result $result): void
     /**
      * @return iterable<array{Result<mixed, null>, Result<Result<mixed, null>, null>}>
      */
-    public function flattenMatrix(): iterable
+    public static function flattenMatrix(): iterable
     {
         yield "err" => [Result\err(null), Result\err(null)];
 
diff --git a/tests/Unit/Result/MapTest.php b/tests/Unit/Result/MapTest.php
@@ -45,7 +45,7 @@ public function testMap(Result $result, mixed $mapResult, Result $expected, arra
      *   array<mixed>
      * }>
      */
-    public function mapMatrix(): iterable
+    public static function mapMatrix(): iterable
     {
         yield "err" => [
             Result\err(null),
@@ -99,7 +99,7 @@ public function testMapErr(Result $result, mixed $mapResult, Result $expected, a
      *   array<mixed>
      * }>
      */
-    public function mapErrMatrix(): iterable
+    public static function mapErrMatrix(): iterable
     {
         yield "ok" => [
             Result\ok(null),
@@ -158,7 +158,7 @@ public function testMapOr(
      *   array<mixed>
      * }>
      */
-    public function mapOrMatrix(): iterable
+    public static function mapOrMatrix(): iterable
     {
         yield "err" => [
             Result\err(null),
diff --git a/tests/Unit/Result/MustBeUsedTest.php b/tests/Unit/Result/MustBeUsedTest.php
@@ -72,7 +72,7 @@ public function testAnUnserializedResultDontHaveToBeUsed(callable $factory): voi
     /**
      * @return iterable<array{callable():Result<mixed,mixed>}>
      */
-    public function resultsFactory(): iterable
+    public static function resultsFactory(): iterable
     {
         yield "ok"  => [static fn (): Result => Result\ok(null)];
         yield "err" => [static fn (): Result => Result\err(null)];
diff --git a/tests/type-hinting/option.php b/tests/type-hinting/option.php
diff --git a/tests/type-hinting/result.php b/tests/type-hinting/result.php

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,6 @@ public function mapOrElse(callable $callback, callable $default): mixed`
`141`	`141`	`* @template U`
`142`	`142`	`* @param Option<U> $option`
`143`	`143`	`* @return $this`
`144`		`- * @psalm-suppress ImplementedReturnTypeMismatch`
`145`	`144`	`*/`
`146`	`145`	`public function zip(Option $option): self`
`147`	`146`	`{`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,6 @@ public function zip(Option $option): Option`
`157`	`157`	`return Option\some([$this->value, $value]);`
`158`	`158`	`}`
`159`	`159`
`160`		`- /** @psalm-suppress InvalidReturnStatement */`
`161`	`160`	`return Option\none();`
`162`	`161`	`}`
`163`	`162`