update code for PHP 8

drupol · drupol · commit 8ef4a6b3cd87 · 2022-12-04T21:11:01.000+01:00
diff --git a/src/ChunkIterableAggregate.php b/src/ChunkIterableAggregate.php
@@ -22,20 +22,11 @@
  */
 final class ChunkIterableAggregate implements IteratorAggregate
 {
-    private int $chunkSize;
-
-    /**
-     * @var iterable<TKey, T>
-     */
-    private iterable $iterable;
-
     /**
      * @param iterable<TKey, T> $iterable
      */
-    public function __construct(iterable $iterable, int $chunkSize)
+    public function __construct(private iterable $iterable, private int $chunkSize)
     {
-        $this->iterable = $iterable;
-        $this->chunkSize = $chunkSize;
     }
 
     /**
diff --git a/src/ClosureIterator.php b/src/ClosureIterator.php
@@ -30,19 +30,13 @@ final class ClosureIterator implements Iterator
      */
     private Generator $generator;
 
-    /**
-     * @var iterable<int, mixed>
-     */
-    private iterable $parameters;
-
     /**
      * @param callable(mixed): iterable<TKey, T> $callable
      * @param iterable<int, mixed> $parameters
      */
-    public function __construct(callable $callable, iterable $parameters = [])
+    public function __construct(callable $callable, private iterable $parameters = [])
     {
         $this->callable = $callable;
-        $this->parameters = $parameters;
         $this->generator = $this->getGenerator();
     }
 
diff --git a/src/ClosureIteratorAggregate.php b/src/ClosureIteratorAggregate.php
@@ -25,19 +25,13 @@ final class ClosureIteratorAggregate implements IteratorAggregate
      */
     private $callable;
 
-    /**
-     * @var iterable<int, mixed>
-     */
-    private iterable $parameters;
-
     /**
      * @param callable(mixed ...$parameters): iterable<TKey, T> $callable
      * @param iterable<int, mixed> $parameters
      */
-    public function __construct(callable $callable, iterable $parameters = [])
+    public function __construct(callable $callable, private iterable $parameters = [])
     {
         $this->callable = $callable;
-        $this->parameters = $parameters;
     }
 
     /**
diff --git a/src/ConcatIterableAggregate.php b/src/ConcatIterableAggregate.php
@@ -22,17 +22,11 @@
  */
 final class ConcatIterableAggregate implements IteratorAggregate
 {
-    /**
-     * @var iterable<mixed, iterable<TKey, T>>
-     */
-    private iterable $iterables;
-
     /**
      * @param iterable<mixed, iterable<TKey, T>> $iterables
      */
-    public function __construct(iterable $iterables)
+    public function __construct(private iterable $iterables)
     {
-        $this->iterables = $iterables;
     }
 
     /**
diff --git a/src/FilterIterableAggregate.php b/src/FilterIterableAggregate.php
@@ -21,11 +21,6 @@
  */
 final class FilterIterableAggregate implements IteratorAggregate
 {
-    /**
-     * @var iterable<TKey, T>
-     */
-    private iterable $iterable;
-
     /**
      * @var Closure(T, TKey, iterable<TKey, T>): bool
      */
@@ -35,9 +30,8 @@ final class FilterIterableAggregate implements IteratorAggregate
      * @param iterable<TKey, T> $iterable
      * @param (Closure(T, TKey, iterable<TKey, T>): bool) $predicate
      */
-    public function __construct(iterable $iterable, Closure $predicate)
+    public function __construct(private iterable $iterable, Closure $predicate)
     {
-        $this->iterable = $iterable;
         $this->predicate = $predicate;
     }
 
diff --git a/src/InterruptableIterableIteratorAggregate.php b/src/InterruptableIterableIteratorAggregate.php
@@ -22,17 +22,11 @@ final class InterruptableIterableIteratorAggregate implements IteratorAggregate
 {
     public const BREAK = 'break';
 
-    /**
-     * @var iterable<TKey, T>
-     */
-    private iterable $iterable;
-
     /**
      * @param iterable<TKey, T> $iterable
      */
-    public function __construct(iterable $iterable)
+    public function __construct(private iterable $iterable)
     {
-        $this->iterable = $iterable;
     }
 
     /**
diff --git a/src/IterableIteratorAggregate.php b/src/IterableIteratorAggregate.php
@@ -20,17 +20,11 @@
  */
 final class IterableIteratorAggregate implements IteratorAggregate
 {
-    /**
-     * @var iterable<TKey, T>
-     */
-    private iterable $iterable;
-
     /**
      * @param iterable<TKey, T> $iterable
      */
-    public function __construct(iterable $iterable)
+    public function __construct(private iterable $iterable)
     {
-        $this->iterable = $iterable;
     }
 
     /**
diff --git a/src/LimitIterableAggregate.php b/src/LimitIterableAggregate.php
@@ -21,23 +21,11 @@
  */
 final class LimitIterableAggregate implements IteratorAggregate
 {
-    /**
-     * @var iterable<TKey, T>
-     */
-    private iterable $iterable;
-
-    private int $limit;
-
-    private int $offset;
-
     /**
      * @param iterable<TKey, T> $iterable
      */
-    public function __construct(iterable $iterable, int $offset = 0, int $limit = -1)
+    public function __construct(private iterable $iterable, private int $offset = 0, private int $limit = -1)
     {
-        $this->iterable = $iterable;
-        $this->offset = $offset;
-        $this->limit = $limit;
     }
 
     /**
diff --git a/src/MapIterableAggregate.php b/src/MapIterableAggregate.php
@@ -27,18 +27,12 @@ final class MapIterableAggregate implements IteratorAggregate
      */
     private Closure $closure;
 
-    /**
-     * @var iterable<TKey, T>
-     */
-    private iterable $iterable;
-
     /**
      * @param iterable<TKey, T> $iterable
      * @param (Closure(T, TKey, iterable<TKey, T>): W) $closure
      */
-    public function __construct(iterable $iterable, Closure $closure)
+    public function __construct(private iterable $iterable, Closure $closure)
     {
-        $this->iterable = $iterable;
         $this->closure = $closure;
     }
 
diff --git a/src/MersenneTwisterRNGIteratorAggregate.php b/src/MersenneTwisterRNGIteratorAggregate.php
@@ -37,7 +37,7 @@ public function getIterator(): Generator
 
         // @phpstan-ignore-next-line
         while (true) {
-            yield mt_rand($this->min, $this->max);
+            yield random_int($this->min, $this->max);
         }
     }
 
diff --git a/src/MultipleIterableAggregate.php b/src/MultipleIterableAggregate.php
@@ -21,24 +21,12 @@
  */
 final class MultipleIterableAggregate implements IteratorAggregate
 {
-    /**
-     * @var (0|1|2|3)
-     */
-    private int $flags;
-
-    /**
-     * @var iterable<array-key, iterable<TKey, T>>
-     */
-    private iterable $iterables;
-
     /**
      * @param iterable<array-key, iterable<TKey, T>> $iterables
      * @param (0|1|2|3) $flags
      */
-    public function __construct(iterable $iterables, int $flags = MultipleIterator::MIT_NEED_ALL | MultipleIterator::MIT_KEYS_NUMERIC)
+    public function __construct(private iterable $iterables, private int $flags = MultipleIterator::MIT_NEED_ALL | MultipleIterator::MIT_KEYS_NUMERIC)
     {
-        $this->flags = $flags;
-        $this->iterables = $iterables;
     }
 
     /**
diff --git a/src/NormalizeIterableAggregate.php b/src/NormalizeIterableAggregate.php
@@ -20,17 +20,11 @@
  */
 final class NormalizeIterableAggregate implements IteratorAggregate
 {
-    /**
-     * @var iterable<TKey, T>
-     */
-    private iterable $iterable;
-
     /**
      * @param iterable<TKey, T> $iterable
      */
-    public function __construct(iterable $iterable)
+    public function __construct(private iterable $iterable)
     {
-        $this->iterable = $iterable;
     }
 
     /**
diff --git a/src/PackIterableAggregate.php b/src/PackIterableAggregate.php
@@ -20,17 +20,11 @@
  */
 final class PackIterableAggregate implements IteratorAggregate
 {
-    /**
-     * @var iterable<TKey, T>
-     */
-    private iterable $iterable;
-
     /**
      * @param iterable<TKey, T> $iterable
      */
-    public function __construct(iterable $iterable)
+    public function __construct(private iterable $iterable)
     {
-        $this->iterable = $iterable;
     }
 
     /**
diff --git a/src/RandomIterableAggregate.php b/src/RandomIterableAggregate.php
@@ -25,15 +25,12 @@ final class RandomIterableAggregate implements IteratorAggregate
      */
     private PackIterableAggregate $iteratorAggregate;
 
-    private int $seed;
-
     /**
      * @param iterable<TKey, T> $iterable
      */
-    public function __construct(iterable $iterable, int $seed = 0)
+    public function __construct(iterable $iterable, private int $seed = 0)
     {
         $this->iteratorAggregate = new PackIterableAggregate($iterable);
-        $this->seed = $seed;
     }
 
     /**
@@ -56,7 +53,7 @@ private function randomize(iterable $iterable, int $seed): Generator
         $queue = [];
 
         foreach (new UnpackIterableAggregate($iterable) as $key => $value) {
-            if (0 === mt_rand(0, $seed)) {
+            if (0 === random_int(0, $seed)) {
                 yield $key => $value;
 
                 continue;
diff --git a/src/ReductionIterableAggregate.php b/src/ReductionIterableAggregate.php
@@ -27,26 +27,14 @@ final class ReductionIterableAggregate implements IteratorAggregate
      */
     private Closure $closure;
 
-    /**
-     * @var W
-     */
-    private mixed $initial;
-
-    /**
-     * @var iterable<TKey, T>
-     */
-    private iterable $iterable;
-
     /**
      * @param iterable<TKey, T> $iterable
      * @param (Closure(W, T, TKey, iterable<TKey, T>): W) $closure
      * @param W $initial
      */
-    public function __construct(iterable $iterable, Closure $closure, mixed $initial)
+    public function __construct(private iterable $iterable, Closure $closure, private mixed $initial)
     {
-        $this->iterable = $iterable;
         $this->closure = $closure;
-        $this->initial = $initial;
     }
 
     /**
diff --git a/src/ResourceIteratorAggregate.php b/src/ResourceIteratorAggregate.php
@@ -20,8 +20,6 @@
  */
 final class ResourceIteratorAggregate implements IteratorAggregate
 {
-    private bool $closeResource;
-
     /**
      * @var resource
      */
@@ -30,14 +28,13 @@ final class ResourceIteratorAggregate implements IteratorAggregate
     /**
      * @param false|resource $resource
      */
-    public function __construct($resource, bool $closeResource = false)
+    public function __construct($resource, private bool $closeResource = false)
     {
         if (!is_resource($resource) || 'stream' !== get_resource_type($resource)) {
             throw new InvalidArgumentException('Invalid resource type.');
         }
 
         $this->resource = $resource;
-        $this->closeResource = $closeResource;
     }
 
     /**
diff --git a/src/StringIteratorAggregate.php b/src/StringIteratorAggregate.php
@@ -17,14 +17,8 @@
  */
 final class StringIteratorAggregate implements IteratorAggregate
 {
-    private string $data;
-
-    private string $delimiter;
-
-    public function __construct(string $data, string $delimiter = '')
+    public function __construct(private string $data, private string $delimiter = '')
     {
-        $this->data = $data;
-        $this->delimiter = $delimiter;
     }
 
     /**
diff --git a/src/TypedIterableAggregate.php b/src/TypedIterableAggregate.php
@@ -13,7 +13,6 @@
 use InvalidArgumentException;
 use IteratorAggregate;
 
-use function get_class;
 use function gettype;
 use function is_object;
 
@@ -30,19 +29,12 @@ final class TypedIterableAggregate implements IteratorAggregate
      */
     private $getType;
 
-    /**
-     * @var iterable<TKey, T>
-     */
-    private iterable $iterable;
-
     /**
      * @param iterable<TKey, T> $iterable
      * @param callable(mixed): string $getType
      */
-    public function __construct(iterable $iterable, ?callable $getType = null)
+    public function __construct(private iterable $iterable, ?callable $getType = null)
     {
-        $this->iterable = $iterable;
-
         $this->getType = $getType ??
             static function (mixed $variable): string {
                 if (!is_object($variable)) {
@@ -52,7 +44,7 @@ static function (mixed $variable): string {
                 $interfaces = class_implements($variable);
 
                 if ([] === $interfaces || false === $interfaces) {
-                    return get_class($variable);
+                    return $variable::class;
                 }
 
                 sort($interfaces);
diff --git a/src/UniqueIterableAggregate.php b/src/UniqueIterableAggregate.php
diff --git a/src/UnpackIterableAggregate.php b/src/UnpackIterableAggregate.php
diff --git a/tests/benchmarks/ClosureIteratorAggregateBench.php b/tests/benchmarks/ClosureIteratorAggregateBench.php
diff --git a/tests/benchmarks/ClosureIteratorBench.php b/tests/benchmarks/ClosureIteratorBench.php
diff --git a/tests/static-analysis/closure-iterator.php b/tests/static-analysis/closure-iterator.php
diff --git a/tests/unit/StringIteratorAggregateTest.php b/tests/unit/StringIteratorAggregateTest.php

Original file line number	Diff line number	Diff line change
`@@ -22,17 +22,11 @@`
`22`	`22`	`*/`
`23`	`23`	`final class ConcatIterableAggregate implements IteratorAggregate`
`24`	`24`	`{`
`25`		`- /**`
`26`		`- * @var iterable<mixed, iterable<TKey, T>>`
`27`		`- */`
`28`		`- private iterable $iterables;`
`29`		`-`
`30`	`25`	`/**`
`31`	`26`	`* @param iterable<mixed, iterable<TKey, T>> $iterables`
`32`	`27`	`*/`
`33`		`- public function __construct(iterable $iterables)`
	`28`	`+ public function __construct(private iterable $iterables)`
`34`	`29`	`{`
`35`		`- $this->iterables = $iterables;`
`36`	`30`	`}`
`37`	`31`
`38`	`32`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -22,17 +22,11 @@ final class InterruptableIterableIteratorAggregate implements IteratorAggregate`
`22`	`22`	`{`
`23`	`23`	`public const BREAK = 'break';`
`24`	`24`
`25`		`- /**`
`26`		`- * @var iterable<TKey, T>`
`27`		`- */`
`28`		`- private iterable $iterable;`
`29`		`-`
`30`	`25`	`/**`
`31`	`26`	`* @param iterable<TKey, T> $iterable`
`32`	`27`	`*/`
`33`		`- public function __construct(iterable $iterable)`
	`28`	`+ public function __construct(private iterable $iterable)`
`34`	`29`	`{`
`35`		`- $this->iterable = $iterable;`
`36`	`30`	`}`
`37`	`31`
`38`	`32`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -20,17 +20,11 @@`
`20`	`20`	`*/`
`21`	`21`	`final class IterableIteratorAggregate implements IteratorAggregate`
`22`	`22`	`{`
`23`		`- /**`
`24`		`- * @var iterable<TKey, T>`
`25`		`- */`
`26`		`- private iterable $iterable;`
`27`		`-`
`28`	`23`	`/**`
`29`	`24`	`* @param iterable<TKey, T> $iterable`
`30`	`25`	`*/`
`31`		`- public function __construct(iterable $iterable)`
	`26`	`+ public function __construct(private iterable $iterable)`
`32`	`27`	`{`
`33`		`- $this->iterable = $iterable;`
`34`	`28`	`}`
`35`	`29`
`36`	`30`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function getIterator(): Generator`
`37`	`37`
`38`	`38`	`// @phpstan-ignore-next-line`
`39`	`39`	`while (true) {`
`40`		`- yield mt_rand($this->min, $this->max);`
	`40`	`+ yield random_int($this->min, $this->max);`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,6 @@`
`20`	`20`	`*/`
`21`	`21`	`final class ResourceIteratorAggregate implements IteratorAggregate`
`22`	`22`	`{`
`23`		`- private bool $closeResource;`
`24`		`-`
`25`	`23`	`/**`
`26`	`24`	`* @var resource`
`27`	`25`	`*/`
`@@ -30,14 +28,13 @@ final class ResourceIteratorAggregate implements IteratorAggregate`
`30`	`28`	`/**`
`31`	`29`	`* @param false\|resource $resource`
`32`	`30`	`*/`
`33`		`- public function __construct($resource, bool $closeResource = false)`
	`31`	`+ public function __construct($resource, private bool $closeResource = false)`
`34`	`32`	`{`
`35`	`33`	`if (!is_resource($resource) \|\| 'stream' !== get_resource_type($resource)) {`
`36`	`34`	`throw new InvalidArgumentException('Invalid resource type.');`
`37`	`35`	`}`
`38`	`36`
`39`	`37`	`$this->resource = $resource;`
`40`		`- $this->closeResource = $closeResource;`
`41`	`38`	`}`
`42`	`39`
`43`	`40`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -17,14 +17,8 @@`
`17`	`17`	`*/`
`18`	`18`	`final class StringIteratorAggregate implements IteratorAggregate`
`19`	`19`	`{`
`20`		`- private string $data;`
`21`		`-`
`22`		`- private string $delimiter;`
`23`		`-`
`24`		`- public function __construct(string $data, string $delimiter = '')`
	`20`	`+ public function __construct(private string $data, private string $delimiter = '')`
`25`	`21`	`{`
`26`		`- $this->data = $data;`
`27`		`- $this->delimiter = $delimiter;`
`28`	`22`	`}`
`29`	`23`
`30`	`24`	`/**`