@@ -44,23 +44,35 @@ discard block |
||
| 44 | 44 | |
| 45 | 45 | private function getKeyToSlice($tokenType) { |
| 46 | 46 | $keys = $this->getKeysOfTokenType($tokenType); |
| 47 | - if (empty($keys)) return false; |
|
| 47 | + if (empty($keys)) { |
|
| 48 | + return false; |
|
| 49 | + } |
|
| 48 | 50 | $key = $keys[0]; |
| 49 | - for ($i = 0; $key < $this->iterator && isset($keys[$i]); $i++) $key = $keys[$i]; |
|
| 51 | + for ($i = 0; $key < $this->iterator && isset($keys[$i]); $i++) { |
|
| 52 | + $key = $keys[$i]; |
|
| 53 | + } |
|
| 50 | 54 | return $key; |
| 51 | 55 | } |
| 52 | 56 | |
| 53 | 57 | public function from($tokenType, $inclusive = false) { |
| 54 | 58 | $key = $this->getKeyToSlice($tokenType); |
| 55 | - if ($key === false) return new Tokens([]); |
|
| 56 | - if (!$inclusive) $key++; |
|
| 59 | + if ($key === false) { |
|
| 60 | + return new Tokens([]); |
|
| 61 | + } |
|
| 62 | + if (!$inclusive) { |
|
| 63 | + $key++; |
|
| 64 | + } |
|
| 57 | 65 | return new Tokens(array_slice($this->tokens, $key)); |
| 58 | 66 | } |
| 59 | 67 | |
| 60 | 68 | public function to($tokenType, $inclusive = false) { |
| 61 | 69 | $key = $this->getKeyToSlice($tokenType); |
| 62 | - if ($key === false) return new Tokens([]); |
|
| 63 | - if ($inclusive) $key++; |
|
| 70 | + if ($key === false) { |
|
| 71 | + return new Tokens([]); |
|
| 72 | + } |
|
| 73 | + if ($inclusive) { |
|
| 74 | + $key++; |
|
| 75 | + } |
|
| 64 | 76 | return new Tokens(array_slice($this->tokens, $this->iterator, $key)); |
| 65 | 77 | } |
| 66 | 78 | |
@@ -72,8 +84,11 @@ discard block |
||
| 72 | 84 | $splitTokens = []; |
| 73 | 85 | $i = 0; |
| 74 | 86 | foreach ($this->tokens as $token) { |
| 75 | - if ($token['type'] === $tokenType) $i++; |
|
| 76 | - else $splitTokens[$i][] = $token; |
|
| 87 | + if ($token['type'] === $tokenType) { |
|
| 88 | + $i++; |
|
| 89 | + } else { |
|
| 90 | + $splitTokens[$i][] = $token; |
|
| 91 | + } |
|
| 77 | 92 | } |
| 78 | 93 | return array_map(function ($tokens) { |
| 79 | 94 | return new Tokens($tokens); |