Replace Only with IntersectKeys operation.

loophp · Sep 8, 2020 · 78a20a3 · 78a20a3
1 parent 841a7c5
commit 78a20a3
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 95 deletions.
diff --git a/spec/loophp/collection/CollectionSpec.php b/spec/loophp/collection/CollectionSpec.php
@@ -838,17 +838,6 @@ public function it_can_get_current()
             ->shouldReturn(null);
     }
 
-    public function it_can_get_items_with_only_specific_keys(): void
-    {
-        $this::fromIterable(range('A', 'E'))
-            ->only(0, 1, 3)
-            ->shouldIterateAs([0 => 'A', 1 => 'B', 3 => 'D']);
-
-        $this::fromIterable(range('A', 'E'))
-            ->only()
-            ->shouldIterateAs([0 => 'A', 1 => 'B', 2 => 'C', 3 => 'D', 4 => 'E']);
-    }
-
     public function it_can_get_key()
     {
         $input = array_combine(range('A', 'E'), range('A', 'E'));
@@ -1067,6 +1056,14 @@ public function it_can_intersectKeys(): void
         $this::fromIterable($input)
             ->intersectKeys()
             ->shouldIterateAs([]);
+
+        $this::fromIterable(range('A', 'E'))
+            ->intersectKeys(0, 1, 3)
+            ->shouldIterateAs([0 => 'A', 1 => 'B', 3 => 'D']);
+
+        $this::fromIterable(range('A', 'E'))
+            ->intersectKeys()
+            ->shouldIterateAs([]);
     }
 
     public function it_can_intersperse(): void

diff --git a/src/Collection.php b/src/Collection.php
@@ -60,7 +60,6 @@
 use loophp\collection\Operation\Normalize;
 use loophp\collection\Operation\Nth;
 use loophp\collection\Operation\Nullsy;
-use loophp\collection\Operation\Only;
 use loophp\collection\Operation\Pack;
 use loophp\collection\Operation\Pad;
 use loophp\collection\Operation\Pair;
@@ -563,11 +562,6 @@ public function nullsy(): bool
         return $this->run(Nullsy::of())->getIterator()->current();
     }
 
-    public function only(...$keys): CollectionInterface
-    {
-        return $this->run(Only::of()(...$keys));
-    }
-
     public function pack(): CollectionInterface
     {
         return $this->run(Pack::of());

diff --git a/src/Contract/Collection.php b/src/Contract/Collection.php
@@ -54,7 +54,6 @@
 use loophp\collection\Contract\Operation\Normalizeable;
 use loophp\collection\Contract\Operation\Nthable;
 use loophp\collection\Contract\Operation\Nullsyable;
-use loophp\collection\Contract\Operation\Onlyable;
 use loophp\collection\Contract\Operation\Packable;
 use loophp\collection\Contract\Operation\Padable;
 use loophp\collection\Contract\Operation\Pairable;
@@ -139,7 +138,6 @@
  * @template-extends Mergeable<TKey, T>
  * @template-extends Normalizeable<TKey, T>
  * @template-extends Nthable<TKey, T>
- * @template-extends Onlyable<TKey, T>
  * @template-extends Packable<TKey, T>
  * @template-extends Padable<TKey, T>
  * @template-extends Pairable<TKey, T>
@@ -223,7 +221,6 @@ interface Collection extends
     Normalizeable,
     Nthable,
     Nullsyable,
-    Onlyable,
     Packable,
     Padable,
     Pairable,

diff --git a/src/Contract/Operation/Onlyable.php b/src/Contract/Operation/Onlyable.php
diff --git a/src/Operation/Only.php b/src/Operation/Only.php