Add rector (#59)

.github/workflows/ci.yaml

@@ -22,7 +22,7 @@ jobs:
           php-version: ${{ matrix.php }}
           coverage: pcov
       - name: Install dependencies
-        uses: "ramsey/composer-install@v1"
+        uses: ramsey/composer-install@v2
       - name: Run tests
         run: ./vendor/bin/phpunit --coverage-clover=build/coverage-report.xml
       - name: Upload code coverage

Makefile

@@ -47,3 +47,7 @@ cs-check:
 ci: test phpstan psalm type-assertions cs-fix
 
 ci-check: test phpstan psalm type-assertions cs-check
+
+.PHONY: rector
+rector:
+	./vendor/bin/rector

composer.json

@@ -10,7 +10,8 @@
         "facile-it/facile-coding-standard": "^0.5.1",
         "vimeo/psalm": "4.30.0",
         "friendsofphp/php-cs-fixer": "^3.3",
-        "phpstan/phpstan": "^1.8"
+        "phpstan/phpstan": "^1.8",
+        "rector/rector": "^0.15.25"
     },
     "license": "MIT",
     "authors": [

rector.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
+use Rector\Config\RectorConfig;
+use Rector\Set\ValueObject\LevelSetList;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->paths([
+        __DIR__ . '/src',
+        __DIR__ . '/tests',
+    ]);
+
+    // register a single rule
+    $rectorConfig->rule(InlineConstructorDefaultToPropertyRector::class);
+    $rectorConfig->sets([
+        LevelSetList::UP_TO_PHP_74,
+    ]);
+};

src/Decoders.php

@@ -135,9 +135,7 @@ public static function union(Decoder $a, Decoder $b, ?Decoder $c = null, ?Decode
         $args = array_values(
             array_filter(
                 func_get_args(),
-                static function ($x): bool {
-                    return $x instanceof Decoder;
-                }
+                static fn ($x): bool => $x instanceof Decoder
             )
         );
         $argc = count($args);
@@ -255,9 +253,7 @@ public static function classFromArrayPropsDecoder(
     ): Decoder {
         /** @psalm-var Decoder<Properties, T> $mapDecoder */
         $mapDecoder = new MapDecoder(
-            function (array $props) use ($factory) {
-                return Internal\FunctionUtils::destructureIn($factory)(\array_values($props));
-            },
+            fn (array $props) => Internal\FunctionUtils::destructureIn($factory)(\array_values($props)),
             \sprintf('%s(%s)', $decoderName, $propsDecoder->getName())
         );
 

src/Internal/Arrays/ListOfDecoder.php

@@ -21,7 +21,7 @@
 final class ListOfDecoder implements Decoder
 {
     /** @var Decoder<IT, T> */
-    private $elementDecoder;
+    private \Facile\PhpCodec\Decoder $elementDecoder;
 
     /**
      * @psalm-param Decoder<IT, T> $elementDecoder

src/Internal/Combinators/ArrayPropsDecoder.php

@@ -23,7 +23,7 @@
 final class ArrayPropsDecoder implements Decoder
 {
     /** @var PD */
-    private $props;
+    private array $props;
 
     /**
      * @psalm-param PD $props

src/Internal/Combinators/ComposeDecoder.php

@@ -20,9 +20,9 @@
 final class ComposeDecoder implements Decoder
 {
     /** @var Decoder<A, B> */
-    private $db;
+    private \Facile\PhpCodec\Decoder $db;
     /** @var Decoder<IA, A> */
-    private $da;
+    private \Facile\PhpCodec\Decoder $da;
 
     /**
      * @psalm-param Decoder<A, B> $db
@@ -51,9 +51,7 @@ public function validate($i, Context $context): Validation
              *
              * @param mixed $aValue
              */
-            function ($aValue) use ($context): Validation {
-                return $this->db->validate($aValue, $context);
-            },
+            fn ($aValue): Validation => $this->db->validate($aValue, $context),
             $this->da->validate($i, $context)
         );
     }

src/Internal/Combinators/IntersectionDecoder.php

@@ -23,9 +23,9 @@
 final class IntersectionDecoder implements Decoder
 {
     /** @var Decoder<IA, A> */
-    private $a;
+    private \Facile\PhpCodec\Decoder $a;
     /** @var Decoder<IB, B> */
-    private $b;
+    private \Facile\PhpCodec\Decoder $b;
 
     /**
      * @psalm-param Decoder<IA, A> $a
@@ -46,10 +46,7 @@ public function validate($i, Context $context): Validation
 
         if ($va instanceof ValidationFailures && $vb instanceof ValidationFailures) {
             return ValidationFailures::failures(
-                array_merge(
-                    $va->getErrors(),
-                    $vb->getErrors()
-                )
+                [...$va->getErrors(), ...$vb->getErrors()]
             );
         }
 

src/Internal/Combinators/MapDecoder.php

@@ -19,8 +19,7 @@ final class MapDecoder implements Decoder
 {
     /** @var callable(A):B */
     private $f;
-    /** @var string */
-    private $name;
+    private string $name;
 
     /**
      * @psalm-param callable(A):B $f

src/Internal/Combinators/UnionDecoder.php

@@ -22,11 +22,10 @@
 final class UnionDecoder implements Decoder
 {
     /** @var Decoder<IA, A> */
-    private $a;
+    private \Facile\PhpCodec\Decoder $a;
     /** @var Decoder<IB, B> */
-    private $b;
-    /** @var int */
-    private $indexBegin;
+    private \Facile\PhpCodec\Decoder $b;
+    private int $indexBegin;
 
     /**
      * @psalm-param Decoder<IA, A> $a
@@ -71,10 +70,7 @@ public function validate($i, Context $context): Validation
 
             if ($vb instanceof ValidationFailures) {
                 return Validation::failures(
-                    array_merge(
-                        $va->getErrors(),
-                        $vb->getErrors()
-                    )
+                    [...$va->getErrors(), ...$vb->getErrors()]
                 );
             }
 

src/Internal/FunctionUtils.php

@@ -23,13 +23,11 @@ public static function nameFromProps(array $props): string
             \implode(
                 ', ',
                 \array_map(
-                    static function (Decoder $t, $k): string {
-                        return \sprintf(
-                            '%s: %s',
-                            \is_string($k) ? $k : \sprintf('[%d]', $k),
-                            $t->getName()
-                        );
-                    },
+                    static fn (Decoder $t, $k): string => \sprintf(
+                        '%s: %s',
+                        \is_string($k) ? $k : \sprintf('[%d]', $k),
+                        $t->getName()
+                    ),
                     $props,
                     \array_keys($props)
                 )
@@ -64,9 +62,7 @@ public static function standardDecode(Decoder $decoder, $input): Validation
      */
     public static function destructureIn(callable $f): callable
     {
-        return function (array $params) use ($f) {
-            return $f(...$params);
-        };
+        return fn (array $params) => $f(...$params);
     }
 
     /**
@@ -86,7 +82,7 @@ public static function strigify($x): string
 
         if (\is_array($x)) {
             return \function_exists('json_encode')
-                ? \json_encode($x)
+                ? \json_encode($x, JSON_THROW_ON_ERROR)
                 : \serialize($x);
         }
 

src/Internal/Useful/DateTimeFromStringDecoder.php

@@ -16,10 +16,9 @@
 final class DateTimeFromStringDecoder implements Decoder
 {
     /**
-     * @var string
      * @psalm-readonly
      */
-    private $format;
+    private string $format;
 
     public function __construct(string $format = \DATE_ATOM)
     {

src/Internal/Useful/RegexDecoder.php

@@ -15,8 +15,7 @@
  */
 final class RegexDecoder implements Decoder
 {
-    /** @var string */
-    private $regex;
+    private string $regex;
 
     public function __construct(string $regex)
     {

src/Internal/Useful/StringMatchingRegexDecoder.php

@@ -15,8 +15,7 @@
  */
 final class StringMatchingRegexDecoder implements Decoder
 {
-    /** @var string */
-    private $regex;
+    private string $regex;
 
     public function __construct(string $regex)
     {

src/Reporters/PathReporter.php

@@ -27,15 +27,11 @@ public static function create(): self
     public function report(Validation $validation): array
     {
         return Validation::fold(
-            function (array $errors): array {
-                return \array_map(
-                    [self::class, 'getMessage'],
-                    $errors
-                );
-            },
-            function (): array {
-                return ['No errors!'];
-            },
+            fn (array $errors): array => \array_map(
+                [self::class, 'getMessage'],
+                $errors
+            ),
+            fn (): array => ['No errors!'],
             $validation
         );
     }

src/Reporters/SimplePathReporter.php

@@ -22,15 +22,11 @@ public static function create(): self
     public function report(Validation $validation): array
     {
         return Validation::fold(
-            static function (array $errors): array {
-                return array_map(
-                    [self::class, 'getMessage'],
-                    $errors
-                );
-            },
-            static function (): array {
-                return ['No errors'];
-            },
+            static fn (array $errors): array => array_map(
+                [self::class, 'getMessage'],
+                $errors
+            ),
+            static fn (): array => ['No errors'],
             $validation
         );
     }

src/Utils/ConcreteDecoder.php

@@ -18,8 +18,7 @@ final class ConcreteDecoder implements Decoder
 {
     /** @var callable(I, Context):Validation<A> */
     private $validateFunc;
-    /** @var string */
-    private $name;
+    private string $name;
 
     /**
      * @psalm-param callable(I, Context):Validation<A> $validate

src/Validation/Context.php

@@ -9,11 +9,9 @@
 final class Context implements \Iterator
 {
     /** @var ContextEntry[] */
-    private $entries;
-    /** @var int */
-    private $currentIndex;
-    /** @var Decoder */
-    private $decoder;
+    private array $entries;
+    private int $currentIndex = 0;
+    private \Facile\PhpCodec\Decoder $decoder;
 
     /**
      * @psalm-param Decoder $decoder
@@ -24,7 +22,6 @@ public function __construct(
         ContextEntry ...$entries
     ) {
         $this->entries = $entries;
-        $this->currentIndex = 0;
         $this->decoder = $decoder;
     }
 

src/Validation/ContextEntry.php

@@ -8,10 +8,8 @@
 
 final class ContextEntry
 {
-    /** @var string */
-    private $key;
-    /** @var Decoder */
-    private $decoder;
+    private string $key;
+    private \Facile\PhpCodec\Decoder $decoder;
     /** @var mixed */
     private $actual;
 

src/Validation/VError.php

@@ -8,10 +8,8 @@ final class VError
 {
     /** @var mixed */
     private $value;
-    /** @var Context */
-    private $context;
-    /** @var string|null */
-    private $message;
+    private \Facile\PhpCodec\Validation\Context $context;
+    private ?string $message = null;
 
     /**
      * @psalm-param mixed       $value

src/Validation/ValidationFailures.php

@@ -11,7 +11,7 @@
 final class ValidationFailures extends Validation
 {
     /** @var list<VError> */
-    private $errors;
+    private array $errors;
 
     /**
      * @psalm-param list<VError> $errors

tests/examples/DecodeApiResponse/Coordinates.php

@@ -9,10 +9,8 @@
  */
 class Coordinates
 {
-    /** @var float */
-    private $longitude;
-    /** @var float */
-    private $latitude;
+    private float $longitude;
+    private float $latitude;
 
     public function __construct(float $longitude, float $latitude)
     {