spiral / framework

src/Stempler/src/Lexer/Grammar/InlineGrammar.php

Spacing +23 added lines, -23 removed lines

@@ -48,14 +48,14 @@ 
      */
     public function parse(Buffer $src): \Generator
     {
-        while ($n = $src->next()) {
-            if (!$n instanceof Byte || $n->char !== '$' || $src->lookaheadByte() !== '{') {
+        while ($n = $src->next()){
+            if (!$n instanceof Byte || $n->char !== '$' || $src->lookaheadByte() !== '{'){
                 yield $n;
                 continue;
             }
 
             $binding = (clone $this)->parseGrammar($src, $n->offset);
-            if ($binding === null) {
+            if ($binding === null){
                 yield $n;
                 $src->replay($n->offset);
                 continue;
@@ -71,7 +71,7 @@ 
      */
     public static function tokenName(int $token): string
     {
-        switch ($token) {
+        switch ($token){
             case self::TYPE_OPEN_TAG:
                 return 'INLINE:OPEN_TAG';
             case self::TYPE_CLOSE_TAG:
@@ -93,27 +93,27 @@ 
     private function parseGrammar(Buffer $src, int $offset): ?array
     {
         $this->tokens = [
-            new Token(self::TYPE_OPEN_TAG, $offset, '$' . $src->next()->char),
+            new Token(self::TYPE_OPEN_TAG, $offset, '$'.$src->next()->char),
         ];
 
-        while ($n = $src->next()) {
-            if (!$n instanceof Byte) {
+        while ($n = $src->next()){
+            if (!$n instanceof Byte){
                 // no other grammars are allowed
                 return null;
             }
 
-            switch ($n->char) {
+            switch ($n->char){
                 case '"':
                 case "'":
-                    if ($this->default === null) {
+                    if ($this->default === null){
                         // " and ' not allowed in names
                         return null;
                     }
 
                     $this->default[] = $n;
-                    while ($nn = $src->next()) {
+                    while ($nn = $src->next()){
                         $this->default[] = $nn;
-                        if ($nn instanceof Byte && $nn->char === $n->char) {
+                        if ($nn instanceof Byte && $nn->char === $n->char){
                             break;
                         }
                     }
@@ -146,17 +146,17 @@ 
                     break;
 
                 default:
-                    if ($this->default !== null) {
+                    if ($this->default !== null){
                         // default allows spaces
                         $this->default[] = $n;
                         break;
                     }
 
-                    if (preg_match(self::REGEXP_WHITESPACE, $n->char)) {
+                    if (preg_match(self::REGEXP_WHITESPACE, $n->char)){
                         break;
                     }
 
-                    if (preg_match(self::REGEXP_KEYWORD, $n->char)) {
+                    if (preg_match(self::REGEXP_KEYWORD, $n->char)){
                         $this->name[] = $n;
                         break;
                     }
@@ -165,7 +165,7 @@ 
             }
         }
 
-        if (!$this->isValid()) {
+        if (!$this->isValid()){
             return null;
         }
 
@@ -174,25 +174,25 @@ 
 
     private function isValid(): bool
     {
-        if (count($this->tokens) < 3) {
+        if (count($this->tokens) < 3){
             return false;
         }
 
         $hasName = false;
         $hasDefault = null;
-        foreach ($this->tokens as $token) {
-            if ($token->type === self::TYPE_NAME) {
+        foreach ($this->tokens as $token){
+            if ($token->type === self::TYPE_NAME){
                 $hasName = true;
                 continue;
             }
 
-            if ($token->type === self::TYPE_SEPARATOR && $hasDefault === null) {
+            if ($token->type === self::TYPE_SEPARATOR && $hasDefault === null){
                 $hasDefault = false;
                 continue;
             }
 
-            if ($token->type === self::TYPE_DEFAULT) {
-                if ($hasDefault === true) {
+            if ($token->type === self::TYPE_DEFAULT){
+                if ($hasDefault === true){
                     // multiple default value
                     return false;
                 }
@@ -209,7 +209,7 @@ 
      */
     private function flushName(): void
     {
-        if ($this->name === []) {
+        if ($this->name === []){
             return;
         }
 
@@ -222,7 +222,7 @@ 
      */
     private function flushDefault(): void
     {
-        if ($this->default === [] || $this->default === null) {
+        if ($this->default === [] || $this->default === null){
             return;
         }
 

Braces +44 added lines, -22 removed lines

@@ -48,14 +48,17 @@ 
      */
     public function parse(Buffer $src): \Generator
     {
-        while ($n = $src->next()) {
-            if (!$n instanceof Byte || $n->char !== '$' || $src->lookaheadByte() !== '{') {
+        while ($n = $src->next())
+        {
+            if (!$n instanceof Byte || $n->char !== '$' || $src->lookaheadByte() !== '{')
+            {
                 yield $n;
                 continue;
             }
 
             $binding = (clone $this)->parseGrammar($src, $n->offset);
-            if ($binding === null) {
+            if ($binding === null)
+            {
                 yield $n;
                 $src->replay($n->offset);
                 continue;
@@ -71,7 +74,8 @@ 
      */
     public static function tokenName(int $token): string
     {
-        switch ($token) {
+        switch ($token)
+        {
             case self::TYPE_OPEN_TAG:
                 return 'INLINE:OPEN_TAG';
             case self::TYPE_CLOSE_TAG:
@@ -96,24 +100,30 @@ 
             new Token(self::TYPE_OPEN_TAG, $offset, '$' . $src->next()->char),
         ];
 
-        while ($n = $src->next()) {
-            if (!$n instanceof Byte) {
+        while ($n = $src->next())
+        {
+            if (!$n instanceof Byte)
+            {
                 // no other grammars are allowed
                 return null;
             }
 
-            switch ($n->char) {
+            switch ($n->char)
+            {
                 case '"':
                 case "'":
-                    if ($this->default === null) {
+                    if ($this->default === null)
+                    {
                         // " and ' not allowed in names
                         return null;
                     }
 
                     $this->default[] = $n;
-                    while ($nn = $src->next()) {
+                    while ($nn = $src->next())
+                    {
                         $this->default[] = $nn;
-                        if ($nn instanceof Byte && $nn->char === $n->char) {
+                        if ($nn instanceof Byte && $nn->char === $n->char)
+                        {
                             break;
                         }
                     }
@@ -146,17 +156,20 @@ 
                     break;
 
                 default:
-                    if ($this->default !== null) {
+                    if ($this->default !== null)
+                    {
                         // default allows spaces
                         $this->default[] = $n;
                         break;
                     }
 
-                    if (preg_match(self::REGEXP_WHITESPACE, $n->char)) {
+                    if (preg_match(self::REGEXP_WHITESPACE, $n->char))
+                    {
                         break;
                     }
 
-                    if (preg_match(self::REGEXP_KEYWORD, $n->char)) {
+                    if (preg_match(self::REGEXP_KEYWORD, $n->char))
+                    {
                         $this->name[] = $n;
                         break;
                     }
@@ -165,7 +178,8 @@ 
             }
         }
 
-        if (!$this->isValid()) {
+        if (!$this->isValid())
+        {
             return null;
         }
 
@@ -174,25 +188,31 @@ 
 
     private function isValid(): bool
     {
-        if (count($this->tokens) < 3) {
+        if (count($this->tokens) < 3)
+        {
             return false;
         }
 
         $hasName = false;
         $hasDefault = null;
-        foreach ($this->tokens as $token) {
-            if ($token->type === self::TYPE_NAME) {
+        foreach ($this->tokens as $token)
+        {
+            if ($token->type === self::TYPE_NAME)
+            {
                 $hasName = true;
                 continue;
             }
 
-            if ($token->type === self::TYPE_SEPARATOR && $hasDefault === null) {
+            if ($token->type === self::TYPE_SEPARATOR && $hasDefault === null)
+            {
                 $hasDefault = false;
                 continue;
             }
 
-            if ($token->type === self::TYPE_DEFAULT) {
-                if ($hasDefault === true) {
+            if ($token->type === self::TYPE_DEFAULT)
+            {
+                if ($hasDefault === true)
+                {
                     // multiple default value
                     return false;
                 }
@@ -209,7 +229,8 @@ 
      */
     private function flushName(): void
     {
-        if ($this->name === []) {
+        if ($this->name === [])
+        {
             return;
         }
 
@@ -222,7 +243,8 @@ 
      */
     private function flushDefault(): void
     {
-        if ($this->default === [] || $this->default === null) {
+        if ($this->default === [] || $this->default === null)
+        {
             return;
         }
 

src/Stempler/src/Lexer/Grammar/Dynamic/DirectiveGrammar.php

Spacing +30 added lines, -30 removed lines

@@ -46,39 +46,39 @@ 
         $this->body = null;
         $hasWhitespace = false;
 
-        while ($n = $src->next()) {
-            if (!$n instanceof Byte) {
+        while ($n = $src->next()){
+            if (!$n instanceof Byte){
                 // no other grammars are allowed
                 break;
             }
 
-            switch ($n->char) {
+            switch ($n->char){
                 case '(':
                     $this->flushName();
                     $this->tokens[] = new Token(DynamicGrammar::TYPE_BODY_OPEN, $n->offset, $n->char);
 
                     return $this->parseBody($src);
                 default:
-                    if (preg_match(self::REGEXP_WHITESPACE, $n->char)) {
+                    if (preg_match(self::REGEXP_WHITESPACE, $n->char)){
                         $hasWhitespace = true;
-                        if ($this->name !== []) {
+                        if ($this->name !== []){
                             $this->flushName();
                             $this->tokens[] = new Token(DynamicGrammar::TYPE_WHITESPACE, $n->offset, $n->char);
                             break;
                         }
 
-                        if ($this->getLastToken()->type === DynamicGrammar::TYPE_WHITESPACE) {
+                        if ($this->getLastToken()->type === DynamicGrammar::TYPE_WHITESPACE){
                             $this->getLastToken()->content .= $n->char;
                             break;
                         }
 
                         // invalid directive
                         return false;
-                    } elseif ($hasWhitespace) {
+                    } elseif ($hasWhitespace){
                         return $this->finalize();
                     }
 
-                    if (!preg_match(self::REGEXP_KEYWORD, $n->char)) {
+                    if (!preg_match(self::REGEXP_KEYWORD, $n->char)){
                         $this->flushName();
 
                         return $this->finalize();
@@ -100,7 +100,7 @@ 
      */
     public function getIterator(): \Traversable
     {
-        if ($this->tokens === []) {
+        if ($this->tokens === []){
             throw new \LogicException('Directive not parsed');
         }
 
@@ -120,8 +120,8 @@ 
      */
     public function getKeyword(): string
     {
-        foreach ($this->tokens as $token) {
-            if ($token->type === DynamicGrammar::TYPE_KEYWORD) {
+        foreach ($this->tokens as $token){
+            if ($token->type === DynamicGrammar::TYPE_KEYWORD){
                 return $token->content;
             }
         }
@@ -136,8 +136,8 @@ 
      */
     public function getBody(): ?string
     {
-        foreach ($this->tokens as $token) {
-            if ($token->type === DynamicGrammar::TYPE_BODY) {
+        foreach ($this->tokens as $token){
+            if ($token->type === DynamicGrammar::TYPE_BODY){
                 return $token->content;
             }
         }
@@ -150,7 +150,7 @@ 
      */
     private function flushName(): void
     {
-        if ($this->name === []) {
+        if ($this->name === []){
             return;
         }
 
@@ -166,17 +166,17 @@ 
         $this->body = [];
         $level = 1;
 
-        while ($nn = $src->next()) {
-            if (!$nn instanceof Byte) {
+        while ($nn = $src->next()){
+            if (!$nn instanceof Byte){
                 $this->flushBody();
                 return $this->finalize();
             }
 
-            if (in_array($nn->char, ['"', '"'])) {
+            if (in_array($nn->char, ['"', '"'])){
                 $this->body[] = $nn;
-                while ($nnn = $src->next()) {
+                while ($nnn = $src->next()){
                     $this->body[] = $nnn;
-                    if ($nnn instanceof Byte && $nnn->char === $nn->char) {
+                    if ($nnn instanceof Byte && $nnn->char === $nn->char){
                         break;
                     }
                 }
@@ -185,15 +185,15 @@ 
 
             $this->body[] = $nn;
 
-            if ($nn->char === '(') {
+            if ($nn->char === '('){
                 $level++;
                 continue;
             }
 
-            if ($nn->char === ')') {
+            if ($nn->char === ')'){
                 $level--;
 
-                if ($level === 0) {
+                if ($level === 0){
                     $n = array_pop($this->body);
 
                     $this->flushBody();
@@ -214,7 +214,7 @@ 
      */
     private function flushBody(): void
     {
-        if ($this->body === []) {
+        if ($this->body === []){
             return;
         }
 
@@ -224,7 +224,7 @@ 
 
     private function getLastToken(): Token
     {
-        if ($this->tokens === []) {
+        if ($this->tokens === []){
             throw new \LogicException('Directive not parsed');
         }
 
@@ -238,8 +238,8 @@ 
     {
         $tokens = $this->tokens;
 
-        foreach (array_reverse($tokens, true) as $i => $t) {
-            if ($t->type !== DynamicGrammar::TYPE_WHITESPACE) {
+        foreach (array_reverse($tokens, true) as $i => $t){
+            if ($t->type !== DynamicGrammar::TYPE_WHITESPACE){
                 break;
             }
 
@@ -247,19 +247,19 @@ 
         }
 
         $body = null;
-        foreach ($tokens as $t) {
-            if ($t->type === DynamicGrammar::TYPE_BODY_OPEN) {
+        foreach ($tokens as $t){
+            if ($t->type === DynamicGrammar::TYPE_BODY_OPEN){
                 $body = false;
                 continue;
             }
 
-            if ($t->type === DynamicGrammar::TYPE_BODY_CLOSE) {
+            if ($t->type === DynamicGrammar::TYPE_BODY_CLOSE){
                 $body = null;
                 continue;
             }
         }
 
-        if ($body !== null) {
+        if ($body !== null){
             return false;
         }
 

Braces +61 added lines, -30 removed lines

@@ -46,39 +46,48 @@ 
         $this->body = null;
         $hasWhitespace = false;
 
-        while ($n = $src->next()) {
-            if (!$n instanceof Byte) {
+        while ($n = $src->next())
+        {
+            if (!$n instanceof Byte)
+            {
                 // no other grammars are allowed
                 break;
             }
 
-            switch ($n->char) {
+            switch ($n->char)
+            {
                 case '(':
                     $this->flushName();
                     $this->tokens[] = new Token(DynamicGrammar::TYPE_BODY_OPEN, $n->offset, $n->char);
 
                     return $this->parseBody($src);
                 default:
-                    if (preg_match(self::REGEXP_WHITESPACE, $n->char)) {
+                    if (preg_match(self::REGEXP_WHITESPACE, $n->char))
+                    {
                         $hasWhitespace = true;
-                        if ($this->name !== []) {
+                        if ($this->name !== [])
+                        {
                             $this->flushName();
                             $this->tokens[] = new Token(DynamicGrammar::TYPE_WHITESPACE, $n->offset, $n->char);
                             break;
                         }
 
-                        if ($this->getLastToken()->type === DynamicGrammar::TYPE_WHITESPACE) {
+                        if ($this->getLastToken()->type === DynamicGrammar::TYPE_WHITESPACE)
+                        {
                             $this->getLastToken()->content .= $n->char;
                             break;
                         }
 
                         // invalid directive
                         return false;
-                    } elseif ($hasWhitespace) {
+                    }
+                    elseif ($hasWhitespace)
+                    {
                         return $this->finalize();
                     }
 
-                    if (!preg_match(self::REGEXP_KEYWORD, $n->char)) {
+                    if (!preg_match(self::REGEXP_KEYWORD, $n->char))
+                    {
                         $this->flushName();
 
                         return $this->finalize();
@@ -100,7 +109,8 @@ 
      */
     public function getIterator(): \Traversable
     {
-        if ($this->tokens === []) {
+        if ($this->tokens === [])
+        {
             throw new \LogicException('Directive not parsed');
         }
 
@@ -120,8 +130,10 @@ 
      */
     public function getKeyword(): string
     {
-        foreach ($this->tokens as $token) {
-            if ($token->type === DynamicGrammar::TYPE_KEYWORD) {
+        foreach ($this->tokens as $token)
+        {
+            if ($token->type === DynamicGrammar::TYPE_KEYWORD)
+            {
                 return $token->content;
             }
         }
@@ -136,8 +148,10 @@ 
      */
     public function getBody(): ?string
     {
-        foreach ($this->tokens as $token) {
-            if ($token->type === DynamicGrammar::TYPE_BODY) {
+        foreach ($this->tokens as $token)
+        {
+            if ($token->type === DynamicGrammar::TYPE_BODY)
+            {
                 return $token->content;
             }
         }
@@ -150,7 +164,8 @@ 
      */
     private function flushName(): void
     {
-        if ($this->name === []) {
+        if ($this->name === [])
+        {
             return;
         }
 
@@ -166,17 +181,22 @@ 
         $this->body = [];
         $level = 1;
 
-        while ($nn = $src->next()) {
-            if (!$nn instanceof Byte) {
+        while ($nn = $src->next())
+        {
+            if (!$nn instanceof Byte)
+            {
                 $this->flushBody();
                 return $this->finalize();
             }
 
-            if (in_array($nn->char, ['"', '"'])) {
+            if (in_array($nn->char, ['"', '"']))
+            {
                 $this->body[] = $nn;
-                while ($nnn = $src->next()) {
+                while ($nnn = $src->next())
+                {
                     $this->body[] = $nnn;
-                    if ($nnn instanceof Byte && $nnn->char === $nn->char) {
+                    if ($nnn instanceof Byte && $nnn->char === $nn->char)
+                    {
                         break;
                     }
                 }
@@ -185,15 +205,18 @@ 
 
             $this->body[] = $nn;
 
-            if ($nn->char === '(') {
+            if ($nn->char === '(')
+            {
                 $level++;
                 continue;
             }
 
-            if ($nn->char === ')') {
+            if ($nn->char === ')')
+            {
                 $level--;
 
-                if ($level === 0) {
+                if ($level === 0)
+                {
                     $n = array_pop($this->body);
 
                     $this->flushBody();
@@ -214,7 +237,8 @@ 
      */
     private function flushBody(): void
     {
-        if ($this->body === []) {
+        if ($this->body === [])
+        {
             return;
         }
 
@@ -224,7 +248,8 @@ 
 
     private function getLastToken(): Token
     {
-        if ($this->tokens === []) {
+        if ($this->tokens === [])
+        {
             throw new \LogicException('Directive not parsed');
         }
 
@@ -238,8 +263,10 @@ 
     {
         $tokens = $this->tokens;
 
-        foreach (array_reverse($tokens, true) as $i => $t) {
-            if ($t->type !== DynamicGrammar::TYPE_WHITESPACE) {
+        foreach (array_reverse($tokens, true) as $i => $t)
+        {
+            if ($t->type !== DynamicGrammar::TYPE_WHITESPACE)
+            {
                 break;
             }
 
@@ -247,19 +274,23 @@ 
         }
 
         $body = null;
-        foreach ($tokens as $t) {
-            if ($t->type === DynamicGrammar::TYPE_BODY_OPEN) {
+        foreach ($tokens as $t)
+        {
+            if ($t->type === DynamicGrammar::TYPE_BODY_OPEN)
+            {
                 $body = false;
                 continue;
             }
 
-            if ($t->type === DynamicGrammar::TYPE_BODY_CLOSE) {
+            if ($t->type === DynamicGrammar::TYPE_BODY_CLOSE)
+            {
                 $body = null;
                 continue;
             }
         }
 
-        if ($body !== null) {
+        if ($body !== null)
+        {
             return false;
         }
 

src/Stempler/src/Lexer/Grammar/Dynamic/DeclareGrammar.php

Spacing +11 added lines, -11 removed lines

@@ -41,19 +41,19 @@ 
     public function parse(Buffer $src): \Generator
     {
         $quoted = [];
-        while ($n = $src->next()) {
-            switch ($n->char) {
+        while ($n = $src->next()){
+            switch ($n->char){
                 case '"':
                 case "'":
-                    if ($this->keyword !== []) {
+                    if ($this->keyword !== []){
                         yield $this->packToken($this->keyword, self::TYPE_KEYWORD);
                         $this->keyword = [];
                     }
 
                     $quoted[] = $n;
-                    while ($nn = $src->next()) {
+                    while ($nn = $src->next()){
                         $quoted[] = $nn;
-                        if ($nn instanceof Byte && $nn->char === $n->char) {
+                        if ($nn instanceof Byte && $nn->char === $n->char){
                             break;
                         }
                     }
@@ -63,7 +63,7 @@ 
 
                     break;
                 case '=':
-                    if ($this->keyword !== []) {
+                    if ($this->keyword !== []){
                         yield $this->packToken($this->keyword, self::TYPE_KEYWORD);
                         $this->keyword = [];
                     }
@@ -71,7 +71,7 @@ 
                     yield new Token(self::TYPE_EQUAL, $n->offset, '=');
                     break;
                 case ',':
-                    if ($this->keyword !== []) {
+                    if ($this->keyword !== []){
                         yield $this->packToken($this->keyword, self::TYPE_KEYWORD);
                         $this->keyword = [];
                     }
@@ -79,8 +79,8 @@ 
                     yield new Token(self::TYPE_COMMA, $n->offset, ',');
                     break;
                 default:
-                    if (preg_match(self::REGEXP_WHITESPACE, $n->char)) {
-                        if ($this->keyword !== []) {
+                    if (preg_match(self::REGEXP_WHITESPACE, $n->char)){
+                        if ($this->keyword !== []){
                             yield $this->packToken($this->keyword, self::TYPE_KEYWORD);
                             $this->keyword = [];
                         }
@@ -92,7 +92,7 @@ 
             }
         }
 
-        if ($this->keyword !== []) {
+        if ($this->keyword !== []){
             yield $this->packToken($this->keyword, self::TYPE_KEYWORD);
         }
     }
@@ -102,7 +102,7 @@ 
      */
     public static function tokenName(int $token): string
     {
-        switch ($token) {
+        switch ($token){
             case self::TYPE_KEYWORD:
                 return 'DECLARE:KEYWORD';
             case self::TYPE_EQUAL:

Braces +22 added lines, -11 removed lines

@@ -41,19 +41,24 @@ 
     public function parse(Buffer $src): \Generator
     {
         $quoted = [];
-        while ($n = $src->next()) {
-            switch ($n->char) {
+        while ($n = $src->next())
+        {
+            switch ($n->char)
+            {
                 case '"':
                 case "'":
-                    if ($this->keyword !== []) {
+                    if ($this->keyword !== [])
+                    {
                         yield $this->packToken($this->keyword, self::TYPE_KEYWORD);
                         $this->keyword = [];
                     }
 
                     $quoted[] = $n;
-                    while ($nn = $src->next()) {
+                    while ($nn = $src->next())
+                    {
                         $quoted[] = $nn;
-                        if ($nn instanceof Byte && $nn->char === $n->char) {
+                        if ($nn instanceof Byte && $nn->char === $n->char)
+                        {
                             break;
                         }
                     }
@@ -63,7 +68,8 @@ 
 
                     break;
                 case '=':
-                    if ($this->keyword !== []) {
+                    if ($this->keyword !== [])
+                    {
                         yield $this->packToken($this->keyword, self::TYPE_KEYWORD);
                         $this->keyword = [];
                     }
@@ -71,7 +77,8 @@ 
                     yield new Token(self::TYPE_EQUAL, $n->offset, '=');
                     break;
                 case ',':
-                    if ($this->keyword !== []) {
+                    if ($this->keyword !== [])
+                    {
                         yield $this->packToken($this->keyword, self::TYPE_KEYWORD);
                         $this->keyword = [];
                     }
@@ -79,8 +86,10 @@ 
                     yield new Token(self::TYPE_COMMA, $n->offset, ',');
                     break;
                 default:
-                    if (preg_match(self::REGEXP_WHITESPACE, $n->char)) {
-                        if ($this->keyword !== []) {
+                    if (preg_match(self::REGEXP_WHITESPACE, $n->char))
+                    {
+                        if ($this->keyword !== [])
+                        {
                             yield $this->packToken($this->keyword, self::TYPE_KEYWORD);
                             $this->keyword = [];
                         }
@@ -92,7 +101,8 @@ 
             }
         }
 
-        if ($this->keyword !== []) {
+        if ($this->keyword !== [])
+        {
             yield $this->packToken($this->keyword, self::TYPE_KEYWORD);
         }
     }
@@ -102,7 +112,8 @@ 
      */
     public static function tokenName(int $token): string
     {
-        switch ($token) {
+        switch ($token)
+        {
             case self::TYPE_KEYWORD:
                 return 'DECLARE:KEYWORD';
             case self::TYPE_EQUAL:

src/Tokenizer/src/Reflection/ReflectionFile.php

Spacing +61 added lines, -61 removed lines

@@ -159,7 +159,7 @@ 
      */
     public function getClasses(): array
     {
-        if (!isset($this->declarations['T_CLASS'])) {
+        if (!isset($this->declarations['T_CLASS'])){
             return [];
         }
 
@@ -171,7 +171,7 @@ 
      */
     public function getTraits(): array
     {
-        if (!isset($this->declarations['T_TRAIT'])) {
+        if (!isset($this->declarations['T_TRAIT'])){
             return [];
         }
 
@@ -183,7 +183,7 @@ 
      */
     public function getInterfaces(): array
     {
-        if (!isset($this->declarations['T_INTERFACE'])) {
+        if (!isset($this->declarations['T_INTERFACE'])){
             return [];
         }
 
@@ -214,7 +214,7 @@ 
      */
     public function getInvocations(): array
     {
-        if (empty($this->invocations)) {
+        if (empty($this->invocations)){
             $this->locateInvocations($this->getTokens());
         }
 
@@ -242,12 +242,12 @@ 
      */
     protected function locateDeclarations()
     {
-        foreach ($this->getTokens() as $tokenID => $token) {
-            if (!in_array($token[self::TOKEN_TYPE], self::$processTokens)) {
+        foreach ($this->getTokens() as $tokenID => $token){
+            if (!in_array($token[self::TOKEN_TYPE], self::$processTokens)){
                 continue;
             }
 
-            switch ($token[self::TOKEN_TYPE]) {
+            switch ($token[self::TOKEN_TYPE]){
                 case T_NAMESPACE:
                     $this->registerNamespace($tokenID);
                     break;
@@ -263,7 +263,7 @@ 
                 case T_CLASS:
                 case T_TRAIT:
                 case T_INTERFACE:
-                    if ($this->isClassNameConst($tokenID)) {
+                    if ($this->isClassNameConst($tokenID)){
                         //PHP5.5 ClassName::class constant
                         continue 2;
                     }
@@ -280,7 +280,7 @@ 
         }
 
         //Dropping empty namespace
-        if (isset($this->namespaces[''])) {
+        if (isset($this->namespaces[''])){
             $this->namespaces['\\'] = $this->namespaces[''];
             unset($this->namespaces['']);
         }
@@ -294,14 +294,14 @@ 
         $namespace = '';
         $localID = $tokenID + 1;
 
-        do {
+        do{
             $token = $this->tokens[$localID++];
-            if ($token[self::TOKEN_CODE] == '{') {
+            if ($token[self::TOKEN_CODE] == '{'){
                 break;
             }
 
             $namespace .= $token[self::TOKEN_CODE];
-        } while (
+        }while (
             isset($this->tokens[$localID])
             && $this->tokens[$localID][self::TOKEN_CODE] != '{'
             && $this->tokens[$localID][self::TOKEN_CODE] != ';'
@@ -311,13 +311,13 @@ 
         $namespace = trim($namespace);
 
         $uses = [];
-        if (isset($this->namespaces[$namespace])) {
+        if (isset($this->namespaces[$namespace])){
             $uses = $this->namespaces[$namespace];
         }
 
-        if ($this->tokens[$localID][self::TOKEN_CODE] == ';') {
+        if ($this->tokens[$localID][self::TOKEN_CODE] == ';'){
             $endingID = count($this->tokens) - 1;
-        } else {
+        }else{
             $endingID = $this->endingToken($tokenID);
         }
 
@@ -337,20 +337,20 @@ 
 
         $class = '';
         $localAlias = null;
-        for ($localID = $tokenID + 1; $this->tokens[$localID][self::TOKEN_CODE] != ';'; ++$localID) {
-            if ($this->tokens[$localID][self::TOKEN_TYPE] == T_AS) {
+        for ($localID = $tokenID + 1; $this->tokens[$localID][self::TOKEN_CODE] != ';'; ++$localID){
+            if ($this->tokens[$localID][self::TOKEN_TYPE] == T_AS){
                 $localAlias = '';
                 continue;
             }
 
-            if ($localAlias === null) {
+            if ($localAlias === null){
                 $class .= $this->tokens[$localID][self::TOKEN_CODE];
-            } else {
+            }else{
                 $localAlias .= $this->tokens[$localID][self::TOKEN_CODE];
             }
         }
 
-        if (empty($localAlias)) {
+        if (empty($localAlias)){
             $names = explode('\\', $class);
             $localAlias = end($names);
         }
@@ -363,9 +363,9 @@ 
      */
     private function registerFunction(int $tokenID)
     {
-        foreach ($this->declarations as $declarations) {
-            foreach ($declarations as $location) {
-                if ($tokenID >= $location[self::O_TOKEN] && $tokenID <= $location[self::C_TOKEN]) {
+        foreach ($this->declarations as $declarations){
+            foreach ($declarations as $location){
+                if ($tokenID >= $location[self::O_TOKEN] && $tokenID <= $location[self::C_TOKEN]){
                     //We are inside class, function is method
                     return;
                 }
@@ -373,14 +373,14 @@ 
         }
 
         $localID = $tokenID + 1;
-        while ($this->tokens[$localID][self::TOKEN_TYPE] != T_STRING) {
+        while ($this->tokens[$localID][self::TOKEN_TYPE] != T_STRING){
             //Fetching function name
             ++$localID;
         }
 
         $name = $this->tokens[$localID][self::TOKEN_CODE];
-        if (!empty($namespace = $this->activeNamespace($tokenID))) {
-            $name = $namespace . self::NS_SEPARATOR . $name;
+        if (!empty($namespace = $this->activeNamespace($tokenID))){
+            $name = $namespace.self::NS_SEPARATOR.$name;
         }
 
         $this->functions[$name] = [
@@ -396,13 +396,13 @@ 
     private function registerDeclaration(int $tokenID, int $tokenType)
     {
         $localID = $tokenID + 1;
-        while ($this->tokens[$localID][self::TOKEN_TYPE] != T_STRING) {
+        while ($this->tokens[$localID][self::TOKEN_TYPE] != T_STRING){
             ++$localID;
         }
 
         $name = $this->tokens[$localID][self::TOKEN_CODE];
-        if (!empty($namespace = $this->activeNamespace($tokenID))) {
-            $name = $namespace . self::NS_SEPARATOR . $name;
+        if (!empty($namespace = $this->activeNamespace($tokenID))){
+            $name = $namespace.self::NS_SEPARATOR.$name;
         }
 
         $this->declarations[token_name($tokenType)][$name] = [
@@ -448,24 +448,24 @@ 
 
         //Tokens used to re-enable token detection
         $stopTokens = [T_STRING, T_WHITESPACE, T_DOUBLE_COLON, T_OBJECT_OPERATOR, T_NS_SEPARATOR];
-        foreach ($tokens as $tokenID => $token) {
+        foreach ($tokens as $tokenID => $token){
             $tokenType = $token[self::TOKEN_TYPE];
 
             //We are not indexing function declarations or functions called from $objects.
-            if (in_array($tokenType, [T_FUNCTION, T_OBJECT_OPERATOR, T_NEW])) {
+            if (in_array($tokenType, [T_FUNCTION, T_OBJECT_OPERATOR, T_NEW])){
                 if (
                     empty($argumentsTID)
                     && (
                         empty($invocationTID)
                         || $this->getSource($invocationTID, $tokenID - 1) != '$this'
                     )
-                ) {
+                ){
                     //Not a call, function declaration, or object method
                     $ignore = true;
                     continue;
                 }
-            } elseif ($ignore) {
-                if (!in_array($tokenType, $stopTokens)) {
+            } elseif ($ignore){
+                if (!in_array($tokenType, $stopTokens)){
                     //Returning to search
                     $ignore = false;
                 }
@@ -473,13 +473,13 @@ 
             }
 
             //We are inside function, and there is "(", indexing arguments.
-            if (!empty($invocationTID) && ($tokenType == '(' || $tokenType == '[')) {
-                if (empty($argumentsTID)) {
+            if (!empty($invocationTID) && ($tokenType == '(' || $tokenType == '[')){
+                if (empty($argumentsTID)){
                     $argumentsTID = $tokenID;
                 }
 
                 ++$level;
-                if ($level != 1) {
+                if ($level != 1){
                     //Not arguments beginning, but arguments part
                     $arguments[$tokenID] = $token;
                 }
@@ -488,16 +488,16 @@ 
             }
 
             //We are inside function arguments and ")" met.
-            if (!empty($invocationTID) && ($tokenType == ')' || $tokenType == ']')) {
+            if (!empty($invocationTID) && ($tokenType == ')' || $tokenType == ']')){
                 --$level;
-                if ($level == -1) {
+                if ($level == -1){
                     $invocationTID = false;
                     $level = 0;
                     continue;
                 }
 
                 //Function fully indexed, we can process it now.
-                if ($level == 0) {
+                if ($level == 0){
                     $this->registerInvocation(
                         $invocationTID,
                         $argumentsTID,
@@ -509,7 +509,7 @@ 
                     //Closing search
                     $arguments = [];
                     $argumentsTID = $invocationTID = false;
-                } else {
+                }else{
                     //Not arguments beginning, but arguments part
                     $arguments[$tokenID] = $token;
                 }
@@ -518,13 +518,13 @@ 
             }
 
             //Still inside arguments.
-            if (!empty($invocationTID) && !empty($level)) {
+            if (!empty($invocationTID) && !empty($level)){
                 $arguments[$tokenID] = $token;
                 continue;
             }
 
             //Nothing valuable to remember, will be parsed later.
-            if (!empty($invocationTID) && in_array($tokenType, $stopTokens)) {
+            if (!empty($invocationTID) && in_array($tokenType, $stopTokens)){
                 continue;
             }
 
@@ -534,7 +534,7 @@ 
                 || $tokenType == T_STATIC
                 || $tokenType == T_NS_SEPARATOR
                 || ($tokenType == T_VARIABLE && $token[self::TOKEN_CODE] == '$this')
-            ) {
+            ){
                 $invocationTID = $tokenID;
                 $level = 0;
 
@@ -557,13 +557,13 @@ 
         int $endID,
         array $arguments,
         int $invocationLevel
-    ) {
+    ){
         //Nested invocations
         $this->locateInvocations($arguments, $invocationLevel + 1);
 
         [$class, $operator, $name] = $this->fetchContext($invocationID, $argumentsID);
 
-        if (!empty($operator) && empty($class)) {
+        if (!empty($operator) && empty($class)){
             //Non detectable
             return;
         }
@@ -591,17 +591,17 @@ 
         $name = trim($this->getSource($invocationTID, $argumentsTID), '( ');
 
         //Let's try to fetch all information we need
-        if (strpos($name, '->') !== false) {
+        if (strpos($name, '->') !== false){
             $operator = '->';
-        } elseif (strpos($name, '::') !== false) {
+        } elseif (strpos($name, '::') !== false){
             $operator = '::';
         }
 
-        if (!empty($operator)) {
+        if (!empty($operator)){
             [$class, $name] = explode($operator, $name);
 
             //We now have to clarify class name
-            if (in_array($class, ['self', 'static', '$this'])) {
+            if (in_array($class, ['self', 'static', '$this'])){
                 $class = $this->activeDeclaration($invocationTID);
             }
         }
@@ -617,9 +617,9 @@ 
      */
     private function activeDeclaration(int $tokenID): string
     {
-        foreach ($this->declarations as $declarations) {
-            foreach ($declarations as $name => $position) {
-                if ($tokenID >= $position[self::O_TOKEN] && $tokenID <= $position[self::C_TOKEN]) {
+        foreach ($this->declarations as $declarations){
+            foreach ($declarations as $name => $position){
+                if ($tokenID >= $position[self::O_TOKEN] && $tokenID <= $position[self::C_TOKEN]){
                     return $name;
                 }
             }
@@ -636,8 +636,8 @@ 
      */
     private function activeNamespace(int $tokenID): string
     {
-        foreach ($this->namespaces as $namespace => $position) {
-            if ($tokenID >= $position[self::O_TOKEN] && $tokenID <= $position[self::C_TOKEN]) {
+        foreach ($this->namespaces as $namespace => $position){
+            if ($tokenID >= $position[self::O_TOKEN] && $tokenID <= $position[self::C_TOKEN]){
                 return $namespace;
             }
         }
@@ -660,18 +660,18 @@ 
     private function endingToken(int $tokenID): int
     {
         $level = null;
-        for ($localID = $tokenID; $localID < $this->countTokens; ++$localID) {
+        for ($localID = $tokenID; $localID < $this->countTokens; ++$localID){
             $token = $this->tokens[$localID];
-            if ($token[self::TOKEN_CODE] == '{') {
+            if ($token[self::TOKEN_CODE] == '{'){
                 ++$level;
                 continue;
             }
 
-            if ($token[self::TOKEN_CODE] == '}') {
+            if ($token[self::TOKEN_CODE] == '}'){
                 --$level;
             }
 
-            if ($level === 0) {
+            if ($level === 0){
                 break;
             }
         }
@@ -686,7 +686,7 @@ 
      */
     private function lineNumber(int $tokenID): int
     {
-        while (empty($this->tokens[$tokenID][self::TOKEN_LINE])) {
+        while (empty($this->tokens[$tokenID][self::TOKEN_LINE])){
             --$tokenID;
         }
 
@@ -701,7 +701,7 @@ 
     private function getSource(int $startID, int $endID): string
     {
         $result = '';
-        for ($tokenID = $startID; $tokenID <= $endID; ++$tokenID) {
+        for ($tokenID = $startID; $tokenID <= $endID; ++$tokenID){
             //Collecting function usage src
             $result .= $this->tokens[$tokenID][self::TOKEN_CODE];
         }

Braces +115 added lines, -55 removed lines

@@ -159,7 +159,8 @@ 
      */
     public function getClasses(): array
     {
-        if (!isset($this->declarations['T_CLASS'])) {
+        if (!isset($this->declarations['T_CLASS']))
+        {
             return [];
         }
 
@@ -171,7 +172,8 @@ 
      */
     public function getTraits(): array
     {
-        if (!isset($this->declarations['T_TRAIT'])) {
+        if (!isset($this->declarations['T_TRAIT']))
+        {
             return [];
         }
 
@@ -183,7 +185,8 @@ 
      */
     public function getInterfaces(): array
     {
-        if (!isset($this->declarations['T_INTERFACE'])) {
+        if (!isset($this->declarations['T_INTERFACE']))
+        {
             return [];
         }
 
@@ -214,7 +217,8 @@ 
      */
     public function getInvocations(): array
     {
-        if (empty($this->invocations)) {
+        if (empty($this->invocations))
+        {
             $this->locateInvocations($this->getTokens());
         }
 
@@ -242,12 +246,15 @@ 
      */
     protected function locateDeclarations()
     {
-        foreach ($this->getTokens() as $tokenID => $token) {
-            if (!in_array($token[self::TOKEN_TYPE], self::$processTokens)) {
+        foreach ($this->getTokens() as $tokenID => $token)
+        {
+            if (!in_array($token[self::TOKEN_TYPE], self::$processTokens))
+            {
                 continue;
             }
 
-            switch ($token[self::TOKEN_TYPE]) {
+            switch ($token[self::TOKEN_TYPE])
+            {
                 case T_NAMESPACE:
                     $this->registerNamespace($tokenID);
                     break;
@@ -263,7 +270,8 @@ 
                 case T_CLASS:
                 case T_TRAIT:
                 case T_INTERFACE:
-                    if ($this->isClassNameConst($tokenID)) {
+                    if ($this->isClassNameConst($tokenID))
+                    {
                         //PHP5.5 ClassName::class constant
                         continue 2;
                     }
@@ -280,7 +288,8 @@ 
         }
 
         //Dropping empty namespace
-        if (isset($this->namespaces[''])) {
+        if (isset($this->namespaces['']))
+        {
             $this->namespaces['\\'] = $this->namespaces[''];
             unset($this->namespaces['']);
         }
@@ -294,9 +303,11 @@ 
         $namespace = '';
         $localID = $tokenID + 1;
 
-        do {
+        do
+        {
             $token = $this->tokens[$localID++];
-            if ($token[self::TOKEN_CODE] == '{') {
+            if ($token[self::TOKEN_CODE] == '{')
+            {
                 break;
             }
 
@@ -311,13 +322,17 @@ 
         $namespace = trim($namespace);
 
         $uses = [];
-        if (isset($this->namespaces[$namespace])) {
+        if (isset($this->namespaces[$namespace]))
+        {
             $uses = $this->namespaces[$namespace];
         }
 
-        if ($this->tokens[$localID][self::TOKEN_CODE] == ';') {
+        if ($this->tokens[$localID][self::TOKEN_CODE] == ';')
+        {
             $endingID = count($this->tokens) - 1;
-        } else {
+        }
+        else
+        {
             $endingID = $this->endingToken($tokenID);
         }
 
@@ -337,20 +352,26 @@ 
 
         $class = '';
         $localAlias = null;
-        for ($localID = $tokenID + 1; $this->tokens[$localID][self::TOKEN_CODE] != ';'; ++$localID) {
-            if ($this->tokens[$localID][self::TOKEN_TYPE] == T_AS) {
+        for ($localID = $tokenID + 1; $this->tokens[$localID][self::TOKEN_CODE] != ';'; ++$localID)
+        {
+            if ($this->tokens[$localID][self::TOKEN_TYPE] == T_AS)
+            {
                 $localAlias = '';
                 continue;
             }
 
-            if ($localAlias === null) {
+            if ($localAlias === null)
+            {
                 $class .= $this->tokens[$localID][self::TOKEN_CODE];
-            } else {
+            }
+            else
+            {
                 $localAlias .= $this->tokens[$localID][self::TOKEN_CODE];
             }
         }
 
-        if (empty($localAlias)) {
+        if (empty($localAlias))
+        {
             $names = explode('\\', $class);
             $localAlias = end($names);
         }
@@ -363,9 +384,12 @@ 
      */
     private function registerFunction(int $tokenID)
     {
-        foreach ($this->declarations as $declarations) {
-            foreach ($declarations as $location) {
-                if ($tokenID >= $location[self::O_TOKEN] && $tokenID <= $location[self::C_TOKEN]) {
+        foreach ($this->declarations as $declarations)
+        {
+            foreach ($declarations as $location)
+            {
+                if ($tokenID >= $location[self::O_TOKEN] && $tokenID <= $location[self::C_TOKEN])
+                {
                     //We are inside class, function is method
                     return;
                 }
@@ -373,13 +397,15 @@ 
         }
 
         $localID = $tokenID + 1;
-        while ($this->tokens[$localID][self::TOKEN_TYPE] != T_STRING) {
+        while ($this->tokens[$localID][self::TOKEN_TYPE] != T_STRING)
+        {
             //Fetching function name
             ++$localID;
         }
 
         $name = $this->tokens[$localID][self::TOKEN_CODE];
-        if (!empty($namespace = $this->activeNamespace($tokenID))) {
+        if (!empty($namespace = $this->activeNamespace($tokenID)))
+        {
             $name = $namespace . self::NS_SEPARATOR . $name;
         }
 
@@ -396,12 +422,14 @@ 
     private function registerDeclaration(int $tokenID, int $tokenType)
     {
         $localID = $tokenID + 1;
-        while ($this->tokens[$localID][self::TOKEN_TYPE] != T_STRING) {
+        while ($this->tokens[$localID][self::TOKEN_TYPE] != T_STRING)
+        {
             ++$localID;
         }
 
         $name = $this->tokens[$localID][self::TOKEN_CODE];
-        if (!empty($namespace = $this->activeNamespace($tokenID))) {
+        if (!empty($namespace = $this->activeNamespace($tokenID)))
+        {
             $name = $namespace . self::NS_SEPARATOR . $name;
         }
 
@@ -448,11 +476,13 @@ 
 
         //Tokens used to re-enable token detection
         $stopTokens = [T_STRING, T_WHITESPACE, T_DOUBLE_COLON, T_OBJECT_OPERATOR, T_NS_SEPARATOR];
-        foreach ($tokens as $tokenID => $token) {
+        foreach ($tokens as $tokenID => $token)
+        {
             $tokenType = $token[self::TOKEN_TYPE];
 
             //We are not indexing function declarations or functions called from $objects.
-            if (in_array($tokenType, [T_FUNCTION, T_OBJECT_OPERATOR, T_NEW])) {
+            if (in_array($tokenType, [T_FUNCTION, T_OBJECT_OPERATOR, T_NEW]))
+            {
                 if (
                     empty($argumentsTID)
                     && (
@@ -464,8 +494,11 @@ 
                     $ignore = true;
                     continue;
                 }
-            } elseif ($ignore) {
-                if (!in_array($tokenType, $stopTokens)) {
+            }
+            elseif ($ignore)
+            {
+                if (!in_array($tokenType, $stopTokens))
+                {
                     //Returning to search
                     $ignore = false;
                 }
@@ -473,13 +506,16 @@ 
             }
 
             //We are inside function, and there is "(", indexing arguments.
-            if (!empty($invocationTID) && ($tokenType == '(' || $tokenType == '[')) {
-                if (empty($argumentsTID)) {
+            if (!empty($invocationTID) && ($tokenType == '(' || $tokenType == '['))
+            {
+                if (empty($argumentsTID))
+                {
                     $argumentsTID = $tokenID;
                 }
 
                 ++$level;
-                if ($level != 1) {
+                if ($level != 1)
+                {
                     //Not arguments beginning, but arguments part
                     $arguments[$tokenID] = $token;
                 }
@@ -488,16 +524,19 @@ 
             }
 
             //We are inside function arguments and ")" met.
-            if (!empty($invocationTID) && ($tokenType == ')' || $tokenType == ']')) {
+            if (!empty($invocationTID) && ($tokenType == ')' || $tokenType == ']'))
+            {
                 --$level;
-                if ($level == -1) {
+                if ($level == -1)
+                {
                     $invocationTID = false;
                     $level = 0;
                     continue;
                 }
 
                 //Function fully indexed, we can process it now.
-                if ($level == 0) {
+                if ($level == 0)
+                {
                     $this->registerInvocation(
                         $invocationTID,
                         $argumentsTID,
@@ -509,7 +548,9 @@ 
                     //Closing search
                     $arguments = [];
                     $argumentsTID = $invocationTID = false;
-                } else {
+                }
+                else
+                {
                     //Not arguments beginning, but arguments part
                     $arguments[$tokenID] = $token;
                 }
@@ -518,13 +559,15 @@ 
             }
 
             //Still inside arguments.
-            if (!empty($invocationTID) && !empty($level)) {
+            if (!empty($invocationTID) && !empty($level))
+            {
                 $arguments[$tokenID] = $token;
                 continue;
             }
 
             //Nothing valuable to remember, will be parsed later.
-            if (!empty($invocationTID) && in_array($tokenType, $stopTokens)) {
+            if (!empty($invocationTID) && in_array($tokenType, $stopTokens))
+            {
                 continue;
             }
 
@@ -563,7 +606,8 @@ 
 
         [$class, $operator, $name] = $this->fetchContext($invocationID, $argumentsID);
 
-        if (!empty($operator) && empty($class)) {
+        if (!empty($operator) && empty($class))
+        {
             //Non detectable
             return;
         }
@@ -591,17 +635,22 @@ 
         $name = trim($this->getSource($invocationTID, $argumentsTID), '( ');
 
         //Let's try to fetch all information we need
-        if (strpos($name, '->') !== false) {
+        if (strpos($name, '->') !== false)
+        {
             $operator = '->';
-        } elseif (strpos($name, '::') !== false) {
+        }
+        elseif (strpos($name, '::') !== false)
+        {
             $operator = '::';
         }
 
-        if (!empty($operator)) {
+        if (!empty($operator))
+        {
             [$class, $name] = explode($operator, $name);
 
             //We now have to clarify class name
-            if (in_array($class, ['self', 'static', '$this'])) {
+            if (in_array($class, ['self', 'static', '$this']))
+            {
                 $class = $this->activeDeclaration($invocationTID);
             }
         }
@@ -617,9 +666,12 @@ 
      */
     private function activeDeclaration(int $tokenID): string
     {
-        foreach ($this->declarations as $declarations) {
-            foreach ($declarations as $name => $position) {
-                if ($tokenID >= $position[self::O_TOKEN] && $tokenID <= $position[self::C_TOKEN]) {
+        foreach ($this->declarations as $declarations)
+        {
+            foreach ($declarations as $name => $position)
+            {
+                if ($tokenID >= $position[self::O_TOKEN] && $tokenID <= $position[self::C_TOKEN])
+                {
                     return $name;
                 }
             }
@@ -636,8 +688,10 @@ 
      */
     private function activeNamespace(int $tokenID): string
     {
-        foreach ($this->namespaces as $namespace => $position) {
-            if ($tokenID >= $position[self::O_TOKEN] && $tokenID <= $position[self::C_TOKEN]) {
+        foreach ($this->namespaces as $namespace => $position)
+        {
+            if ($tokenID >= $position[self::O_TOKEN] && $tokenID <= $position[self::C_TOKEN])
+            {
                 return $namespace;
             }
         }
@@ -660,18 +714,22 @@ 
     private function endingToken(int $tokenID): int
     {
         $level = null;
-        for ($localID = $tokenID; $localID < $this->countTokens; ++$localID) {
+        for ($localID = $tokenID; $localID < $this->countTokens; ++$localID)
+        {
             $token = $this->tokens[$localID];
-            if ($token[self::TOKEN_CODE] == '{') {
+            if ($token[self::TOKEN_CODE] == '{')
+            {
                 ++$level;
                 continue;
             }
 
-            if ($token[self::TOKEN_CODE] == '}') {
+            if ($token[self::TOKEN_CODE] == '}')
+            {
                 --$level;
             }
 
-            if ($level === 0) {
+            if ($level === 0)
+            {
                 break;
             }
         }
@@ -686,7 +744,8 @@ 
      */
     private function lineNumber(int $tokenID): int
     {
-        while (empty($this->tokens[$tokenID][self::TOKEN_LINE])) {
+        while (empty($this->tokens[$tokenID][self::TOKEN_LINE]))
+        {
             --$tokenID;
         }
 
@@ -701,7 +760,8 @@ 
     private function getSource(int $startID, int $endID): string
     {
         $result = '';
-        for ($tokenID = $startID; $tokenID <= $endID; ++$tokenID) {
+        for ($tokenID = $startID; $tokenID <= $endID; ++$tokenID)
+        {
             //Collecting function usage src
             $result .= $this->tokens[$tokenID][self::TOKEN_CODE];
         }

src/Tokenizer/src/AbstractLocator.php

Spacing +11 added lines, -11 removed lines

@@ -44,10 +44,10 @@ 
      */
     protected function availableReflections(): \Generator
     {
-        foreach ($this->finder->getIterator() as $file) {
+        foreach ($this->finder->getIterator() as $file){
             $reflection = new ReflectionFile((string)$file);
 
-            if ($reflection->hasIncludes()) {
+            if ($reflection->hasIncludes()){
                 // We are not analyzing files which has includes, it's not safe to require such reflections
                 $this->getLogger()->warning(
                     sprintf('File `%s` has includes and excluded from analysis', $file),
@@ -73,8 +73,8 @@ 
      */
     protected function classReflection(string $class): \ReflectionClass
     {
-        $loader = static function ($class) {
-            if ($class === LocatorException::class) {
+        $loader = static function ($class){
+            if ($class === LocatorException::class){
                 return;
             }
 
@@ -84,12 +84,12 @@ 
         //To suspend class dependency exception
         spl_autoload_register($loader);
 
-        try {
+        try{
             //In some cases reflection can thrown an exception if class invalid or can not be loaded,
             //we are going to handle such exception and convert it soft exception
             return new \ReflectionClass($class);
-        } catch (\Throwable $e) {
-            if ($e instanceof LocatorException && $e->getPrevious() != null) {
+        }catch (\Throwable $e){
+            if ($e instanceof LocatorException && $e->getPrevious() != null){
                 $e = $e->getPrevious();
             }
 
@@ -105,7 +105,7 @@ 
             );
 
             throw new LocatorException($e->getMessage(), $e->getCode(), $e);
-        } finally {
+        }finally{
             spl_autoload_unregister($loader);
         }
     }
@@ -121,13 +121,13 @@ 
     {
         $traits = [];
 
-        do {
+        do{
             $traits = \array_merge(\class_uses($class), $traits);
             $class = \get_parent_class($class);
-        } while ($class !== false);
+        }while ($class !== false);
 
         //Traits from traits
-        foreach (\array_flip($traits) as $trait) {
+        foreach (\array_flip($traits) as $trait){
             $traits = \array_merge(\class_uses($trait), $traits);
         }
 

Braces +22 added lines, -10 removed lines

@@ -44,10 +44,12 @@ 
      */
     protected function availableReflections(): \Generator
     {
-        foreach ($this->finder->getIterator() as $file) {
+        foreach ($this->finder->getIterator() as $file)
+        {
             $reflection = new ReflectionFile((string)$file);
 
-            if ($reflection->hasIncludes()) {
+            if ($reflection->hasIncludes())
+            {
                 // We are not analyzing files which has includes, it's not safe to require such reflections
                 $this->getLogger()->warning(
                     sprintf('File `%s` has includes and excluded from analysis', $file),
@@ -73,8 +75,10 @@ 
      */
     protected function classReflection(string $class): \ReflectionClass
     {
-        $loader = static function ($class) {
-            if ($class === LocatorException::class) {
+        $loader = static function ($class)
+        {
+            if ($class === LocatorException::class)
+            {
                 return;
             }
 
@@ -84,12 +88,16 @@ 
         //To suspend class dependency exception
         spl_autoload_register($loader);
 
-        try {
+        try
+        {
             //In some cases reflection can thrown an exception if class invalid or can not be loaded,
             //we are going to handle such exception and convert it soft exception
             return new \ReflectionClass($class);
-        } catch (\Throwable $e) {
-            if ($e instanceof LocatorException && $e->getPrevious() != null) {
+        }
+        catch (\Throwable $e)
+        {
+            if ($e instanceof LocatorException && $e->getPrevious() != null)
+            {
                 $e = $e->getPrevious();
             }
 
@@ -105,7 +113,9 @@ 
             );
 
             throw new LocatorException($e->getMessage(), $e->getCode(), $e);
-        } finally {
+        }
+        finally
+        {
             spl_autoload_unregister($loader);
         }
     }
@@ -121,13 +131,15 @@ 
     {
         $traits = [];
 
-        do {
+        do
+        {
             $traits = \array_merge(\class_uses($class), $traits);
             $class = \get_parent_class($class);
         } while ($class !== false);
 
         //Traits from traits
-        foreach (\array_flip($traits) as $trait) {
+        foreach (\array_flip($traits) as $trait)
+        {
             $traits = \array_merge(\class_uses($trait), $traits);
         }
 

src/Tokenizer/src/InvocationLocator.php

Spacing +9 added lines, -9 removed lines

@@ -28,8 +28,8 @@ 
     public function getInvocations(\ReflectionFunctionAbstract $function): array
     {
         $result = [];
-        foreach ($this->availableInvocations($function->getName()) as $invocation) {
-            if ($this->isTargeted($invocation, $function)) {
+        foreach ($this->availableInvocations($function->getName()) as $invocation){
+            if ($this->isTargeted($invocation, $function)){
                 $result[] = $invocation;
             }
         }
@@ -46,12 +46,12 @@ 
     protected function availableInvocations(string $signature = ''): \Generator
     {
         $signature = strtolower(trim($signature, '\\'));
-        foreach ($this->availableReflections() as $reflection) {
-            foreach ($reflection->getInvocations() as $invocation) {
+        foreach ($this->availableReflections() as $reflection){
+            foreach ($reflection->getInvocations() as $invocation){
                 if (
                     !empty($signature)
                     && strtolower(trim($invocation->getName(), '\\')) != $signature
-                ) {
+                ){
                     continue;
                 }
 
@@ -62,13 +62,13 @@ 
 
     protected function isTargeted(ReflectionInvocation $invocation, \ReflectionFunctionAbstract $function): bool
     {
-        if ($function instanceof \ReflectionFunction) {
+        if ($function instanceof \ReflectionFunction){
             return !$invocation->isMethod();
         }
 
-        try {
+        try{
             $reflection = $this->classReflection($invocation->getClass());
-        } catch (LocatorException $e) {
+        }catch (LocatorException $e){
             return false;
         }
 
@@ -77,7 +77,7 @@ 
          */
         $target = $function->getDeclaringClass();
 
-        if ($target->isTrait()) {
+        if ($target->isTrait()){
             //Let's compare traits
             return in_array($target->getName(), $this->fetchTraits($invocation->getClass()));
         }

Braces +17 added lines, -8 removed lines

@@ -28,8 +28,10 @@ 
     public function getInvocations(\ReflectionFunctionAbstract $function): array
     {
         $result = [];
-        foreach ($this->availableInvocations($function->getName()) as $invocation) {
-            if ($this->isTargeted($invocation, $function)) {
+        foreach ($this->availableInvocations($function->getName()) as $invocation)
+        {
+            if ($this->isTargeted($invocation, $function))
+            {
                 $result[] = $invocation;
             }
         }
@@ -46,8 +48,10 @@ 
     protected function availableInvocations(string $signature = ''): \Generator
     {
         $signature = strtolower(trim($signature, '\\'));
-        foreach ($this->availableReflections() as $reflection) {
-            foreach ($reflection->getInvocations() as $invocation) {
+        foreach ($this->availableReflections() as $reflection)
+        {
+            foreach ($reflection->getInvocations() as $invocation)
+            {
                 if (
                     !empty($signature)
                     && strtolower(trim($invocation->getName(), '\\')) != $signature
@@ -62,13 +66,17 @@ 
 
     protected function isTargeted(ReflectionInvocation $invocation, \ReflectionFunctionAbstract $function): bool
     {
-        if ($function instanceof \ReflectionFunction) {
+        if ($function instanceof \ReflectionFunction)
+        {
             return !$invocation->isMethod();
         }
 
-        try {
+        try
+        {
             $reflection = $this->classReflection($invocation->getClass());
-        } catch (LocatorException $e) {
+        }
+        catch (LocatorException $e)
+        {
             return false;
         }
 
@@ -77,7 +85,8 @@ 
          */
         $target = $function->getDeclaringClass();
 
-        if ($target->isTrait()) {
+        if ($target->isTrait())
+        {
             //Let's compare traits
             return in_array($target->getName(), $this->fetchTraits($invocation->getClass()));
         }

src/Logger/src/ListenerRegistry.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
 
     public function addListener(callable $listener): void
     {
-        if (!array_search($listener, $this->listeners, true)) {
+        if (!array_search($listener, $this->listeners, true)){
             $this->listeners[] = $listener;
         }
     }
@@ -29,7 +29,7 @@ 
     public function removeListener(callable $listener): void
     {
         $key = array_search($listener, $this->listeners, true);
-        if ($key !== null) {
+        if ($key !== null){
             unset($this->listeners[$key]);
         }
     }

Braces +4 added lines, -2 removed lines

@@ -21,7 +21,8 @@ 
 
     public function addListener(callable $listener): void
     {
-        if (!array_search($listener, $this->listeners, true)) {
+        if (!array_search($listener, $this->listeners, true))
+        {
             $this->listeners[] = $listener;
         }
     }
@@ -29,7 +30,8 @@ 
     public function removeListener(callable $listener): void
     {
         $key = array_search($listener, $this->listeners, true);
-        if ($key !== null) {
+        if ($key !== null)
+        {
             unset($this->listeners[$key]);
         }
     }

src/Queue/src/ContainerRegistry.php

Spacing +4 added lines, -4 removed lines

@@ -24,13 +24,13 @@ 
 
     public function getHandler(string $jobType): HandlerInterface
     {
-        try {
+        try{
             $handler = $this->container->get($this->className($jobType));
-        } catch (ContainerException $e) {
+        }catch (ContainerException $e){
             throw new JobException($e->getMessage(), $e->getCode(), $e);
         }
 
-        if (!$handler instanceof HandlerInterface) {
+        if (!$handler instanceof HandlerInterface){
             throw new JobException("Unable to resolve job handler for `{$jobType}`");
         }
 
@@ -40,7 +40,7 @@ 
     private function className(string $jobType): string
     {
         $names = explode('.', $jobType);
-        $names = array_map(function (string $value) {
+        $names = array_map(function (string $value){
             return $this->inflector->classify($value);
         }, $names);
 

Braces +9 added lines, -4 removed lines

@@ -24,13 +24,17 @@ 
 
     public function getHandler(string $jobType): HandlerInterface
     {
-        try {
+        try
+        {
             $handler = $this->container->get($this->className($jobType));
-        } catch (ContainerException $e) {
+        }
+        catch (ContainerException $e)
+        {
             throw new JobException($e->getMessage(), $e->getCode(), $e);
         }
 
-        if (!$handler instanceof HandlerInterface) {
+        if (!$handler instanceof HandlerInterface)
+        {
             throw new JobException("Unable to resolve job handler for `{$jobType}`");
         }
 
@@ -40,7 +44,8 @@ 
     private function className(string $jobType): string
     {
         $names = explode('.', $jobType);
-        $names = array_map(function (string $value) {
+        $names = array_map(function (string $value)
+        {
             return $this->inflector->classify($value);
         }, $names);
 

src/Queue/src/Driver/SyncDriver.php

Spacing +4 added lines, -4 removed lines

@@ -26,7 +26,7 @@ 
     public function __construct(
         HandlerRegistryInterface $registry,
         FailedJobHandlerInterface $failedJobHandler
-    ) {
+    ){
         $this->registry = $registry;
         $this->failedJobHandler = $failedJobHandler;
     }
@@ -34,15 +34,15 @@ 
     /** @inheritdoc */
     public function push(string $name, array $payload = [], OptionsInterface $options = null): string
     {
-        if ($options !== null && $options->getDelay()) {
+        if ($options !== null && $options->getDelay()){
             sleep($options->getDelay());
         }
 
         $id = (string)Uuid::uuid4();
 
-        try {
+        try{
             $this->registry->getHandler($name)->handle($name, $id, $payload);
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             $this->failedJobHandler->handle(
                 'sync',
                 'default',

Braces +7 added lines, -3 removed lines

@@ -34,15 +34,19 @@
     /** @inheritdoc */
     public function push(string $name, array $payload = [], OptionsInterface $options = null): string
     {
-        if ($options !== null && $options->getDelay()) {
+        if ($options !== null && $options->getDelay())
+        {
             sleep($options->getDelay());
         }
 
         $id = (string)Uuid::uuid4();
 
-        try {
+        try
+        {
             $this->registry->getHandler($name)->handle($name, $id, $payload);
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             $this->failedJobHandler->handle(
                 'sync',
                 'default',