@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | */ |
| 45 | 45 | public function __get($key) |
| 46 | 46 | { |
| 47 | - return $this->collection->{$this->method}(function ($value) use ($key) { |
|
| 47 | + return $this->collection->{$this->method}(function($value) use ($key) { |
|
| 48 | 48 | return is_array($value) ? $value[$key] : $value->{$key}; |
| 49 | 49 | }); |
| 50 | 50 | } |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | */ |
| 60 | 60 | public function __call($method, $parameters) |
| 61 | 61 | { |
| 62 | - return $this->collection->{$this->method}(function ($value) use ($method, $parameters) { |
|
| 62 | + return $this->collection->{$this->method}(function($value) use ($method, $parameters) { |
|
| 63 | 63 | return $value->{$method}(...$parameters); |
| 64 | 64 | }); |
| 65 | 65 | } |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | |
| 175 | 175 | $counts = new self(); |
| 176 | 176 | |
| 177 | - $collection->each(function ($value) use ($counts) { |
|
| 177 | + $collection->each(function($value) use ($counts) { |
|
| 178 | 178 | $counts[$value] = isset($counts[$value]) ? $counts[$value] + 1 : 1; |
| 179 | 179 | }); |
| 180 | 180 | |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | |
| 183 | 183 | $highestValue = $sorted->last(); |
| 184 | 184 | |
| 185 | - return $sorted->filter(function ($value) use ($highestValue) { |
|
| 185 | + return $sorted->filter(function($value) use ($highestValue) { |
|
| 186 | 186 | return $value == $highestValue; |
| 187 | 187 | })->sort()->keys()->all(); |
| 188 | 188 | } |
@@ -232,7 +232,7 @@ discard block |
||
| 232 | 232 | public function containsStrict($key, $value = null) |
| 233 | 233 | { |
| 234 | 234 | if (func_num_args() == 2) { |
| 235 | - return $this->contains(function ($item) use ($key, $value) { |
|
| 235 | + return $this->contains(function($item) use ($key, $value) { |
|
| 236 | 236 | return Arr::data_get($item, $key) === $value; |
| 237 | 237 | }); |
| 238 | 238 | } |
@@ -282,7 +282,7 @@ discard block |
||
| 282 | 282 | { |
| 283 | 283 | (new static(func_get_args())) |
| 284 | 284 | ->push($this) |
| 285 | - ->each(function ($item) { |
|
| 285 | + ->each(function($item) { |
|
| 286 | 286 | var_dump($item); |
| 287 | 287 | }); |
| 288 | 288 | |
@@ -352,7 +352,7 @@ discard block |
||
| 352 | 352 | */ |
| 353 | 353 | public function eachSpread(callable $callback) |
| 354 | 354 | { |
| 355 | - return $this->each(function ($chunk, $key) use ($callback) { |
|
| 355 | + return $this->each(function($chunk, $key) use ($callback) { |
|
| 356 | 356 | $chunk[] = $key; |
| 357 | 357 | |
| 358 | 358 | return $callback(...$chunk); |
@@ -488,10 +488,10 @@ discard block |
||
| 488 | 488 | * @param $item |
| 489 | 489 | * @return bool |
| 490 | 490 | */ |
| 491 | - return function ($item) use ($key, $operator, $value) { |
|
| 491 | + return function($item) use ($key, $operator, $value) { |
|
| 492 | 492 | $retrieved = Arr::data_get($item, $key); |
| 493 | 493 | |
| 494 | - $strings = array_filter([$retrieved, $value], function ($value) { |
|
| 494 | + $strings = array_filter([$retrieved, $value], function($value) { |
|
| 495 | 495 | return is_string($value) || (is_object($value) && method_exists($value, '__toString')); |
| 496 | 496 | }); |
| 497 | 497 | |
@@ -549,7 +549,7 @@ discard block |
||
| 549 | 549 | { |
| 550 | 550 | $values = $this->getArrayableItems($values); |
| 551 | 551 | |
| 552 | - return $this->filter(function ($item) use ($key, $values, $strict) { |
|
| 552 | + return $this->filter(function($item) use ($key, $values, $strict) { |
|
| 553 | 553 | return in_array(Arr::data_get($item, $key), $values, $strict); |
| 554 | 554 | }); |
| 555 | 555 | } |
@@ -580,7 +580,7 @@ discard block |
||
| 580 | 580 | { |
| 581 | 581 | $values = $this->getArrayableItems($values); |
| 582 | 582 | |
| 583 | - return $this->reject(function ($item) use ($key, $values, $strict) { |
|
| 583 | + return $this->reject(function($item) use ($key, $values, $strict) { |
|
| 584 | 584 | return in_array(Arr::data_get($item, $key), $values, $strict); |
| 585 | 585 | }); |
| 586 | 586 | } |
@@ -912,7 +912,7 @@ discard block |
||
| 912 | 912 | */ |
| 913 | 913 | public function mapSpread(callable $callback) |
| 914 | 914 | { |
| 915 | - return $this->map(function ($chunk, $key) use ($callback) { |
|
| 915 | + return $this->map(function($chunk, $key) use ($callback) { |
|
| 916 | 916 | $chunk[] = $key; |
| 917 | 917 | |
| 918 | 918 | return $callback(...$chunk); |
@@ -930,7 +930,7 @@ discard block |
||
| 930 | 930 | */ |
| 931 | 931 | public function mapToDictionary(callable $callback) |
| 932 | 932 | { |
| 933 | - $dictionary = $this->map($callback)->reduce(function ($groups, $pair) { |
|
| 933 | + $dictionary = $this->map($callback)->reduce(function($groups, $pair) { |
|
| 934 | 934 | $groups[key($pair)][] = reset($pair); |
| 935 | 935 | |
| 936 | 936 | return $groups; |
@@ -1000,7 +1000,7 @@ discard block |
||
| 1000 | 1000 | */ |
| 1001 | 1001 | public function mapInto($class) |
| 1002 | 1002 | { |
| 1003 | - return $this->map(function ($value, $key) use ($class) { |
|
| 1003 | + return $this->map(function($value, $key) use ($class) { |
|
| 1004 | 1004 | return new $class($value, $key); |
| 1005 | 1005 | }); |
| 1006 | 1006 | } |
@@ -1016,9 +1016,9 @@ discard block |
||
| 1016 | 1016 | { |
| 1017 | 1017 | $callback = $this->valueRetriever($callback); |
| 1018 | 1018 | |
| 1019 | - return $this->filter(function ($value) { |
|
| 1019 | + return $this->filter(function($value) { |
|
| 1020 | 1020 | return !is_null($value); |
| 1021 | - })->reduce(function ($result, $item) use ($callback) { |
|
| 1021 | + })->reduce(function($result, $item) use ($callback) { |
|
| 1022 | 1022 | $value = $callback($item); |
| 1023 | 1023 | |
| 1024 | 1024 | return is_null($result) || $value > $result ? $value : $result; |
@@ -1072,9 +1072,9 @@ discard block |
||
| 1072 | 1072 | { |
| 1073 | 1073 | $callback = $this->valueRetriever($callback); |
| 1074 | 1074 | |
| 1075 | - return $this->filter(function ($value) { |
|
| 1075 | + return $this->filter(function($value) { |
|
| 1076 | 1076 | return !is_null($value); |
| 1077 | - })->reduce(function ($result, $item) use ($callback) { |
|
| 1077 | + })->reduce(function($result, $item) use ($callback) { |
|
| 1078 | 1078 | $value = $callback($item); |
| 1079 | 1079 | |
| 1080 | 1080 | return is_null($result) || $value < $result ? $value : $result; |
@@ -1303,12 +1303,12 @@ discard block |
||
| 1303 | 1303 | public function reject($callback) |
| 1304 | 1304 | { |
| 1305 | 1305 | if ($this->useAsCallable($callback)) { |
| 1306 | - return $this->filter(function ($value, $key) use ($callback) { |
|
| 1306 | + return $this->filter(function($value, $key) use ($callback) { |
|
| 1307 | 1307 | return !$callback($value, $key); |
| 1308 | 1308 | }); |
| 1309 | 1309 | } |
| 1310 | 1310 | |
| 1311 | - return $this->filter(function ($item) use ($callback) { |
|
| 1311 | + return $this->filter(function($item) use ($callback) { |
|
| 1312 | 1312 | return $item != $callback; |
| 1313 | 1313 | }); |
| 1314 | 1314 | } |
@@ -1372,7 +1372,7 @@ discard block |
||
| 1372 | 1372 | } else { |
| 1373 | 1373 | srand($seed); |
| 1374 | 1374 | |
| 1375 | - usort($items, function () { |
|
| 1375 | + usort($items, function() { |
|
| 1376 | 1376 | return rand(-1, 1); |
| 1377 | 1377 | }); |
| 1378 | 1378 | } |
@@ -1532,7 +1532,7 @@ discard block |
||
| 1532 | 1532 | |
| 1533 | 1533 | $callback = $this->valueRetriever($callback); |
| 1534 | 1534 | |
| 1535 | - return $this->reduce(function ($result, $item) use ($callback) { |
|
| 1535 | + return $this->reduce(function($result, $item) use ($callback) { |
|
| 1536 | 1536 | return $result + $callback($item); |
| 1537 | 1537 | }, 0); |
| 1538 | 1538 | } |
@@ -1599,7 +1599,7 @@ discard block |
||
| 1599 | 1599 | |
| 1600 | 1600 | $exists = []; |
| 1601 | 1601 | |
| 1602 | - return $this->reject(function ($item, $key) use ($callback, $strict, &$exists) { |
|
| 1602 | + return $this->reject(function($item, $key) use ($callback, $strict, &$exists) { |
|
| 1603 | 1603 | if (in_array($id = $callback($item, $key), $exists, $strict)) { |
| 1604 | 1604 | return true; |
| 1605 | 1605 | } |
@@ -1643,7 +1643,7 @@ discard block |
||
| 1643 | 1643 | return $value; |
| 1644 | 1644 | } |
| 1645 | 1645 | |
| 1646 | - return function ($item) use ($value) { |
|
| 1646 | + return function($item) use ($value) { |
|
| 1647 | 1647 | return Arr::data_get($item, $value); |
| 1648 | 1648 | }; |
| 1649 | 1649 | } |
@@ -1660,11 +1660,11 @@ discard block |
||
| 1660 | 1660 | */ |
| 1661 | 1661 | public function zip($items) |
| 1662 | 1662 | { |
| 1663 | - $arrayableItems = array_map(function ($items) { |
|
| 1663 | + $arrayableItems = array_map(function($items) { |
|
| 1664 | 1664 | return $this->getArrayableItems($items); |
| 1665 | 1665 | }, func_get_args()); |
| 1666 | 1666 | |
| 1667 | - $params = array_merge([function () { |
|
| 1667 | + $params = array_merge([function() { |
|
| 1668 | 1668 | return new static(func_get_args()); |
| 1669 | 1669 | }, $this->items], $arrayableItems); |
| 1670 | 1670 | |
@@ -1691,7 +1691,7 @@ discard block |
||
| 1691 | 1691 | */ |
| 1692 | 1692 | public function toArray() |
| 1693 | 1693 | { |
| 1694 | - return array_map(function ($value) { |
|
| 1694 | + return array_map(function($value) { |
|
| 1695 | 1695 | return $value instanceof Arrayable ? $value->toArray() : $value; |
| 1696 | 1696 | }, $this->items); |
| 1697 | 1697 | } |
@@ -1703,7 +1703,7 @@ discard block |
||
| 1703 | 1703 | */ |
| 1704 | 1704 | public function jsonSerialize() |
| 1705 | 1705 | { |
| 1706 | - return array_map(function ($value) { |
|
| 1706 | + return array_map(function($value) { |
|
| 1707 | 1707 | if ($value instanceof JsonSerializable) { |
| 1708 | 1708 | return $value->jsonSerialize(); |
| 1709 | 1709 | } elseif ($value instanceof Jsonable) { |
@@ -97,10 +97,10 @@ discard block |
||
| 97 | 97 | * @var array |
| 98 | 98 | */ |
| 99 | 99 | private $validNamespaces = [ |
| 100 | - 'miot-spec', // 小米定义的规范 |
|
| 101 | - 'miot-spec-v2', // 小米定义的规范版本2 |
|
| 102 | - 'bluetooth-spec', // 蓝牙联盟定义的规范 |
|
| 103 | - 'yeelink-spec', // 为yeelink定义的规范 |
|
| 100 | + 'miot-spec', // 小米定义的规范 |
|
| 101 | + 'miot-spec-v2', // 小米定义的规范版本2 |
|
| 102 | + 'bluetooth-spec', // 蓝牙联盟定义的规范 |
|
| 103 | + 'yeelink-spec', // 为yeelink定义的规范 |
|
| 104 | 104 | ]; |
| 105 | 105 | |
| 106 | 106 | /** |
@@ -123,11 +123,11 @@ discard block |
||
| 123 | 123 | * @var array |
| 124 | 124 | */ |
| 125 | 125 | private $validTypes = [ |
| 126 | - 'property', // 属性 |
|
| 127 | - 'action', // 方法 |
|
| 128 | - 'event', // 事件 |
|
| 129 | - 'service', // 服务 |
|
| 130 | - 'device', // 设备 |
|
| 126 | + 'property', // 属性 |
|
| 127 | + 'action', // 方法 |
|
| 128 | + 'event', // 事件 |
|
| 129 | + 'service', // 服务 |
|
| 130 | + 'device', // 设备 |
|
| 131 | 131 | ]; |
| 132 | 132 | |
| 133 | 133 | /** |
@@ -412,7 +412,7 @@ discard block |
||
| 412 | 412 | |
| 413 | 413 | foreach ($this->baseColumns as $column) { |
| 414 | 414 | $fncName = 'get'.ucfirst( |
| 415 | - preg_replace_callback('/_([a-zA-Z])/', function ($match) { |
|
| 415 | + preg_replace_callback('/_([a-zA-Z])/', function($match) { |
|
| 416 | 416 | return strtoupper($match[1]); |
| 417 | 417 | }, $column) |
| 418 | 418 | ); |
@@ -446,7 +446,7 @@ discard block |
||
| 446 | 446 | |
| 447 | 447 | foreach ($this->columns as $column) { |
| 448 | 448 | $fncName = 'get'.ucfirst( |
| 449 | - preg_replace_callback('/_([a-zA-Z])/', function ($match) { |
|
| 449 | + preg_replace_callback('/_([a-zA-Z])/', function($match) { |
|
| 450 | 450 | return strtoupper($match[1]); |
| 451 | 451 | }, $column) |
| 452 | 452 | ); |
@@ -472,7 +472,7 @@ discard block |
||
| 472 | 472 | |
| 473 | 473 | foreach ($this->columns as $index => $column) { |
| 474 | 474 | $fncName = 'set'.ucfirst( |
| 475 | - preg_replace_callback('/_([a-zA-Z])/', function ($match) { |
|
| 475 | + preg_replace_callback('/_([a-zA-Z])/', function($match) { |
|
| 476 | 476 | return strtoupper($match[1]); |
| 477 | 477 | }, $column) |
| 478 | 478 | ); |