fix: Equals operation, fix typing information.

loophp · Jul 10, 2022 · eff8102 · eff8102
1 parent 5a91d8a
commit eff8102
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 18 deletions.
diff --git a/src/Contract/Collection.php b/src/Contract/Collection.php
@@ -166,7 +166,6 @@
  * @template-extends DropWhileable<TKey, T>
  * @template-extends Dumpable<TKey, T>
  * @template-extends Duplicateable<TKey, T>
- * @template-extends Equalsable<TKey, T>
  * @template-extends Everyable<TKey, T>
  * @template-extends Explodeable<TKey, T>
  * @template-extends Falsyable<TKey, T>

diff --git a/src/Contract/Operation/Equalsable.php b/src/Contract/Operation/Equalsable.php
@@ -9,12 +9,6 @@
 
 namespace loophp\collection\Contract\Operation;
 
-use loophp\collection\Contract\Collection;
-
-/**
- * @template TKey
- * @template T
- */
 interface Equalsable
 {
     /**
@@ -27,7 +21,7 @@ interface Equalsable
      *
      * @see https://loophp-collection.readthedocs.io/en/stable/pages/api.html#equals
      *
-     * @param iterable<TKey, T> $other
+     * @param iterable<mixed, mixed> $other
      */
     public function equals(iterable $other): bool;
 }
diff --git a/src/Operation/Equals.php b/src/Operation/Equals.php
@@ -16,29 +16,26 @@
 /**
  * @immutable
  *
- * @template TKey
- * @template T
- *
  * phpcs:disable Generic.Files.LineLength.TooLong
  */
 final class Equals extends AbstractOperation
 {
     /**
-     * @return Closure(iterable<TKey, T>): Closure(iterable<TKey, T>): Generator<int|TKey, bool>
+     * @return Closure(iterable<mixed, mixed>): Closure(iterable<mixed, mixed>): Generator<int, bool, mixed, false|mixed>
      */
     public function __invoke(): Closure
     {
         return
             /**
-             * @param iterable<TKey, T> $other
+             * @param iterable<mixed, mixed> $other
              *
-             * @return Closure(iterable<TKey, T>): Generator<int|TKey, bool>
+             * @return Closure(iterable<mixed, mixed>): Generator<int, bool, mixed, false|mixed>
              */
             static function (iterable $other): Closure {
                 /**
-                 * @param iterable<TKey, T> $iterable
+                 * @param iterable<mixed, mixed> $iterable
                  *
-                 * @return Generator<int|TKey, bool>
+                 * @return Generator<int, bool, mixed, false|mixed>
                  */
                 return static function (iterable $iterable) use ($other): Generator {
                     $otherAggregate = new IterableIteratorAggregate($other);
@@ -58,7 +55,7 @@ static function (iterable $other): Closure {
 
                     $containsCallback =
                         /**
-                         * @param T $current
+                         * @param mixed $current
                          */
                         static fn (int $index, $current): bool => (new Contains())()($current)($otherAggregate)->current();
 

diff --git a/tests/static-analysis/equals.php b/tests/static-analysis/equals.php
@@ -33,7 +33,7 @@ function equals_check(bool $value): void
 
 /** @psalm-suppress InvalidArgument -> Psalm narrows the types to 1|2|3 and 4|5 and knows these cannot work */
 equals_check(Collection::fromIterable([1, 2, 3])->equals(Collection::fromIterable([4, 5])));
-/** @psalm-suppress InvalidArgument @phpstan-ignore-next-line */
+/** @psalm-suppress InvalidArgument */
 equals_check(Collection::fromIterable([1, 2, 3])->equals(Collection::fromIterable(['a', 'b'])));
 /** @psalm-suppress InvalidArgument -> Psalm sees the keys and values are completely different */
 equals_check(Collection::fromIterable(['foo' => 'f', 'bar' => 'b'])->equals(Collection::fromIterable(['other' => 'x'])));