Reduce PSALM warnings.

loophp · Jun 9, 2020 · 7ffef09 · 7ffef09
1 parent affab6c
commit 7ffef09
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 17 deletions.
diff --git a/spec/loophp/collection/Iterator/ClosureIteratorSpec.php b/spec/loophp/collection/Iterator/ClosureIteratorSpec.php
@@ -47,7 +47,9 @@ public function it_can_rewind()
             ->shouldReturn('foo');
 
         $this
-            ->next()
+            ->next();
+
+        $this
             ->current()
             ->shouldReturn(null);
 
@@ -67,7 +69,7 @@ public function it_can_use_next(): void
 
         $this
             ->next()
-            ->shouldReturn($this);
+            ->shouldBeNull();
 
         $this
             ->current()

diff --git a/spec/loophp/collection/Iterator/IterableIteratorSpec.php b/spec/loophp/collection/Iterator/IterableIteratorSpec.php
@@ -37,12 +37,16 @@ public function it_can_rewind()
             ->shouldReturn('foo');
 
         $this
-            ->next()
+            ->next();
+
+        $this
             ->current()
             ->shouldReturn(null);
 
         $this
-            ->rewind()
+            ->rewind();
+
+        $this
             ->current()
             ->shouldReturn('foo');
     }
@@ -54,7 +58,7 @@ public function it_can_use_next(): void
 
         $this
             ->next()
-            ->shouldReturn($this);
+            ->shouldBeNull();
 
         $this
             ->current()

diff --git a/src/Contract/Transformation.php b/src/Contract/Transformation.php
@@ -12,7 +12,7 @@ interface Transformation
     /**
      * @param iterable<mixed> $collection
      *
-     * @return iterable|mixed
+     * @return mixed
      */
     public function __invoke(iterable $collection);
 }
diff --git a/src/Contract/Transformation/Transformable.php b/src/Contract/Transformation/Transformable.php
@@ -14,7 +14,7 @@ interface Transformable
     /**
      * @param \loophp\collection\Contract\Transformation ...$transformers
      *
-     * @return mixed
+     * @return \loophp\collection\Iterator\ClosureIterator|mixed
      */
     public function transform(Transformation ...$transformers);
 }
diff --git a/src/Iterator/ClosureIterator.php b/src/Iterator/ClosureIterator.php
@@ -62,13 +62,11 @@ public function key()
     /**
      * {@inheritdoc}
      *
-     * @return \loophp\collection\Iterator\ClosureIterator
+     * @return void
      */
     public function next()
     {
         $this->getGenerator()->next();
-
-        return $this;
     }
 
     /**

diff --git a/src/Iterator/IterableIterator.php b/src/Iterator/IterableIterator.php
@@ -56,25 +56,21 @@ public function key()
     /**
      * {@inheritdoc}
      *
-     * @return \loophp\collection\Iterator\IterableIterator
+     * @return void
      */
     public function next()
     {
         $this->iterator->next();
-
-        return $this;
     }
 
     /**
      * {@inheritdoc}
      *
-     * @return \loophp\collection\Iterator\IterableIterator
+     * @return void
      */
     public function rewind()
     {
         $this->iterator->rewind();
-
-        return $this;
     }
 
     /**

diff --git a/src/Transformation/All.php b/src/Transformation/All.php
@@ -14,8 +14,10 @@ final class All implements Transformation
 {
     /**
      * {@inheritdoc}
+     *
+     * @return mixed[]
      */
-    public function __invoke(iterable $collection)
+    public function __invoke(iterable $collection): array
     {
         return iterator_to_array(new IterableIterator($collection));
     }