style: use constructor property promotion style

loophp · Mar 5, 2023 · 2568d7f · 2568d7f
1 parent 517e1cc
commit 2568d7f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 29 deletions.
diff --git a/src/FilterIterableAggregate.php b/src/FilterIterableAggregate.php
@@ -21,18 +21,12 @@
  */
 final class FilterIterableAggregate implements IteratorAggregate
 {
-    /**
-     * @var Closure(T, TKey, iterable<TKey, T>): bool
-     */
-    private Closure $predicate;
-
     /**
      * @param iterable<TKey, T> $iterable
      * @param (Closure(T, TKey, iterable<TKey, T>): bool) $predicate
      */
-    public function __construct(private iterable $iterable, Closure $predicate)
+    public function __construct(private iterable $iterable, private Closure $predicate)
     {
-        $this->predicate = $predicate;
     }
 
     /**

diff --git a/src/MapIterableAggregate.php b/src/MapIterableAggregate.php
@@ -22,18 +22,12 @@
  */
 final class MapIterableAggregate implements IteratorAggregate
 {
-    /**
-     * @var Closure(T, TKey, iterable<TKey, T>): W
-     */
-    private Closure $closure;
-
     /**
      * @param iterable<TKey, T> $iterable
      * @param (Closure(T, TKey, iterable<TKey, T>): W) $closure
      */
-    public function __construct(private iterable $iterable, Closure $closure)
+    public function __construct(private iterable $iterable, private Closure $closure)
     {
-        $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/ReduceIterableAggregate.php b/src/ReduceIterableAggregate.php
@@ -22,19 +22,13 @@
  */
 final class ReduceIterableAggregate implements IteratorAggregate
 {
-    /**
-     * @var Closure(W, T, TKey, iterable<TKey, T>): W
-     */
-    private Closure $closure;
-
     /**
      * @param iterable<TKey, T> $iterable
      * @param (Closure(W, T, TKey, iterable<TKey, T>): W) $closure
      * @param W $initial
      */
-    public function __construct(private iterable $iterable, Closure $closure, private mixed $initial)
+    public function __construct(private iterable $iterable, private Closure $closure, private mixed $initial)
     {
-        $this->closure = $closure;
     }
 
     /**

diff --git a/src/ReductionIterableAggregate.php b/src/ReductionIterableAggregate.php
@@ -22,19 +22,13 @@
  */
 final class ReductionIterableAggregate implements IteratorAggregate
 {
-    /**
-     * @var Closure(W, T, TKey, iterable<TKey, T>): W
-     */
-    private Closure $closure;
-
     /**
      * @param iterable<TKey, T> $iterable
      * @param (Closure(W, T, TKey, iterable<TKey, T>): W) $closure
      * @param W $initial
      */
-    public function __construct(private iterable $iterable, Closure $closure, private mixed $initial)
+    public function __construct(private iterable $iterable, private Closure $closure, private mixed $initial)
     {
-        $this->closure = $closure;
     }
 
     /**