antonioribeiro / ia-arr

src/Support/Collection.php

Unused Use Statements +8 added lines, -8 removed lines

@@ -2,19 +2,19 @@
 
 namespace IlluminateAgnostic\Arr\Support;
 
-use stdClass;
-use Countable;
-use Exception;
 use ArrayAccess;
-use Traversable;
 use ArrayIterator;
 use CachingIterator;
-use JsonSerializable;
-use IteratorAggregate;
+use Countable;
+use Exception;
+use IlluminateAgnostic\Arr\Contracts\Support\Arrayable;
+use IlluminateAgnostic\Arr\Contracts\Support\Jsonable;
 use IlluminateAgnostic\Arr\Support\Debug\Dumper;
 use IlluminateAgnostic\Arr\Support\Traits\Macroable;
-use IlluminateAgnostic\Arr\Contracts\Support\Jsonable;
-use IlluminateAgnostic\Arr\Contracts\Support\Arrayable;
+use IteratorAggregate;
+use JsonSerializable;
+use Traversable;
+use stdClass;
 
 class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate, Jsonable, JsonSerializable
 {

Doc Comments +7 added lines, -7 removed lines

@@ -209,7 +209,7 @@ 
     /**
      * Determine if an item exists in the collection.
      *
-     * @param  mixed  $key
+     * @param  \Closure  $key
      * @param  mixed  $operator
      * @param  mixed  $value
      * @return bool
@@ -452,7 +452,7 @@ 
      * Filter items by the given key value pair.
      *
      * @param  string  $key
-     * @param  mixed  $operator
+     * @param  string  $operator
      * @param  mixed  $value
      * @return static
      */
@@ -578,7 +578,7 @@ 
      * Get the first item from the collection.
      *
      * @param  callable|null  $callback
-     * @param  mixed  $default
+     * @param  stdClass  $default
      * @return mixed
      */
     public function first(callable $callback = null, $default = null)
@@ -638,7 +638,7 @@ 
     /**
      * Get an item from the collection by key.
      *
-     * @param  mixed  $key
+     * @param  integer  $key
      * @param  mixed  $default
      * @return mixed
      */
@@ -1234,7 +1234,7 @@ 
      * Reduce the collection to a single value.
      *
      * @param  callable  $callback
-     * @param  mixed  $initial
+     * @param  integer  $initial
      * @return mixed
      */
     public function reduce(callable $callback, $initial = null)
@@ -1245,7 +1245,7 @@ 
     /**
      * Create a collection of all elements that do not pass a given truth test.
      *
-     * @param  callable|mixed  $callback
+     * @param  \Closure  $callback
      * @return static
      */
     public function reject($callback)
@@ -1793,7 +1793,7 @@ 
      * Dynamically access collection proxies.
      *
      * @param  string  $key
-     * @return mixed
+     * @return HigherOrderCollectionProxy
      *
      * @throws \Exception
      */

Spacing +42 added lines, -42 removed lines

@@ -183,7 +183,7 @@ 
 
         $counts = new self;
 
-        $collection->each(function ($value) use ($counts) {
+        $collection->each(function($value) use ($counts) {
             $counts[$value] = isset($counts[$value]) ? $counts[$value] + 1 : 1;
         });
 
@@ -191,7 +191,7 @@ 
 
         $highestValue = $sorted->last();
 
-        return $sorted->filter(function ($value) use ($highestValue) {
+        return $sorted->filter(function($value) use ($highestValue) {
             return $value == $highestValue;
         })->sort()->keys()->all();
     }
@@ -239,13 +239,13 @@ 
     public function containsStrict($key, $value = null)
     {
         if (func_num_args() == 2) {
-            return $this->contains(function ($item) use ($key, $value) {
+            return $this->contains(function($item) use ($key, $value) {
                 return data_get($item, $key) === $value;
             });
         }
 
         if ($this->useAsCallable($key)) {
-            return ! is_null($this->first($key));
+            return !is_null($this->first($key));
         }
 
         return in_array($key, $this->items, true);
@@ -287,7 +287,7 @@ 
     {
         (new static(func_get_args()))
             ->push($this)
-            ->each(function ($item) {
+            ->each(function($item) {
                 (new Dumper)->dump($item);
             });
 
@@ -388,7 +388,7 @@ 
      */
     public function eachSpread(callable $callback)
     {
-        return $this->each(function ($chunk, $key) use ($callback) {
+        return $this->each(function($chunk, $key) use ($callback) {
             $chunk[] = $key;
 
             return $callback(...$chunk);
@@ -409,7 +409,7 @@ 
             $callback = $this->valueRetriever($key);
 
             foreach ($this->items as $k => $v) {
-                if (! $callback($v, $k)) {
+                if (!$callback($v, $k)) {
                     return false;
                 }
             }
@@ -430,7 +430,7 @@ 
     {
         if ($keys instanceof self) {
             $keys = $keys->all();
-        } elseif (! is_array($keys)) {
+        } elseif (!is_array($keys)) {
             $keys = func_get_args();
         }
 
@@ -481,7 +481,7 @@ 
      */
     public function unless($value, callable $callback, callable $default = null)
     {
-        return $this->when(! $value, $callback, $default);
+        return $this->when(!$value, $callback, $default);
     }
 
     /**
@@ -513,10 +513,10 @@ 
             $operator = '=';
         }
 
-        return function ($item) use ($key, $operator, $value) {
+        return function($item) use ($key, $operator, $value) {
             $retrieved = data_get($item, $key);
 
-            $strings = array_filter([$retrieved, $value], function ($value) {
+            $strings = array_filter([$retrieved, $value], function($value) {
                 return is_string($value) || (is_object($value) && method_exists($value, '__toString'));
             });
 
@@ -564,7 +564,7 @@ 
     {
         $values = $this->getArrayableItems($values);
 
-        return $this->filter(function ($item) use ($key, $values, $strict) {
+        return $this->filter(function($item) use ($key, $values, $strict) {
             return in_array(data_get($item, $key), $values, $strict);
         });
     }
@@ -593,7 +593,7 @@ 
     {
         $values = $this->getArrayableItems($values);
 
-        return $this->reject(function ($item) use ($key, $values, $strict) {
+        return $this->reject(function($item) use ($key, $values, $strict) {
             return in_array(data_get($item, $key), $values, $strict);
         });
     }
@@ -618,7 +618,7 @@ 
      */
     public function whereInstanceOf($type)
     {
-        return $this->filter(function ($value) use ($type) {
+        return $this->filter(function($value) use ($type) {
             return $value instanceof $type;
         });
     }
@@ -722,14 +722,14 @@ 
         foreach ($this->items as $key => $value) {
             $groupKeys = $groupBy($value, $key);
 
-            if (! is_array($groupKeys)) {
+            if (!is_array($groupKeys)) {
                 $groupKeys = [$groupKeys];
             }
 
             foreach ($groupKeys as $groupKey) {
                 $groupKey = is_bool($groupKey) ? (int) $groupKey : $groupKey;
 
-                if (! array_key_exists($groupKey, $results)) {
+                if (!array_key_exists($groupKey, $results)) {
                     $results[$groupKey] = new static;
                 }
 
@@ -739,7 +739,7 @@ 
 
         $result = new static($results);
 
-        if (! empty($nextGroups)) {
+        if (!empty($nextGroups)) {
             return $result->map->groupBy($nextGroups, $preserveKeys);
         }
 
@@ -782,7 +782,7 @@ 
         $keys = is_array($key) ? $key : func_get_args();
 
         foreach ($keys as $value) {
-            if (! $this->offsetExists($value)) {
+            if (!$this->offsetExists($value)) {
                 return false;
             }
         }
@@ -849,7 +849,7 @@ 
      */
     public function isNotEmpty()
     {
-        return ! $this->isEmpty();
+        return !$this->isEmpty();
     }
 
     /**
@@ -860,7 +860,7 @@ 
      */
     protected function useAsCallable($value)
     {
-        return ! is_string($value) && is_callable($value);
+        return !is_string($value) && is_callable($value);
     }
 
     /**
@@ -920,7 +920,7 @@ 
      */
     public function mapSpread(callable $callback)
     {
-        return $this->map(function ($chunk, $key) use ($callback) {
+        return $this->map(function($chunk, $key) use ($callback) {
             $chunk[] = $key;
 
             return $callback(...$chunk);
@@ -946,7 +946,7 @@ 
 
             $value = reset($pair);
 
-            if (! isset($dictionary[$key])) {
+            if (!isset($dictionary[$key])) {
                 $dictionary[$key] = [];
             }
 
@@ -1013,7 +1013,7 @@ 
      */
     public function mapInto($class)
     {
-        return $this->map(function ($value, $key) use ($class) {
+        return $this->map(function($value, $key) use ($class) {
             return new $class($value, $key);
         });
     }
@@ -1028,9 +1028,9 @@ 
     {
         $callback = $this->valueRetriever($callback);
 
-        return $this->filter(function ($value) {
-            return ! is_null($value);
-        })->reduce(function ($result, $item) use ($callback) {
+        return $this->filter(function($value) {
+            return !is_null($value);
+        })->reduce(function($result, $item) use ($callback) {
             $value = $callback($item);
 
             return is_null($result) || $value > $result ? $value : $result;
@@ -1080,9 +1080,9 @@ 
     {
         $callback = $this->valueRetriever($callback);
 
-        return $this->filter(function ($value) {
-            return ! is_null($value);
-        })->reduce(function ($result, $item) use ($callback) {
+        return $this->filter(function($value) {
+            return !is_null($value);
+        })->reduce(function($result, $item) use ($callback) {
             $value = $callback($item);
 
             return is_null($result) || $value < $result ? $value : $result;
@@ -1165,7 +1165,7 @@ 
                 : $this->operatorForWhere(...func_get_args());
 
         foreach ($this->items as $key => $item) {
-            $partitions[(int) ! $callback($item, $key)][$key] = $item;
+            $partitions[(int) !$callback($item, $key)][$key] = $item;
         }
 
         return new static($partitions);
@@ -1300,12 +1300,12 @@ 
     public function reject($callback)
     {
         if ($this->useAsCallable($callback)) {
-            return $this->filter(function ($value, $key) use ($callback) {
-                return ! $callback($value, $key);
+            return $this->filter(function($value, $key) use ($callback) {
+                return !$callback($value, $key);
             });
         }
 
-        return $this->filter(function ($item) use ($callback) {
+        return $this->filter(function($item) use ($callback) {
             return $item != $callback;
         });
     }
@@ -1329,7 +1329,7 @@ 
      */
     public function search($value, $strict = false)
     {
-        if (! $this->useAsCallable($value)) {
+        if (!$this->useAsCallable($value)) {
             return array_search($value, $this->items, $strict);
         }
 
@@ -1534,7 +1534,7 @@ 
 
         $callback = $this->valueRetriever($callback);
 
-        return $this->reduce(function ($result, $item) use ($callback) {
+        return $this->reduce(function($result, $item) use ($callback) {
             return $result + $callback($item);
         }, 0);
     }
@@ -1593,7 +1593,7 @@ 
 
         $exists = [];
 
-        return $this->reject(function ($item, $key) use ($callback, $strict, &$exists) {
+        return $this->reject(function($item, $key) use ($callback, $strict, &$exists) {
             if (in_array($id = $callback($item, $key), $exists, $strict)) {
                 return true;
             }
@@ -1635,7 +1635,7 @@ 
             return $value;
         }
 
-        return function ($item) use ($value) {
+        return function($item) use ($value) {
             return data_get($item, $value);
         };
     }
@@ -1651,11 +1651,11 @@ 
      */
     public function zip($items)
     {
-        $arrayableItems = array_map(function ($items) {
+        $arrayableItems = array_map(function($items) {
             return $this->getArrayableItems($items);
         }, func_get_args());
 
-        $params = array_merge([function () {
+        $params = array_merge([function() {
             return new static(func_get_args());
         }, $this->items], $arrayableItems);
 
@@ -1681,7 +1681,7 @@ 
      */
     public function toArray()
     {
-        return array_map(function ($value) {
+        return array_map(function($value) {
             return $value instanceof Arrayable ? $value->toArray() : $value;
         }, $this->items);
     }
@@ -1693,7 +1693,7 @@ 
      */
     public function jsonSerialize()
     {
-        return array_map(function ($value) {
+        return array_map(function($value) {
             if ($value instanceof JsonSerializable) {
                 return $value->jsonSerialize();
             } elseif ($value instanceof Jsonable) {
@@ -1863,7 +1863,7 @@ 
      */
     public function __get($key)
     {
-        if (! in_array($key, static::$proxies)) {
+        if (!in_array($key, static::$proxies)) {
             throw new Exception("Property [{$key}] does not exist on this collection instance.");
         }
 

src/Support/helpers.php

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 use IlluminateAgnostic\Arr\Support\Arr;
 use IlluminateAgnostic\Arr\Support\Collection;
 use IlluminateAgnostic\Arr\Support\Debug\Dumper;
-use Illuminate\Support\Collection as IlluminateCollection;
 
 if (! function_exists('array_add')) {
     /**

Spacing +34 added lines, -34 removed lines

@@ -5,7 +5,7 @@ 
 use IlluminateAgnostic\Arr\Support\Debug\Dumper;
 use Illuminate\Support\Collection as IlluminateCollection;
 
-if (! function_exists('array_add')) {
+if (!function_exists('array_add')) {
     /**
      * Add an element to an array using "dot" notation if it doesn't exist.
      *
@@ -20,7 +20,7 @@ 
     }
 }
 
-if (! function_exists('array_collapse')) {
+if (!function_exists('array_collapse')) {
     /**
      * Collapse an array of arrays into a single array.
      *
@@ -33,7 +33,7 @@ 
     }
 }
 
-if (! function_exists('array_divide')) {
+if (!function_exists('array_divide')) {
     /**
      * Divide an array into two arrays. One with keys and the other with values.
      *
@@ -46,7 +46,7 @@ 
     }
 }
 
-if (! function_exists('array_dot')) {
+if (!function_exists('array_dot')) {
     /**
      * Flatten a multi-dimensional associative array with dots.
      *
@@ -60,7 +60,7 @@ 
     }
 }
 
-if (! function_exists('array_except')) {
+if (!function_exists('array_except')) {
     /**
      * Get all of the given array except for a specified array of keys.
      *
@@ -74,7 +74,7 @@ 
     }
 }
 
-if (! function_exists('array_first')) {
+if (!function_exists('array_first')) {
     /**
      * Return the first element in an array passing a given truth test.
      *
@@ -89,7 +89,7 @@ 
     }
 }
 
-if (! function_exists('array_flatten')) {
+if (!function_exists('array_flatten')) {
     /**
      * Flatten a multi-dimensional array into a single level.
      *
@@ -103,7 +103,7 @@ 
     }
 }
 
-if (! function_exists('array_forget')) {
+if (!function_exists('array_forget')) {
     /**
      * Remove one or many array items from a given array using "dot" notation.
      *
@@ -117,7 +117,7 @@ 
     }
 }
 
-if (! function_exists('array_get')) {
+if (!function_exists('array_get')) {
     /**
      * Get an item from an array using "dot" notation.
      *
@@ -132,7 +132,7 @@ 
     }
 }
 
-if (! function_exists('array_has')) {
+if (!function_exists('array_has')) {
     /**
      * Check if an item or items exist in an array using "dot" notation.
      *
@@ -146,7 +146,7 @@ 
     }
 }
 
-if (! function_exists('array_last')) {
+if (!function_exists('array_last')) {
     /**
      * Return the last element in an array passing a given truth test.
      *
@@ -161,7 +161,7 @@ 
     }
 }
 
-if (! function_exists('array_only')) {
+if (!function_exists('array_only')) {
     /**
      * Get a subset of the items from the given array.
      *
@@ -175,7 +175,7 @@ 
     }
 }
 
-if (! function_exists('array_pluck')) {
+if (!function_exists('array_pluck')) {
     /**
      * Pluck an array of values from an array.
      *
@@ -190,7 +190,7 @@ 
     }
 }
 
-if (! function_exists('array_prepend')) {
+if (!function_exists('array_prepend')) {
     /**
      * Push an item onto the beginning of an array.
      *
@@ -205,7 +205,7 @@ 
     }
 }
 
-if (! function_exists('array_pull')) {
+if (!function_exists('array_pull')) {
     /**
      * Get a value from the array, and remove it.
      *
@@ -220,7 +220,7 @@ 
     }
 }
 
-if (! function_exists('array_random')) {
+if (!function_exists('array_random')) {
     /**
      * Get a random value from an array.
      *
@@ -234,7 +234,7 @@ 
     }
 }
 
-if (! function_exists('array_set')) {
+if (!function_exists('array_set')) {
     /**
      * Set an array item to a given value using "dot" notation.
      *
@@ -251,7 +251,7 @@ 
     }
 }
 
-if (! function_exists('array_sort')) {
+if (!function_exists('array_sort')) {
     /**
      * Sort the array by the given callback or attribute name.
      *
@@ -265,7 +265,7 @@ 
     }
 }
 
-if (! function_exists('array_sort_recursive')) {
+if (!function_exists('array_sort_recursive')) {
     /**
      * Recursively sort an array by keys and values.
      *
@@ -278,7 +278,7 @@ 
     }
 }
 
-if (! function_exists('array_where')) {
+if (!function_exists('array_where')) {
     /**
      * Filter the array using the given callback.
      *
@@ -292,7 +292,7 @@ 
     }
 }
 
-if (! function_exists('array_wrap')) {
+if (!function_exists('array_wrap')) {
     /**
      * If the given value is not an array, wrap it in one.
      *
@@ -305,7 +305,7 @@ 
     }
 }
 
-if (! function_exists('collect')) {
+if (!function_exists('collect')) {
     /**
      * Create a collection from the given value.
      *
@@ -318,7 +318,7 @@ 
     }
 }
 
-if (! function_exists('data_fill')) {
+if (!function_exists('data_fill')) {
     /**
      * Fill in data where it's missing.
      *
@@ -333,7 +333,7 @@ 
     }
 }
 
-if (! function_exists('data_get')) {
+if (!function_exists('data_get')) {
     /**
      * Get an item from an array or object using "dot" notation.
      *
@@ -350,11 +350,11 @@ 
 
         $key = is_array($key) ? $key : explode('.', $key);
 
-        while (! is_null($segment = array_shift($key))) {
+        while (!is_null($segment = array_shift($key))) {
             if ($segment === '*') {
                 if ($target instanceof Collection) {
                     $target = $target->all();
-                } elseif (! is_array($target)) {
+                } elseif (!is_array($target)) {
                     return value($default);
                 }
 
@@ -376,7 +376,7 @@ 
     }
 }
 
-if (! function_exists('data_set')) {
+if (!function_exists('data_set')) {
     /**
      * Set an item on an array or object using dot notation.
      *
@@ -391,7 +391,7 @@ 
         $segments = is_array($key) ? $key : explode('.', $key);
 
         if (($segment = array_shift($segments)) === '*') {
-            if (! Arr::accessible($target)) {
+            if (!Arr::accessible($target)) {
                 $target = [];
             }
 
@@ -406,22 +406,22 @@ 
             }
         } elseif (Arr::accessible($target)) {
             if ($segments) {
-                if (! Arr::exists($target, $segment)) {
+                if (!Arr::exists($target, $segment)) {
                     $target[$segment] = [];
                 }
 
                 data_set($target[$segment], $segments, $value, $overwrite);
-            } elseif ($overwrite || ! Arr::exists($target, $segment)) {
+            } elseif ($overwrite || !Arr::exists($target, $segment)) {
                 $target[$segment] = $value;
             }
         } elseif (is_object($target)) {
             if ($segments) {
-                if (! isset($target->{$segment})) {
+                if (!isset($target->{$segment})) {
                     $target->{$segment} = [];
                 }
 
                 data_set($target->{$segment}, $segments, $value, $overwrite);
-            } elseif ($overwrite || ! isset($target->{$segment})) {
+            } elseif ($overwrite || !isset($target->{$segment})) {
                 $target->{$segment} = $value;
             }
         } else {
@@ -438,7 +438,7 @@ 
     }
 }
 
-if (! function_exists('dd')) {
+if (!function_exists('dd')) {
     /**
      * Dump the passed variables and end the script.
      *
@@ -457,7 +457,7 @@ 
     }
 }
 
-if (! function_exists('value')) {
+if (!function_exists('value')) {
     /**
      * Return the default value of the given value.
      *

src/Support/HigherOrderCollectionProxy.php

Spacing +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
      */
     public function __get($key)
     {
-        return $this->collection->{$this->method}(function ($value) use ($key) {
+        return $this->collection->{$this->method}(function($value) use ($key) {
             return is_array($value) ? $value[$key] : $value->{$key};
         });
     }
@@ -56,7 +56,7 @@ 
      */
     public function __call($method, $parameters)
     {
-        return $this->collection->{$this->method}(function ($value) use ($method, $parameters) {
+        return $this->collection->{$this->method}(function($value) use ($method, $parameters) {
             return $value->{$method}(...$parameters);
         });
     }

src/Support/Carbon.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 
         $carbon = $this;
 
-        return call_user_func(function () use ($carbon) {
+        return call_user_func(function() use ($carbon) {
             return get_object_vars($carbon);
         });
     }

src/Support/alias.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 ];
 
 foreach ($aliases as $illuminate => $tighten) {
-    if (class_exists($illuminate) && ! interface_exists($illuminate) && ! trait_exists($illuminate)) {
+    if (class_exists($illuminate) && !interface_exists($illuminate) && !trait_exists($illuminate)) {
         class_alias($illuminate, $tighten);
     }
 }

src/Support/Traits/Macroable.php

Spacing +2 added lines, -2 removed lines

@@ -70,7 +70,7 @@ 
      */
     public static function __callStatic($method, $parameters)
     {
-        if (! static::hasMacro($method)) {
+        if (!static::hasMacro($method)) {
             throw new BadMethodCallException(sprintf(
                 'Method %s::%s does not exist.', static::class, $method
             ));
@@ -94,7 +94,7 @@ 
      */
     public function __call($method, $parameters)
     {
-        if (! static::hasMacro($method)) {
+        if (!static::hasMacro($method)) {
             throw new BadMethodCallException(sprintf(
                 'Method %s::%s does not exist.', static::class, $method
             ));

src/Support/Arr.php

Spacing +8 added lines, -8 removed lines

@@ -51,7 +51,7 @@ 
         foreach ($array as $values) {
             if ($values instanceof Collection) {
                 $values = $values->all();
-            } elseif (! is_array($values)) {
+            } elseif (!is_array($values)) {
                 continue;
             }
 
@@ -111,7 +111,7 @@ 
         $results = [];
 
         foreach ($array as $key => $value) {
-            if (is_array($value) && ! empty($value)) {
+            if (is_array($value) && !empty($value)) {
                 $results = array_merge($results, static::dot($value, $prepend.$key.'.'));
             } else {
                 $results[$prepend.$key] = $value;
@@ -211,7 +211,7 @@ 
         foreach ($array as $item) {
             $item = $item instanceof Collection ? $item->all() : $item;
 
-            if (! is_array($item)) {
+            if (!is_array($item)) {
                 $result[] = $item;
             } elseif ($depth === 1) {
                 $result = array_merge($result, array_values($item));
@@ -277,7 +277,7 @@ 
      */
     public static function get($array, $key, $default = null)
     {
-        if (! static::accessible($array)) {
+        if (!static::accessible($array)) {
             return value($default);
         }
 
@@ -319,7 +319,7 @@ 
 
         $keys = (array) $keys;
 
-        if (! $array) {
+        if (!$array) {
             return false;
         }
 
@@ -525,7 +525,7 @@ 
             // 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])) {
+            if (!isset($array[$key]) || !is_array($array[$key])) {
                 $array[$key] = [];
             }
 
@@ -551,7 +551,7 @@ 
         } else {
             srand($seed);
 
-            usort($array, function () {
+            usort($array, function() {
                 return rand(-1, 1);
             });
         }
@@ -618,6 +618,6 @@ 
             return [];
         }
 
-        return ! is_array($value) ? [$value] : $value;
+        return !is_array($value) ? [$value] : $value;
     }
 }