@@ -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 | class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate, Jsonable, JsonSerializable |
| 20 | 20 | { |
@@ -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 | */ |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | |
| 184 | 184 | $counts = new self; |
| 185 | 185 | |
| 186 | - $collection->each(function ($value) use ($counts) { |
|
| 186 | + $collection->each(function($value) use ($counts) { |
|
| 187 | 187 | $counts[$value] = isset($counts[$value]) ? $counts[$value] + 1 : 1; |
| 188 | 188 | }); |
| 189 | 189 | |
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | |
| 192 | 192 | $highestValue = $sorted->last(); |
| 193 | 193 | |
| 194 | - return $sorted->filter(function ($value) use ($highestValue) { |
|
| 194 | + return $sorted->filter(function($value) use ($highestValue) { |
|
| 195 | 195 | return $value == $highestValue; |
| 196 | 196 | })->sort()->keys()->all(); |
| 197 | 197 | } |
@@ -239,13 +239,13 @@ discard block |
||
| 239 | 239 | public function containsStrict($key, $value = null) |
| 240 | 240 | { |
| 241 | 241 | if (func_num_args() == 2) { |
| 242 | - return $this->contains(function ($item) use ($key, $value) { |
|
| 242 | + return $this->contains(function($item) use ($key, $value) { |
|
| 243 | 243 | return data_get($item, $key) === $value; |
| 244 | 244 | }); |
| 245 | 245 | } |
| 246 | 246 | |
| 247 | 247 | if ($this->useAsCallable($key)) { |
| 248 | - return ! is_null($this->first($key)); |
|
| 248 | + return !is_null($this->first($key)); |
|
| 249 | 249 | } |
| 250 | 250 | |
| 251 | 251 | return in_array($key, $this->items, true); |
@@ -287,7 +287,7 @@ discard block |
||
| 287 | 287 | { |
| 288 | 288 | (new static(func_get_args())) |
| 289 | 289 | ->push($this) |
| 290 | - ->each(function ($item) { |
|
| 290 | + ->each(function($item) { |
|
| 291 | 291 | (new Dumper)->dump($item); |
| 292 | 292 | }); |
| 293 | 293 | |
@@ -388,7 +388,7 @@ discard block |
||
| 388 | 388 | */ |
| 389 | 389 | public function eachSpread(callable $callback) |
| 390 | 390 | { |
| 391 | - return $this->each(function ($chunk, $key) use ($callback) { |
|
| 391 | + return $this->each(function($chunk, $key) use ($callback) { |
|
| 392 | 392 | $chunk[] = $key; |
| 393 | 393 | |
| 394 | 394 | return $callback(...$chunk); |
@@ -409,7 +409,7 @@ discard block |
||
| 409 | 409 | $callback = $this->valueRetriever($key); |
| 410 | 410 | |
| 411 | 411 | foreach ($this->items as $k => $v) { |
| 412 | - if (! $callback($v, $k)) { |
|
| 412 | + if (!$callback($v, $k)) { |
|
| 413 | 413 | return false; |
| 414 | 414 | } |
| 415 | 415 | } |
@@ -430,7 +430,7 @@ discard block |
||
| 430 | 430 | { |
| 431 | 431 | if ($keys instanceof self) { |
| 432 | 432 | $keys = $keys->all(); |
| 433 | - } elseif (! is_array($keys)) { |
|
| 433 | + } elseif (!is_array($keys)) { |
|
| 434 | 434 | $keys = func_get_args(); |
| 435 | 435 | } |
| 436 | 436 | |
@@ -481,7 +481,7 @@ discard block |
||
| 481 | 481 | */ |
| 482 | 482 | public function unless($value, callable $callback, callable $default = null) |
| 483 | 483 | { |
| 484 | - return $this->when(! $value, $callback, $default); |
|
| 484 | + return $this->when(!$value, $callback, $default); |
|
| 485 | 485 | } |
| 486 | 486 | |
| 487 | 487 | /** |
@@ -513,10 +513,10 @@ discard block |
||
| 513 | 513 | $operator = '='; |
| 514 | 514 | } |
| 515 | 515 | |
| 516 | - return function ($item) use ($key, $operator, $value) { |
|
| 516 | + return function($item) use ($key, $operator, $value) { |
|
| 517 | 517 | $retrieved = data_get($item, $key); |
| 518 | 518 | |
| 519 | - $strings = array_filter([$retrieved, $value], function ($value) { |
|
| 519 | + $strings = array_filter([$retrieved, $value], function($value) { |
|
| 520 | 520 | return is_string($value) || (is_object($value) && method_exists($value, '__toString')); |
| 521 | 521 | }); |
| 522 | 522 | |
@@ -564,7 +564,7 @@ discard block |
||
| 564 | 564 | { |
| 565 | 565 | $values = $this->getArrayableItems($values); |
| 566 | 566 | |
| 567 | - return $this->filter(function ($item) use ($key, $values, $strict) { |
|
| 567 | + return $this->filter(function($item) use ($key, $values, $strict) { |
|
| 568 | 568 | return in_array(data_get($item, $key), $values, $strict); |
| 569 | 569 | }); |
| 570 | 570 | } |
@@ -593,7 +593,7 @@ discard block |
||
| 593 | 593 | { |
| 594 | 594 | $values = $this->getArrayableItems($values); |
| 595 | 595 | |
| 596 | - return $this->reject(function ($item) use ($key, $values, $strict) { |
|
| 596 | + return $this->reject(function($item) use ($key, $values, $strict) { |
|
| 597 | 597 | return in_array(data_get($item, $key), $values, $strict); |
| 598 | 598 | }); |
| 599 | 599 | } |
@@ -618,7 +618,7 @@ discard block |
||
| 618 | 618 | */ |
| 619 | 619 | public function whereInstanceOf($type) |
| 620 | 620 | { |
| 621 | - return $this->filter(function ($value) use ($type) { |
|
| 621 | + return $this->filter(function($value) use ($type) { |
|
| 622 | 622 | return $value instanceof $type; |
| 623 | 623 | }); |
| 624 | 624 | } |
@@ -722,14 +722,14 @@ discard block |
||
| 722 | 722 | foreach ($this->items as $key => $value) { |
| 723 | 723 | $groupKeys = $groupBy($value, $key); |
| 724 | 724 | |
| 725 | - if (! is_array($groupKeys)) { |
|
| 725 | + if (!is_array($groupKeys)) { |
|
| 726 | 726 | $groupKeys = [$groupKeys]; |
| 727 | 727 | } |
| 728 | 728 | |
| 729 | 729 | foreach ($groupKeys as $groupKey) { |
| 730 | 730 | $groupKey = is_bool($groupKey) ? (int) $groupKey : $groupKey; |
| 731 | 731 | |
| 732 | - if (! array_key_exists($groupKey, $results)) { |
|
| 732 | + if (!array_key_exists($groupKey, $results)) { |
|
| 733 | 733 | $results[$groupKey] = new static; |
| 734 | 734 | } |
| 735 | 735 | |
@@ -739,7 +739,7 @@ discard block |
||
| 739 | 739 | |
| 740 | 740 | $result = new static($results); |
| 741 | 741 | |
| 742 | - if (! empty($nextGroups)) { |
|
| 742 | + if (!empty($nextGroups)) { |
|
| 743 | 743 | return $result->map->groupBy($nextGroups, $preserveKeys); |
| 744 | 744 | } |
| 745 | 745 | |
@@ -782,7 +782,7 @@ discard block |
||
| 782 | 782 | $keys = is_array($key) ? $key : func_get_args(); |
| 783 | 783 | |
| 784 | 784 | foreach ($keys as $value) { |
| 785 | - if (! $this->offsetExists($value)) { |
|
| 785 | + if (!$this->offsetExists($value)) { |
|
| 786 | 786 | return false; |
| 787 | 787 | } |
| 788 | 788 | } |
@@ -849,7 +849,7 @@ discard block |
||
| 849 | 849 | */ |
| 850 | 850 | public function isNotEmpty() |
| 851 | 851 | { |
| 852 | - return ! $this->isEmpty(); |
|
| 852 | + return !$this->isEmpty(); |
|
| 853 | 853 | } |
| 854 | 854 | |
| 855 | 855 | /** |
@@ -860,7 +860,7 @@ discard block |
||
| 860 | 860 | */ |
| 861 | 861 | protected function useAsCallable($value) |
| 862 | 862 | { |
| 863 | - return ! is_string($value) && is_callable($value); |
|
| 863 | + return !is_string($value) && is_callable($value); |
|
| 864 | 864 | } |
| 865 | 865 | |
| 866 | 866 | /** |
@@ -920,7 +920,7 @@ discard block |
||
| 920 | 920 | */ |
| 921 | 921 | public function mapSpread(callable $callback) |
| 922 | 922 | { |
| 923 | - return $this->map(function ($chunk, $key) use ($callback) { |
|
| 923 | + return $this->map(function($chunk, $key) use ($callback) { |
|
| 924 | 924 | $chunk[] = $key; |
| 925 | 925 | |
| 926 | 926 | return $callback(...$chunk); |
@@ -946,7 +946,7 @@ discard block |
||
| 946 | 946 | |
| 947 | 947 | $value = reset($pair); |
| 948 | 948 | |
| 949 | - if (! isset($dictionary[$key])) { |
|
| 949 | + if (!isset($dictionary[$key])) { |
|
| 950 | 950 | $dictionary[$key] = []; |
| 951 | 951 | } |
| 952 | 952 | |
@@ -1013,7 +1013,7 @@ discard block |
||
| 1013 | 1013 | */ |
| 1014 | 1014 | public function mapInto($class) |
| 1015 | 1015 | { |
| 1016 | - return $this->map(function ($value, $key) use ($class) { |
|
| 1016 | + return $this->map(function($value, $key) use ($class) { |
|
| 1017 | 1017 | return new $class($value, $key); |
| 1018 | 1018 | }); |
| 1019 | 1019 | } |
@@ -1028,9 +1028,9 @@ discard block |
||
| 1028 | 1028 | { |
| 1029 | 1029 | $callback = $this->valueRetriever($callback); |
| 1030 | 1030 | |
| 1031 | - return $this->filter(function ($value) { |
|
| 1032 | - return ! is_null($value); |
|
| 1033 | - })->reduce(function ($result, $item) use ($callback) { |
|
| 1031 | + return $this->filter(function($value) { |
|
| 1032 | + return !is_null($value); |
|
| 1033 | + })->reduce(function($result, $item) use ($callback) { |
|
| 1034 | 1034 | $value = $callback($item); |
| 1035 | 1035 | |
| 1036 | 1036 | return is_null($result) || $value > $result ? $value : $result; |
@@ -1080,9 +1080,9 @@ discard block |
||
| 1080 | 1080 | { |
| 1081 | 1081 | $callback = $this->valueRetriever($callback); |
| 1082 | 1082 | |
| 1083 | - return $this->filter(function ($value) { |
|
| 1084 | - return ! is_null($value); |
|
| 1085 | - })->reduce(function ($result, $item) use ($callback) { |
|
| 1083 | + return $this->filter(function($value) { |
|
| 1084 | + return !is_null($value); |
|
| 1085 | + })->reduce(function($result, $item) use ($callback) { |
|
| 1086 | 1086 | $value = $callback($item); |
| 1087 | 1087 | |
| 1088 | 1088 | return is_null($result) || $value < $result ? $value : $result; |
@@ -1165,7 +1165,7 @@ discard block |
||
| 1165 | 1165 | : $this->operatorForWhere(...func_get_args()); |
| 1166 | 1166 | |
| 1167 | 1167 | foreach ($this->items as $key => $item) { |
| 1168 | - $partitions[(int) ! $callback($item, $key)][$key] = $item; |
|
| 1168 | + $partitions[(int) !$callback($item, $key)][$key] = $item; |
|
| 1169 | 1169 | } |
| 1170 | 1170 | |
| 1171 | 1171 | return new static($partitions); |
@@ -1300,12 +1300,12 @@ discard block |
||
| 1300 | 1300 | public function reject($callback) |
| 1301 | 1301 | { |
| 1302 | 1302 | if ($this->useAsCallable($callback)) { |
| 1303 | - return $this->filter(function ($value, $key) use ($callback) { |
|
| 1304 | - return ! $callback($value, $key); |
|
| 1303 | + return $this->filter(function($value, $key) use ($callback) { |
|
| 1304 | + return !$callback($value, $key); |
|
| 1305 | 1305 | }); |
| 1306 | 1306 | } |
| 1307 | 1307 | |
| 1308 | - return $this->filter(function ($item) use ($callback) { |
|
| 1308 | + return $this->filter(function($item) use ($callback) { |
|
| 1309 | 1309 | return $item != $callback; |
| 1310 | 1310 | }); |
| 1311 | 1311 | } |
@@ -1329,7 +1329,7 @@ discard block |
||
| 1329 | 1329 | */ |
| 1330 | 1330 | public function search($value, $strict = false) |
| 1331 | 1331 | { |
| 1332 | - if (! $this->useAsCallable($value)) { |
|
| 1332 | + if (!$this->useAsCallable($value)) { |
|
| 1333 | 1333 | return array_search($value, $this->items, $strict); |
| 1334 | 1334 | } |
| 1335 | 1335 | |
@@ -1367,7 +1367,7 @@ discard block |
||
| 1367 | 1367 | } else { |
| 1368 | 1368 | srand($seed); |
| 1369 | 1369 | |
| 1370 | - usort($items, function () { |
|
| 1370 | + usort($items, function() { |
|
| 1371 | 1371 | return rand(-1, 1); |
| 1372 | 1372 | }); |
| 1373 | 1373 | } |
@@ -1546,7 +1546,7 @@ discard block |
||
| 1546 | 1546 | |
| 1547 | 1547 | $callback = $this->valueRetriever($callback); |
| 1548 | 1548 | |
| 1549 | - return $this->reduce(function ($result, $item) use ($callback) { |
|
| 1549 | + return $this->reduce(function($result, $item) use ($callback) { |
|
| 1550 | 1550 | return $result + $callback($item); |
| 1551 | 1551 | }, 0); |
| 1552 | 1552 | } |
@@ -1605,7 +1605,7 @@ discard block |
||
| 1605 | 1605 | |
| 1606 | 1606 | $exists = []; |
| 1607 | 1607 | |
| 1608 | - return $this->reject(function ($item, $key) use ($callback, $strict, &$exists) { |
|
| 1608 | + return $this->reject(function($item, $key) use ($callback, $strict, &$exists) { |
|
| 1609 | 1609 | if (in_array($id = $callback($item, $key), $exists, $strict)) { |
| 1610 | 1610 | return true; |
| 1611 | 1611 | } |
@@ -1647,7 +1647,7 @@ discard block |
||
| 1647 | 1647 | return $value; |
| 1648 | 1648 | } |
| 1649 | 1649 | |
| 1650 | - return function ($item) use ($value) { |
|
| 1650 | + return function($item) use ($value) { |
|
| 1651 | 1651 | return data_get($item, $value); |
| 1652 | 1652 | }; |
| 1653 | 1653 | } |
@@ -1663,11 +1663,11 @@ discard block |
||
| 1663 | 1663 | */ |
| 1664 | 1664 | public function zip($items) |
| 1665 | 1665 | { |
| 1666 | - $arrayableItems = array_map(function ($items) { |
|
| 1666 | + $arrayableItems = array_map(function($items) { |
|
| 1667 | 1667 | return $this->getArrayableItems($items); |
| 1668 | 1668 | }, func_get_args()); |
| 1669 | 1669 | |
| 1670 | - $params = array_merge([function () { |
|
| 1670 | + $params = array_merge([function() { |
|
| 1671 | 1671 | return new static(func_get_args()); |
| 1672 | 1672 | }, $this->items], $arrayableItems); |
| 1673 | 1673 | |
@@ -1693,7 +1693,7 @@ discard block |
||
| 1693 | 1693 | */ |
| 1694 | 1694 | public function toArray() |
| 1695 | 1695 | { |
| 1696 | - return array_map(function ($value) { |
|
| 1696 | + return array_map(function($value) { |
|
| 1697 | 1697 | return $value instanceof Arrayable ? $value->toArray() : $value; |
| 1698 | 1698 | }, $this->items); |
| 1699 | 1699 | } |
@@ -1705,7 +1705,7 @@ discard block |
||
| 1705 | 1705 | */ |
| 1706 | 1706 | public function jsonSerialize() |
| 1707 | 1707 | { |
| 1708 | - return array_map(function ($value) { |
|
| 1708 | + return array_map(function($value) { |
|
| 1709 | 1709 | if ($value instanceof JsonSerializable) { |
| 1710 | 1710 | return $value->jsonSerialize(); |
| 1711 | 1711 | } elseif ($value instanceof Jsonable) { |
@@ -1875,7 +1875,7 @@ discard block |
||
| 1875 | 1875 | */ |
| 1876 | 1876 | public function __get($key) |
| 1877 | 1877 | { |
| 1878 | - if (! in_array($key, static::$proxies)) { |
|
| 1878 | + if (!in_array($key, static::$proxies)) { |
|
| 1879 | 1879 | throw new Exception("Property [{$key}] does not exist on this collection instance."); |
| 1880 | 1880 | } |
| 1881 | 1881 | |
@@ -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 | } |
@@ -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 | |
@@ -609,6 +609,6 @@ discard block |
||
| 609 | 609 | return []; |
| 610 | 610 | } |
| 611 | 611 | |
| 612 | - return ! is_array($value) ? [$value] : $value; |
|
| 612 | + return !is_array($value) ? [$value] : $value; |
|
| 613 | 613 | } |
| 614 | 614 | } |
@@ -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 | )); |