@@ -3,7 +3,6 @@ |
||
3 | 3 | use IlluminateAgnostic\Arr\Support\Arr; |
4 | 4 | use IlluminateAgnostic\Arr\Support\Collection; |
5 | 5 | use IlluminateAgnostic\Arr\Support\Debug\Dumper; |
6 | -use Illuminate\Support\Collection as IlluminateCollection; |
|
7 | 6 | |
8 | 7 | if (! function_exists('array_add')) { |
9 | 8 | /** |
@@ -5,7 +5,7 @@ discard block |
||
5 | 5 | use IlluminateAgnostic\Arr\Support\Debug\Dumper; |
6 | 6 | use Illuminate\Support\Collection as IlluminateCollection; |
7 | 7 | |
8 | -if (! function_exists('array_add')) { |
|
8 | +if (!function_exists('array_add')) { |
|
9 | 9 | /** |
10 | 10 | * Add an element to an array using "dot" notation if it doesn't exist. |
11 | 11 | * |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | } |
21 | 21 | } |
22 | 22 | |
23 | -if (! function_exists('array_collapse')) { |
|
23 | +if (!function_exists('array_collapse')) { |
|
24 | 24 | /** |
25 | 25 | * Collapse an array of arrays into a single array. |
26 | 26 | * |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | } |
34 | 34 | } |
35 | 35 | |
36 | -if (! function_exists('array_divide')) { |
|
36 | +if (!function_exists('array_divide')) { |
|
37 | 37 | /** |
38 | 38 | * Divide an array into two arrays. One with keys and the other with values. |
39 | 39 | * |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | } |
47 | 47 | } |
48 | 48 | |
49 | -if (! function_exists('array_dot')) { |
|
49 | +if (!function_exists('array_dot')) { |
|
50 | 50 | /** |
51 | 51 | * Flatten a multi-dimensional associative array with dots. |
52 | 52 | * |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | } |
61 | 61 | } |
62 | 62 | |
63 | -if (! function_exists('array_except')) { |
|
63 | +if (!function_exists('array_except')) { |
|
64 | 64 | /** |
65 | 65 | * Get all of the given array except for a specified array of keys. |
66 | 66 | * |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | } |
75 | 75 | } |
76 | 76 | |
77 | -if (! function_exists('array_first')) { |
|
77 | +if (!function_exists('array_first')) { |
|
78 | 78 | /** |
79 | 79 | * Return the first element in an array passing a given truth test. |
80 | 80 | * |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | } |
90 | 90 | } |
91 | 91 | |
92 | -if (! function_exists('array_flatten')) { |
|
92 | +if (!function_exists('array_flatten')) { |
|
93 | 93 | /** |
94 | 94 | * Flatten a multi-dimensional array into a single level. |
95 | 95 | * |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | } |
104 | 104 | } |
105 | 105 | |
106 | -if (! function_exists('array_forget')) { |
|
106 | +if (!function_exists('array_forget')) { |
|
107 | 107 | /** |
108 | 108 | * Remove one or many array items from a given array using "dot" notation. |
109 | 109 | * |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | } |
118 | 118 | } |
119 | 119 | |
120 | -if (! function_exists('array_get')) { |
|
120 | +if (!function_exists('array_get')) { |
|
121 | 121 | /** |
122 | 122 | * Get an item from an array using "dot" notation. |
123 | 123 | * |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | } |
133 | 133 | } |
134 | 134 | |
135 | -if (! function_exists('array_has')) { |
|
135 | +if (!function_exists('array_has')) { |
|
136 | 136 | /** |
137 | 137 | * Check if an item or items exist in an array using "dot" notation. |
138 | 138 | * |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | } |
147 | 147 | } |
148 | 148 | |
149 | -if (! function_exists('array_last')) { |
|
149 | +if (!function_exists('array_last')) { |
|
150 | 150 | /** |
151 | 151 | * Return the last element in an array passing a given truth test. |
152 | 152 | * |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | } |
162 | 162 | } |
163 | 163 | |
164 | -if (! function_exists('array_only')) { |
|
164 | +if (!function_exists('array_only')) { |
|
165 | 165 | /** |
166 | 166 | * Get a subset of the items from the given array. |
167 | 167 | * |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | } |
176 | 176 | } |
177 | 177 | |
178 | -if (! function_exists('array_pluck')) { |
|
178 | +if (!function_exists('array_pluck')) { |
|
179 | 179 | /** |
180 | 180 | * Pluck an array of values from an array. |
181 | 181 | * |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | } |
191 | 191 | } |
192 | 192 | |
193 | -if (! function_exists('array_prepend')) { |
|
193 | +if (!function_exists('array_prepend')) { |
|
194 | 194 | /** |
195 | 195 | * Push an item onto the beginning of an array. |
196 | 196 | * |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | } |
206 | 206 | } |
207 | 207 | |
208 | -if (! function_exists('array_pull')) { |
|
208 | +if (!function_exists('array_pull')) { |
|
209 | 209 | /** |
210 | 210 | * Get a value from the array, and remove it. |
211 | 211 | * |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | } |
221 | 221 | } |
222 | 222 | |
223 | -if (! function_exists('array_random')) { |
|
223 | +if (!function_exists('array_random')) { |
|
224 | 224 | /** |
225 | 225 | * Get a random value from an array. |
226 | 226 | * |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | } |
235 | 235 | } |
236 | 236 | |
237 | -if (! function_exists('array_set')) { |
|
237 | +if (!function_exists('array_set')) { |
|
238 | 238 | /** |
239 | 239 | * Set an array item to a given value using "dot" notation. |
240 | 240 | * |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | } |
252 | 252 | } |
253 | 253 | |
254 | -if (! function_exists('array_sort')) { |
|
254 | +if (!function_exists('array_sort')) { |
|
255 | 255 | /** |
256 | 256 | * Sort the array by the given callback or attribute name. |
257 | 257 | * |
@@ -265,7 +265,7 @@ discard block |
||
265 | 265 | } |
266 | 266 | } |
267 | 267 | |
268 | -if (! function_exists('array_sort_recursive')) { |
|
268 | +if (!function_exists('array_sort_recursive')) { |
|
269 | 269 | /** |
270 | 270 | * Recursively sort an array by keys and values. |
271 | 271 | * |
@@ -278,7 +278,7 @@ discard block |
||
278 | 278 | } |
279 | 279 | } |
280 | 280 | |
281 | -if (! function_exists('array_where')) { |
|
281 | +if (!function_exists('array_where')) { |
|
282 | 282 | /** |
283 | 283 | * Filter the array using the given callback. |
284 | 284 | * |
@@ -292,7 +292,7 @@ discard block |
||
292 | 292 | } |
293 | 293 | } |
294 | 294 | |
295 | -if (! function_exists('array_wrap')) { |
|
295 | +if (!function_exists('array_wrap')) { |
|
296 | 296 | /** |
297 | 297 | * If the given value is not an array, wrap it in one. |
298 | 298 | * |
@@ -305,7 +305,7 @@ discard block |
||
305 | 305 | } |
306 | 306 | } |
307 | 307 | |
308 | -if (! function_exists('collect')) { |
|
308 | +if (!function_exists('collect')) { |
|
309 | 309 | /** |
310 | 310 | * Create a collection from the given value. |
311 | 311 | * |
@@ -318,7 +318,7 @@ discard block |
||
318 | 318 | } |
319 | 319 | } |
320 | 320 | |
321 | -if (! function_exists('data_fill')) { |
|
321 | +if (!function_exists('data_fill')) { |
|
322 | 322 | /** |
323 | 323 | * Fill in data where it's missing. |
324 | 324 | * |
@@ -333,7 +333,7 @@ discard block |
||
333 | 333 | } |
334 | 334 | } |
335 | 335 | |
336 | -if (! function_exists('data_get')) { |
|
336 | +if (!function_exists('data_get')) { |
|
337 | 337 | /** |
338 | 338 | * Get an item from an array or object using "dot" notation. |
339 | 339 | * |
@@ -350,11 +350,11 @@ discard block |
||
350 | 350 | |
351 | 351 | $key = is_array($key) ? $key : explode('.', $key); |
352 | 352 | |
353 | - while (! is_null($segment = array_shift($key))) { |
|
353 | + while (!is_null($segment = array_shift($key))) { |
|
354 | 354 | if ($segment === '*') { |
355 | 355 | if ($target instanceof Collection) { |
356 | 356 | $target = $target->all(); |
357 | - } elseif (! is_array($target)) { |
|
357 | + } elseif (!is_array($target)) { |
|
358 | 358 | return value($default); |
359 | 359 | } |
360 | 360 | |
@@ -376,7 +376,7 @@ discard block |
||
376 | 376 | } |
377 | 377 | } |
378 | 378 | |
379 | -if (! function_exists('data_set')) { |
|
379 | +if (!function_exists('data_set')) { |
|
380 | 380 | /** |
381 | 381 | * Set an item on an array or object using dot notation. |
382 | 382 | * |
@@ -391,7 +391,7 @@ discard block |
||
391 | 391 | $segments = is_array($key) ? $key : explode('.', $key); |
392 | 392 | |
393 | 393 | if (($segment = array_shift($segments)) === '*') { |
394 | - if (! Arr::accessible($target)) { |
|
394 | + if (!Arr::accessible($target)) { |
|
395 | 395 | $target = []; |
396 | 396 | } |
397 | 397 | |
@@ -406,22 +406,22 @@ discard block |
||
406 | 406 | } |
407 | 407 | } elseif (Arr::accessible($target)) { |
408 | 408 | if ($segments) { |
409 | - if (! Arr::exists($target, $segment)) { |
|
409 | + if (!Arr::exists($target, $segment)) { |
|
410 | 410 | $target[$segment] = []; |
411 | 411 | } |
412 | 412 | |
413 | 413 | data_set($target[$segment], $segments, $value, $overwrite); |
414 | - } elseif ($overwrite || ! Arr::exists($target, $segment)) { |
|
414 | + } elseif ($overwrite || !Arr::exists($target, $segment)) { |
|
415 | 415 | $target[$segment] = $value; |
416 | 416 | } |
417 | 417 | } elseif (is_object($target)) { |
418 | 418 | if ($segments) { |
419 | - if (! isset($target->{$segment})) { |
|
419 | + if (!isset($target->{$segment})) { |
|
420 | 420 | $target->{$segment} = []; |
421 | 421 | } |
422 | 422 | |
423 | 423 | data_set($target->{$segment}, $segments, $value, $overwrite); |
424 | - } elseif ($overwrite || ! isset($target->{$segment})) { |
|
424 | + } elseif ($overwrite || !isset($target->{$segment})) { |
|
425 | 425 | $target->{$segment} = $value; |
426 | 426 | } |
427 | 427 | } else { |
@@ -438,7 +438,7 @@ discard block |
||
438 | 438 | } |
439 | 439 | } |
440 | 440 | |
441 | -if (! function_exists('dd')) { |
|
441 | +if (!function_exists('dd')) { |
|
442 | 442 | /** |
443 | 443 | * Dump the passed variables and end the script. |
444 | 444 | * |
@@ -457,7 +457,7 @@ discard block |
||
457 | 457 | } |
458 | 458 | } |
459 | 459 | |
460 | -if (! function_exists('value')) { |
|
460 | +if (!function_exists('value')) { |
|
461 | 461 | /** |
462 | 462 | * Return the default value of the given value. |
463 | 463 | * |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | */ |
43 | 43 | public function __get($key) |
44 | 44 | { |
45 | - return $this->collection->{$this->method}(function ($value) use ($key) { |
|
45 | + return $this->collection->{$this->method}(function($value) use ($key) { |
|
46 | 46 | return is_array($value) ? $value[$key] : $value->{$key}; |
47 | 47 | }); |
48 | 48 | } |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | */ |
57 | 57 | public function __call($method, $parameters) |
58 | 58 | { |
59 | - return $this->collection->{$this->method}(function ($value) use ($method, $parameters) { |
|
59 | + return $this->collection->{$this->method}(function($value) use ($method, $parameters) { |
|
60 | 60 | return $value->{$method}(...$parameters); |
61 | 61 | }); |
62 | 62 | } |
@@ -30,7 +30,7 @@ |
||
30 | 30 | |
31 | 31 | $carbon = $this; |
32 | 32 | |
33 | - return call_user_func(function () use ($carbon) { |
|
33 | + return call_user_func(function() use ($carbon) { |
|
34 | 34 | return get_object_vars($carbon); |
35 | 35 | }); |
36 | 36 | } |
@@ -11,7 +11,7 @@ |
||
11 | 11 | ]; |
12 | 12 | |
13 | 13 | foreach ($aliases as $illuminate => $tighten) { |
14 | - if (class_exists($illuminate) && ! interface_exists($illuminate) && ! trait_exists($illuminate)) { |
|
14 | + if (class_exists($illuminate) && !interface_exists($illuminate) && !trait_exists($illuminate)) { |
|
15 | 15 | class_alias($illuminate, $tighten); |
16 | 16 | } |
17 | 17 | } |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | /** |
210 | 210 | * Determine if an item exists in the collection. |
211 | 211 | * |
212 | - * @param mixed $key |
|
212 | + * @param \Closure $key |
|
213 | 213 | * @param mixed $operator |
214 | 214 | * @param mixed $value |
215 | 215 | * @return bool |
@@ -452,7 +452,7 @@ discard block |
||
452 | 452 | * Filter items by the given key value pair. |
453 | 453 | * |
454 | 454 | * @param string $key |
455 | - * @param mixed $operator |
|
455 | + * @param string $operator |
|
456 | 456 | * @param mixed $value |
457 | 457 | * @return static |
458 | 458 | */ |
@@ -578,7 +578,7 @@ discard block |
||
578 | 578 | * Get the first item from the collection. |
579 | 579 | * |
580 | 580 | * @param callable|null $callback |
581 | - * @param mixed $default |
|
581 | + * @param stdClass $default |
|
582 | 582 | * @return mixed |
583 | 583 | */ |
584 | 584 | public function first(callable $callback = null, $default = null) |
@@ -638,7 +638,7 @@ discard block |
||
638 | 638 | /** |
639 | 639 | * Get an item from the collection by key. |
640 | 640 | * |
641 | - * @param mixed $key |
|
641 | + * @param integer $key |
|
642 | 642 | * @param mixed $default |
643 | 643 | * @return mixed |
644 | 644 | */ |
@@ -1234,7 +1234,7 @@ discard block |
||
1234 | 1234 | * Reduce the collection to a single value. |
1235 | 1235 | * |
1236 | 1236 | * @param callable $callback |
1237 | - * @param mixed $initial |
|
1237 | + * @param integer $initial |
|
1238 | 1238 | * @return mixed |
1239 | 1239 | */ |
1240 | 1240 | public function reduce(callable $callback, $initial = null) |
@@ -1245,7 +1245,7 @@ discard block |
||
1245 | 1245 | /** |
1246 | 1246 | * Create a collection of all elements that do not pass a given truth test. |
1247 | 1247 | * |
1248 | - * @param callable|mixed $callback |
|
1248 | + * @param \Closure $callback |
|
1249 | 1249 | * @return static |
1250 | 1250 | */ |
1251 | 1251 | public function reject($callback) |
@@ -1793,7 +1793,7 @@ discard block |
||
1793 | 1793 | * Dynamically access collection proxies. |
1794 | 1794 | * |
1795 | 1795 | * @param string $key |
1796 | - * @return mixed |
|
1796 | + * @return HigherOrderCollectionProxy |
|
1797 | 1797 | * |
1798 | 1798 | * @throws \Exception |
1799 | 1799 | */ |
@@ -2,19 +2,19 @@ |
||
2 | 2 | |
3 | 3 | namespace IlluminateAgnostic\Arr\Support; |
4 | 4 | |
5 | -use stdClass; |
|
6 | -use Countable; |
|
7 | -use Exception; |
|
8 | 5 | use ArrayAccess; |
9 | -use Traversable; |
|
10 | 6 | use ArrayIterator; |
11 | 7 | use CachingIterator; |
12 | -use JsonSerializable; |
|
13 | -use IteratorAggregate; |
|
8 | +use Countable; |
|
9 | +use Exception; |
|
10 | +use IlluminateAgnostic\Arr\Contracts\Support\Arrayable; |
|
11 | +use IlluminateAgnostic\Arr\Contracts\Support\Jsonable; |
|
14 | 12 | use IlluminateAgnostic\Arr\Support\Debug\Dumper; |
15 | 13 | use IlluminateAgnostic\Arr\Support\Traits\Macroable; |
16 | -use IlluminateAgnostic\Arr\Contracts\Support\Jsonable; |
|
17 | -use IlluminateAgnostic\Arr\Contracts\Support\Arrayable; |
|
14 | +use IteratorAggregate; |
|
15 | +use JsonSerializable; |
|
16 | +use Traversable; |
|
17 | +use stdClass; |
|
18 | 18 | |
19 | 19 | /** |
20 | 20 | * @property-read HigherOrderCollectionProxy $average |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | |
208 | 208 | $counts = new self; |
209 | 209 | |
210 | - $collection->each(function ($value) use ($counts) { |
|
210 | + $collection->each(function($value) use ($counts) { |
|
211 | 211 | $counts[$value] = isset($counts[$value]) ? $counts[$value] + 1 : 1; |
212 | 212 | }); |
213 | 213 | |
@@ -215,7 +215,7 @@ discard block |
||
215 | 215 | |
216 | 216 | $highestValue = $sorted->last(); |
217 | 217 | |
218 | - return $sorted->filter(function ($value) use ($highestValue) { |
|
218 | + return $sorted->filter(function($value) use ($highestValue) { |
|
219 | 219 | return $value == $highestValue; |
220 | 220 | })->sort()->keys()->all(); |
221 | 221 | } |
@@ -263,13 +263,13 @@ discard block |
||
263 | 263 | public function containsStrict($key, $value = null) |
264 | 264 | { |
265 | 265 | if (func_num_args() === 2) { |
266 | - return $this->contains(function ($item) use ($key, $value) { |
|
266 | + return $this->contains(function($item) use ($key, $value) { |
|
267 | 267 | return data_get($item, $key) === $value; |
268 | 268 | }); |
269 | 269 | } |
270 | 270 | |
271 | 271 | if ($this->useAsCallable($key)) { |
272 | - return ! is_null($this->first($key)); |
|
272 | + return !is_null($this->first($key)); |
|
273 | 273 | } |
274 | 274 | |
275 | 275 | return in_array($key, $this->items, true); |
@@ -309,7 +309,7 @@ discard block |
||
309 | 309 | { |
310 | 310 | (new static(func_get_args())) |
311 | 311 | ->push($this) |
312 | - ->each(function ($item) { |
|
312 | + ->each(function($item) { |
|
313 | 313 | (new Dumper)->dump($item); |
314 | 314 | }); |
315 | 315 | |
@@ -410,7 +410,7 @@ discard block |
||
410 | 410 | */ |
411 | 411 | public function eachSpread(callable $callback) |
412 | 412 | { |
413 | - return $this->each(function ($chunk, $key) use ($callback) { |
|
413 | + return $this->each(function($chunk, $key) use ($callback) { |
|
414 | 414 | $chunk[] = $key; |
415 | 415 | |
416 | 416 | return $callback(...$chunk); |
@@ -431,7 +431,7 @@ discard block |
||
431 | 431 | $callback = $this->valueRetriever($key); |
432 | 432 | |
433 | 433 | foreach ($this->items as $k => $v) { |
434 | - if (! $callback($v, $k)) { |
|
434 | + if (!$callback($v, $k)) { |
|
435 | 435 | return false; |
436 | 436 | } |
437 | 437 | } |
@@ -452,7 +452,7 @@ discard block |
||
452 | 452 | { |
453 | 453 | if ($keys instanceof self) { |
454 | 454 | $keys = $keys->all(); |
455 | - } elseif (! is_array($keys)) { |
|
455 | + } elseif (!is_array($keys)) { |
|
456 | 456 | $keys = func_get_args(); |
457 | 457 | } |
458 | 458 | |
@@ -503,7 +503,7 @@ discard block |
||
503 | 503 | */ |
504 | 504 | public function unless($value, callable $callback, callable $default = null) |
505 | 505 | { |
506 | - return $this->when(! $value, $callback, $default); |
|
506 | + return $this->when(!$value, $callback, $default); |
|
507 | 507 | } |
508 | 508 | |
509 | 509 | /** |
@@ -535,10 +535,10 @@ discard block |
||
535 | 535 | $operator = '='; |
536 | 536 | } |
537 | 537 | |
538 | - return function ($item) use ($key, $operator, $value) { |
|
538 | + return function($item) use ($key, $operator, $value) { |
|
539 | 539 | $retrieved = data_get($item, $key); |
540 | 540 | |
541 | - $strings = array_filter([$retrieved, $value], function ($value) { |
|
541 | + $strings = array_filter([$retrieved, $value], function($value) { |
|
542 | 542 | return is_string($value) || (is_object($value) && method_exists($value, '__toString')); |
543 | 543 | }); |
544 | 544 | |
@@ -586,7 +586,7 @@ discard block |
||
586 | 586 | { |
587 | 587 | $values = $this->getArrayableItems($values); |
588 | 588 | |
589 | - return $this->filter(function ($item) use ($key, $values, $strict) { |
|
589 | + return $this->filter(function($item) use ($key, $values, $strict) { |
|
590 | 590 | return in_array(data_get($item, $key), $values, $strict); |
591 | 591 | }); |
592 | 592 | } |
@@ -615,7 +615,7 @@ discard block |
||
615 | 615 | { |
616 | 616 | $values = $this->getArrayableItems($values); |
617 | 617 | |
618 | - return $this->reject(function ($item) use ($key, $values, $strict) { |
|
618 | + return $this->reject(function($item) use ($key, $values, $strict) { |
|
619 | 619 | return in_array(data_get($item, $key), $values, $strict); |
620 | 620 | }); |
621 | 621 | } |
@@ -640,7 +640,7 @@ discard block |
||
640 | 640 | */ |
641 | 641 | public function whereInstanceOf($type) |
642 | 642 | { |
643 | - return $this->filter(function ($value) use ($type) { |
|
643 | + return $this->filter(function($value) use ($type) { |
|
644 | 644 | return $value instanceof $type; |
645 | 645 | }); |
646 | 646 | } |
@@ -744,14 +744,14 @@ discard block |
||
744 | 744 | foreach ($this->items as $key => $value) { |
745 | 745 | $groupKeys = $groupBy($value, $key); |
746 | 746 | |
747 | - if (! is_array($groupKeys)) { |
|
747 | + if (!is_array($groupKeys)) { |
|
748 | 748 | $groupKeys = [$groupKeys]; |
749 | 749 | } |
750 | 750 | |
751 | 751 | foreach ($groupKeys as $groupKey) { |
752 | 752 | $groupKey = is_bool($groupKey) ? (int) $groupKey : $groupKey; |
753 | 753 | |
754 | - if (! array_key_exists($groupKey, $results)) { |
|
754 | + if (!array_key_exists($groupKey, $results)) { |
|
755 | 755 | $results[$groupKey] = new static; |
756 | 756 | } |
757 | 757 | |
@@ -761,7 +761,7 @@ discard block |
||
761 | 761 | |
762 | 762 | $result = new static($results); |
763 | 763 | |
764 | - if (! empty($nextGroups)) { |
|
764 | + if (!empty($nextGroups)) { |
|
765 | 765 | return $result->map->groupBy($nextGroups, $preserveKeys); |
766 | 766 | } |
767 | 767 | |
@@ -804,7 +804,7 @@ discard block |
||
804 | 804 | $keys = is_array($key) ? $key : func_get_args(); |
805 | 805 | |
806 | 806 | foreach ($keys as $value) { |
807 | - if (! $this->offsetExists($value)) { |
|
807 | + if (!$this->offsetExists($value)) { |
|
808 | 808 | return false; |
809 | 809 | } |
810 | 810 | } |
@@ -871,7 +871,7 @@ discard block |
||
871 | 871 | */ |
872 | 872 | public function isNotEmpty() |
873 | 873 | { |
874 | - return ! $this->isEmpty(); |
|
874 | + return !$this->isEmpty(); |
|
875 | 875 | } |
876 | 876 | |
877 | 877 | /** |
@@ -882,7 +882,7 @@ discard block |
||
882 | 882 | */ |
883 | 883 | protected function useAsCallable($value) |
884 | 884 | { |
885 | - return ! is_string($value) && is_callable($value); |
|
885 | + return !is_string($value) && is_callable($value); |
|
886 | 886 | } |
887 | 887 | |
888 | 888 | /** |
@@ -942,7 +942,7 @@ discard block |
||
942 | 942 | */ |
943 | 943 | public function mapSpread(callable $callback) |
944 | 944 | { |
945 | - return $this->map(function ($chunk, $key) use ($callback) { |
|
945 | + return $this->map(function($chunk, $key) use ($callback) { |
|
946 | 946 | $chunk[] = $key; |
947 | 947 | |
948 | 948 | return $callback(...$chunk); |
@@ -968,7 +968,7 @@ discard block |
||
968 | 968 | |
969 | 969 | $value = reset($pair); |
970 | 970 | |
971 | - if (! isset($dictionary[$key])) { |
|
971 | + if (!isset($dictionary[$key])) { |
|
972 | 972 | $dictionary[$key] = []; |
973 | 973 | } |
974 | 974 | |
@@ -1035,7 +1035,7 @@ discard block |
||
1035 | 1035 | */ |
1036 | 1036 | public function mapInto($class) |
1037 | 1037 | { |
1038 | - return $this->map(function ($value, $key) use ($class) { |
|
1038 | + return $this->map(function($value, $key) use ($class) { |
|
1039 | 1039 | return new $class($value, $key); |
1040 | 1040 | }); |
1041 | 1041 | } |
@@ -1050,9 +1050,9 @@ discard block |
||
1050 | 1050 | { |
1051 | 1051 | $callback = $this->valueRetriever($callback); |
1052 | 1052 | |
1053 | - return $this->filter(function ($value) { |
|
1054 | - return ! is_null($value); |
|
1055 | - })->reduce(function ($result, $item) use ($callback) { |
|
1053 | + return $this->filter(function($value) { |
|
1054 | + return !is_null($value); |
|
1055 | + })->reduce(function($result, $item) use ($callback) { |
|
1056 | 1056 | $value = $callback($item); |
1057 | 1057 | |
1058 | 1058 | return is_null($result) || $value > $result ? $value : $result; |
@@ -1102,9 +1102,9 @@ discard block |
||
1102 | 1102 | { |
1103 | 1103 | $callback = $this->valueRetriever($callback); |
1104 | 1104 | |
1105 | - return $this->filter(function ($value) { |
|
1106 | - return ! is_null($value); |
|
1107 | - })->reduce(function ($result, $item) use ($callback) { |
|
1105 | + return $this->filter(function($value) { |
|
1106 | + return !is_null($value); |
|
1107 | + })->reduce(function($result, $item) use ($callback) { |
|
1108 | 1108 | $value = $callback($item); |
1109 | 1109 | |
1110 | 1110 | return is_null($result) || $value < $result ? $value : $result; |
@@ -1187,7 +1187,7 @@ discard block |
||
1187 | 1187 | : $this->operatorForWhere(...func_get_args()); |
1188 | 1188 | |
1189 | 1189 | foreach ($this->items as $key => $item) { |
1190 | - $partitions[(int) ! $callback($item, $key)][$key] = $item; |
|
1190 | + $partitions[(int) !$callback($item, $key)][$key] = $item; |
|
1191 | 1191 | } |
1192 | 1192 | |
1193 | 1193 | return new static($partitions); |
@@ -1322,12 +1322,12 @@ discard block |
||
1322 | 1322 | public function reject($callback) |
1323 | 1323 | { |
1324 | 1324 | if ($this->useAsCallable($callback)) { |
1325 | - return $this->filter(function ($value, $key) use ($callback) { |
|
1326 | - return ! $callback($value, $key); |
|
1325 | + return $this->filter(function($value, $key) use ($callback) { |
|
1326 | + return !$callback($value, $key); |
|
1327 | 1327 | }); |
1328 | 1328 | } |
1329 | 1329 | |
1330 | - return $this->filter(function ($item) use ($callback) { |
|
1330 | + return $this->filter(function($item) use ($callback) { |
|
1331 | 1331 | return $item != $callback; |
1332 | 1332 | }); |
1333 | 1333 | } |
@@ -1351,7 +1351,7 @@ discard block |
||
1351 | 1351 | */ |
1352 | 1352 | public function search($value, $strict = false) |
1353 | 1353 | { |
1354 | - if (! $this->useAsCallable($value)) { |
|
1354 | + if (!$this->useAsCallable($value)) { |
|
1355 | 1355 | return array_search($value, $this->items, $strict); |
1356 | 1356 | } |
1357 | 1357 | |
@@ -1556,7 +1556,7 @@ discard block |
||
1556 | 1556 | |
1557 | 1557 | $callback = $this->valueRetriever($callback); |
1558 | 1558 | |
1559 | - return $this->reduce(function ($result, $item) use ($callback) { |
|
1559 | + return $this->reduce(function($result, $item) use ($callback) { |
|
1560 | 1560 | return $result + $callback($item); |
1561 | 1561 | }, 0); |
1562 | 1562 | } |
@@ -1615,7 +1615,7 @@ discard block |
||
1615 | 1615 | |
1616 | 1616 | $exists = []; |
1617 | 1617 | |
1618 | - return $this->reject(function ($item, $key) use ($callback, $strict, &$exists) { |
|
1618 | + return $this->reject(function($item, $key) use ($callback, $strict, &$exists) { |
|
1619 | 1619 | if (in_array($id = $callback($item, $key), $exists, $strict)) { |
1620 | 1620 | return true; |
1621 | 1621 | } |
@@ -1657,7 +1657,7 @@ discard block |
||
1657 | 1657 | return $value; |
1658 | 1658 | } |
1659 | 1659 | |
1660 | - return function ($item) use ($value) { |
|
1660 | + return function($item) use ($value) { |
|
1661 | 1661 | return data_get($item, $value); |
1662 | 1662 | }; |
1663 | 1663 | } |
@@ -1673,11 +1673,11 @@ discard block |
||
1673 | 1673 | */ |
1674 | 1674 | public function zip($items) |
1675 | 1675 | { |
1676 | - $arrayableItems = array_map(function ($items) { |
|
1676 | + $arrayableItems = array_map(function($items) { |
|
1677 | 1677 | return $this->getArrayableItems($items); |
1678 | 1678 | }, func_get_args()); |
1679 | 1679 | |
1680 | - $params = array_merge([function () { |
|
1680 | + $params = array_merge([function() { |
|
1681 | 1681 | return new static(func_get_args()); |
1682 | 1682 | }, $this->items], $arrayableItems); |
1683 | 1683 | |
@@ -1703,7 +1703,7 @@ discard block |
||
1703 | 1703 | */ |
1704 | 1704 | public function toArray() |
1705 | 1705 | { |
1706 | - return array_map(function ($value) { |
|
1706 | + return array_map(function($value) { |
|
1707 | 1707 | return $value instanceof Arrayable ? $value->toArray() : $value; |
1708 | 1708 | }, $this->items); |
1709 | 1709 | } |
@@ -1715,7 +1715,7 @@ discard block |
||
1715 | 1715 | */ |
1716 | 1716 | public function jsonSerialize() |
1717 | 1717 | { |
1718 | - return array_map(function ($value) { |
|
1718 | + return array_map(function($value) { |
|
1719 | 1719 | if ($value instanceof JsonSerializable) { |
1720 | 1720 | return $value->jsonSerialize(); |
1721 | 1721 | } elseif ($value instanceof Jsonable) { |
@@ -1885,7 +1885,7 @@ discard block |
||
1885 | 1885 | */ |
1886 | 1886 | public function __get($key) |
1887 | 1887 | { |
1888 | - if (! in_array($key, static::$proxies)) { |
|
1888 | + if (!in_array($key, static::$proxies)) { |
|
1889 | 1889 | throw new Exception("Property [{$key}] does not exist on this collection instance."); |
1890 | 1890 | } |
1891 | 1891 |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | */ |
71 | 71 | public static function __callStatic($method, $parameters) |
72 | 72 | { |
73 | - if (! static::hasMacro($method)) { |
|
73 | + if (!static::hasMacro($method)) { |
|
74 | 74 | throw new BadMethodCallException(sprintf( |
75 | 75 | 'Method %s::%s does not exist.', static::class, $method |
76 | 76 | )); |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | */ |
95 | 95 | public function __call($method, $parameters) |
96 | 96 | { |
97 | - if (! static::hasMacro($method)) { |
|
97 | + if (!static::hasMacro($method)) { |
|
98 | 98 | throw new BadMethodCallException(sprintf( |
99 | 99 | 'Method %s::%s does not exist.', static::class, $method |
100 | 100 | )); |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | foreach ($array as $values) { |
52 | 52 | if ($values instanceof Collection) { |
53 | 53 | $values = $values->all(); |
54 | - } elseif (! is_array($values)) { |
|
54 | + } elseif (!is_array($values)) { |
|
55 | 55 | continue; |
56 | 56 | } |
57 | 57 | |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | $results = []; |
112 | 112 | |
113 | 113 | foreach ($array as $key => $value) { |
114 | - if (is_array($value) && ! empty($value)) { |
|
114 | + if (is_array($value) && !empty($value)) { |
|
115 | 115 | $results = array_merge($results, static::dot($value, $prepend.$key.'.')); |
116 | 116 | } else { |
117 | 117 | $results[$prepend.$key] = $value; |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | foreach ($array as $item) { |
212 | 212 | $item = $item instanceof Collection ? $item->all() : $item; |
213 | 213 | |
214 | - if (! is_array($item)) { |
|
214 | + if (!is_array($item)) { |
|
215 | 215 | $result[] = $item; |
216 | 216 | } elseif ($depth === 1) { |
217 | 217 | $result = array_merge($result, array_values($item)); |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | */ |
278 | 278 | public static function get($array, $key, $default = null) |
279 | 279 | { |
280 | - if (! static::accessible($array)) { |
|
280 | + if (!static::accessible($array)) { |
|
281 | 281 | return value($default); |
282 | 282 | } |
283 | 283 | |
@@ -319,7 +319,7 @@ discard block |
||
319 | 319 | |
320 | 320 | $keys = (array) $keys; |
321 | 321 | |
322 | - if (! $array) { |
|
322 | + if (!$array) { |
|
323 | 323 | return false; |
324 | 324 | } |
325 | 325 | |
@@ -525,7 +525,7 @@ discard block |
||
525 | 525 | // If the key doesn't exist at this depth, we will just create an empty array |
526 | 526 | // to hold the next value, allowing us to create the arrays to hold final |
527 | 527 | // values at the correct depth. Then we'll keep digging into the array. |
528 | - if (! isset($array[$key]) || ! is_array($array[$key])) { |
|
528 | + if (!isset($array[$key]) || !is_array($array[$key])) { |
|
529 | 529 | $array[$key] = []; |
530 | 530 | } |
531 | 531 | |
@@ -551,7 +551,7 @@ discard block |
||
551 | 551 | } else { |
552 | 552 | srand($seed); |
553 | 553 | |
554 | - usort($array, function () { |
|
554 | + usort($array, function() { |
|
555 | 555 | return rand(-1, 1); |
556 | 556 | }); |
557 | 557 | } |
@@ -618,6 +618,6 @@ discard block |
||
618 | 618 | return []; |
619 | 619 | } |
620 | 620 | |
621 | - return ! is_array($value) ? [$value] : $value; |
|
621 | + return !is_array($value) ? [$value] : $value; |
|
622 | 622 | } |
623 | 623 | } |
@@ -3,8 +3,8 @@ |
||
3 | 3 | namespace IlluminateAgnostic\Arr\Support; |
4 | 4 | |
5 | 5 | use ArrayAccess; |
6 | -use InvalidArgumentException; |
|
7 | 6 | use IlluminateAgnostic\Arr\Support\Traits\Macroable; |
7 | +use InvalidArgumentException; |
|
8 | 8 | |
9 | 9 | class Arr |
10 | 10 | { |