|
@@ -79,22 +79,22 @@ discard block |
|
|
block discarded – undo |
|
79
|
79
|
{ |
|
80
|
80
|
switch ($type) { |
|
81
|
81
|
case 'array': |
|
82
|
|
- return $this->select(function($v) { return (array)$v; }); |
|
|
82
|
+ return $this->select(function($v) { return (array) $v; }); |
|
83
|
83
|
case 'int': |
|
84
|
84
|
case 'integer': |
|
85
|
85
|
case 'long': |
|
86
|
|
- return $this->select(function($v) { return (int)$v; }); |
|
|
86
|
+ return $this->select(function($v) { return (int) $v; }); |
|
87
|
87
|
case 'float': |
|
88
|
88
|
case 'real': |
|
89
|
89
|
case 'double': |
|
90
|
|
- return $this->select(function($v) { return (float)$v; }); |
|
|
90
|
+ return $this->select(function($v) { return (float) $v; }); |
|
91
|
91
|
case 'null': |
|
92
|
92
|
case 'unset': |
|
93
|
93
|
return $this->select(function() { return null; }); |
|
94
|
94
|
case 'object': |
|
95
|
|
- return $this->select(function($v) { return (object)$v; }); |
|
|
95
|
+ return $this->select(function($v) { return (object) $v; }); |
|
96
|
96
|
case 'string': |
|
97
|
|
- return $this->select(function($v) { return (string)$v; }); |
|
|
97
|
+ return $this->select(function($v) { return (string) $v; }); |
|
98
|
98
|
default: |
|
99
|
99
|
throw new InvalidArgumentException(Errors::UNSUPPORTED_BUILTIN_TYPE); |
|
100
|
100
|
} |
|
@@ -289,7 +289,7 @@ discard block |
|
|
block discarded – undo |
|
289
|
289
|
$inner = self::from($inner); |
|
290
|
290
|
$outerKeySelector = Utils::createLambda($outerKeySelector, 'v,k', Functions::$key); |
|
291
|
291
|
$innerKeySelector = Utils::createLambda($innerKeySelector, 'v,k', Functions::$key); |
|
292
|
|
- $resultSelectorValue = Utils::createLambda($resultSelectorValue, 'v,e,k', function($v, $e, $k) { return [ $v, $e ]; }); |
|
|
292
|
+ $resultSelectorValue = Utils::createLambda($resultSelectorValue, 'v,e,k', function($v, $e, $k) { return [$v, $e]; }); |
|
293
|
293
|
$resultSelectorKey = Utils::createLambda($resultSelectorKey, 'v,e,k', function($v, $e, $k) { return $k; }); |
|
294
|
294
|
|
|
295
|
295
|
return new self(function() use ($inner, $outerKeySelector, $innerKeySelector, $resultSelectorValue, $resultSelectorKey) { |
|
@@ -323,7 +323,7 @@ discard block |
|
|
block discarded – undo |
|
323
|
323
|
$inner = self::from($inner); |
|
324
|
324
|
$outerKeySelector = Utils::createLambda($outerKeySelector, 'v,k', Functions::$key); |
|
325
|
325
|
$innerKeySelector = Utils::createLambda($innerKeySelector, 'v,k', Functions::$key); |
|
326
|
|
- $resultSelectorValue = Utils::createLambda($resultSelectorValue, 'v1,v2,k', function($v1, $v2, $k) { return [ $v1, $v2 ]; }); |
|
|
326
|
+ $resultSelectorValue = Utils::createLambda($resultSelectorValue, 'v1,v2,k', function($v1, $v2, $k) { return [$v1, $v2]; }); |
|
327
|
327
|
$resultSelectorKey = Utils::createLambda($resultSelectorKey, 'v1,v2,k', function($v1, $v2, $k) { return $k; }); |
|
328
|
328
|
|
|
329
|
329
|
return new self(function() use ($inner, $outerKeySelector, $innerKeySelector, $resultSelectorValue, $resultSelectorKey) { |