refactoring

Author: brenoroosevelt

composer.json

@@ -39,6 +39,7 @@
             "src/Expand.php",
             "src/First.php",
             "src/Flatten.php",
+            "src/Has.php",
             "src/IndexOf.php",
             "src/Map.php",
             "src/None.php",

src/Add.php

@@ -9,12 +9,14 @@
  * This function uses strict comparison to determine if element exists
  *
  * @param  array $set         The collection
+ * @param  mixed $element Element to be added
  * @param  mixed ...$elements Elements to be added
  * @return int The number of items added to the collection
  */
-function add(array &$set, ...$elements): int
+function add(array &$set, $element, ...$elements): int
 {
     $added = 0;
+    array_unshift($elements, $element);
     foreach ($elements as $element) {
         if (! in_array($element, $set, true)) {
             $set[] = $element;

src/Has.php

@@ -0,0 +1,18 @@
+<?php
+declare(strict_types=1);
+
+namespace BrenoRoosevelt;
+
+/**
+ * Determine if all given keys are present in the haystack.
+ *
+ * @param array $haystack The collection
+ * @param string|int $key keys be to checked
+ * @param string|int ...$keys keys be to checked
+ * @return bool
+ */
+function has(array $haystack, $key, ...$keys): bool
+{
+    $keys[] = $key;
+    return ! array_diff($keys, array_keys($haystack));
+}

src/Remove.php

@@ -11,12 +11,14 @@
  * remove($set, 1, 3) will return 3 (int) and $set will contain [2, 4]
  *
  * @param  array $set         The collection
+ * @param  mixed $element Element to be removed
  * @param  mixed ...$elements Elements to be removed
  * @return int The number of removed elements
  */
-function remove(array &$set, ...$elements): int
+function remove(array &$set, $element, ...$elements): int
 {
     $removed = 0;
+    $elements[] = $element;
     foreach ($elements as $element) {
         foreach (array_keys($set, $element, true) as $index) {
             unset($set[$index]);

src/RemoveKey.php

@@ -7,12 +7,14 @@
  * Remove elements by keys
  *
  * @param array $set The collection
+ * @param string|int $key The key to be removed
  * @param string|int ...$keys The keys to be removed
  * @return int The number of removed elements
  */
-function remove_key(array &$set, ...$keys): int
+function remove_key(array &$set, $key, ...$keys): int
 {
     $removed = 0;
+    $keys[] = $key;
     foreach ($keys as $key) {
         if (array_key_exists($key, $set)) {
             unset($set[$key]);

src/array_functions.php

@@ -3,11 +3,6 @@
 
 namespace BrenoRoosevelt;
 
-function has(array $items, ...$keys): bool
-{
-    return ! array_diff($keys, array_keys($items));
-}
-
 function only(array $items, ...$keys): array
 {
     return array_intersect_key($items, array_flip($keys));

tests/AddTest.php

@@ -26,11 +26,6 @@ public function addProvider(): array
                 ['d', 'd', 'a', 'c'],
                 ['a', 'b', 'c', 'd'],
             ],
-            'case_4' => [
-                ['a', 'b', 'c'],
-                [],
-                ['a', 'b', 'c'],
-            ],
             'case_5' => [
                 ['x' => 'a', 'y' => 'b', 'c'],
                 ['x', 'y', 'a', 'b', 'b'],

tests/HasTest.php

@@ -0,0 +1,59 @@
+<?php
+declare(strict_types=1);
+
+namespace BrenoRoosevelt\Tests;
+
+use PHPUnit\Framework\TestCase;
+use function BrenoRoosevelt\has;
+
+class HasTest extends TestCase
+{
+    public function hasKeyProvider(): array
+    {
+        return [
+            'case_1' => [
+                [0, 1, 2], // haystack
+                [0], // keys
+                true // expected
+            ],
+            'case_2' => [
+                [0, 1, 2], // haystack
+                [1, 2], // keys
+                true // expected
+            ],
+            'case_3' => [
+                ['a' => 0, 'b' => 1, 2], // haystack
+                [0], // keys
+                true // expected
+            ],
+            'case_4' => [
+                ['a' => 0, 'b' => 1, 2], // haystack
+                [1], // keys
+                false // expected
+            ],
+            'case_5' => [
+                ['a' => 0, 'b' => 1, 2], // haystack
+                ['a', 'b', 8], // keys
+                false // expected
+            ],
+            'case_6' => [
+                [], // haystack
+                [0], // keys
+                false // expected
+            ]
+        ];
+    }
+
+    /**
+     * @param array $haystack
+     * @param array $keys
+     * @param bool $expected
+     * @return void
+     * @dataProvider hasKeyProvider
+     */
+    public function testHasKey(array $haystack, array $keys, bool $expected): void
+    {
+        $actual = has($haystack, ...$keys);
+        $this->assertEquals($expected, $actual);
+    }
+}