Fix array helpers

Without using any other packages.

Author: sebastiaanluca

src/Functions/generic.php

@@ -2,6 +2,7 @@
 
 use Carbon\Carbon;
 use SebastiaanLuca\PhpHelpers\Classes\MethodHelper;
+use SebastiaanLuca\PhpHelpers\InternalHelpers;
 
 if (! function_exists('rand_bool')) {
     /**
@@ -64,8 +65,7 @@ function array_expand(array $array) : array
         $expanded = [];
 
         foreach ($array as $key => $value) {
-            // FIXME
-            array_set($expanded, $key, $value);
+            InternalHelpers::arraySet($expanded, $key, $value);
         }
 
         return $expanded;
@@ -83,8 +83,9 @@ function array_expand(array $array) : array
      */
     function array_without(array $array, $values) : array
     {
-        // FIXME
-        return array_values(array_diff($array, array_wrap($values)));
+        $values = ! is_array($values) ? [$values] : $values;
+
+        return array_values(array_diff($array, $values));
     }
 }
 

src/InternalHelpers.php

@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SebastiaanLuca\PhpHelpers;
+
+class InternalHelpers
+{
+    /**
+     * Set an array item to a given value using "dot" notation.
+     *
+     * If no key is given to the method, the entire array will be replaced.
+     *
+     * @param array $array
+     * @param string $key
+     * @param mixed $value
+     *
+     * @return array
+     */
+    public static function arraySet(array &$array, string $key, $value) : array
+    {
+        $keys = explode('.', $key);
+
+        while (count($keys) > 1) {
+            $key = array_shift($keys);
+
+            // If the key doesn't exist at this depth, we will just create an empty array
+            // to hold the next value, allowing us to create the arrays to hold final
+            // values at the correct depth. Then we'll keep digging into the array.
+            if (! isset($array[$key]) || ! is_array($array[$key])) {
+                $array[$key] = [];
+            }
+
+            $array = &$array[$key];
+        }
+
+        $array[array_shift($keys)] = $value;
+
+        return $array;
+    }
+}