@@ -40,8 +40,8 @@ discard block |
||
| 40 | 40 | public static function init() |
| 41 | 41 | { |
| 42 | 42 | self::$lambdaCache = [ |
| 43 | - '$v' => [ 'v,k' => Functions::$value ], |
|
| 44 | - '$k' => [ 'v,k' => Functions::$key ], |
|
| 43 | + '$v' => ['v,k' => Functions::$value], |
|
| 44 | + '$k' => ['v,k' => Functions::$key], |
|
| 45 | 45 | ]; |
| 46 | 46 | } |
| 47 | 47 | |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | $code = substr($closure, $posArrow + 3); |
| 147 | 147 | } |
| 148 | 148 | else { |
| 149 | - $args = '$' . str_replace(',', '=null,$', $closureArgs) . '=null'; |
|
| 149 | + $args = '$'.str_replace(',', '=null,$', $closureArgs).'=null'; |
|
| 150 | 150 | $code = $closure; |
| 151 | 151 | } |
| 152 | 152 | $code = trim($code, " \r\n\t"); |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | { |
| 207 | 207 | /** @var $order OrderedEnumerable */ |
| 208 | 208 | foreach ($this->source as $k => $v) |
| 209 | - $enum[] = [ $k, $v ]; |
|
| 209 | + $enum[] = [$k, $v]; |
|
| 210 | 210 | |
| 211 | 211 | $args = []; |
| 212 | 212 | foreach ($orders as $order) { |
@@ -228,7 +228,7 @@ discard block |
||
| 228 | 228 | { |
| 229 | 229 | /** @var $order OrderedEnumerable */ |
| 230 | 230 | foreach ($this->source as $k => $v) { |
| 231 | - $element = [ $k, $v ]; |
|
| 231 | + $element = [$k, $v]; |
|
| 232 | 232 | foreach ($orders as $order) { |
| 233 | 233 | $keySelector = $order->keySelector; |
| 234 | 234 | $element[] = $keySelector($v, $k); |
@@ -79,22 +79,22 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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) { |