@@ -2,19 +2,19 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace IlluminateAgnostic\Collection\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\Collection\Contracts\Support\Arrayable; |
|
| 11 | +use IlluminateAgnostic\Collection\Contracts\Support\Jsonable; |
|
| 14 | 12 | use IlluminateAgnostic\Collection\Support\Debug\Dumper; |
| 15 | 13 | use IlluminateAgnostic\Collection\Support\Traits\Macroable; |
| 16 | -use IlluminateAgnostic\Collection\Contracts\Support\Jsonable; |
|
| 17 | -use IlluminateAgnostic\Collection\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 | |