LTD-Beget / dns-zone-tokenizer

src/LTDBeget/dns/Tokenizer.php

Spacing +1 added lines, -1 removed lines

@@ -147,7 +147,7 @@
     private function extractRecord()
     {
         $isFirst = $this->recordsAmmount === 0;
-        if(! $isFirst ) {
+        if (!$isFirst) {
             $lastParsedRecord = end($this->tokens);
             $previousName = $lastParsedRecord['NAME'];
         } else {

src/LTDBeget/dns/record/Record.php

Spacing +15 added lines, -16 removed lines

@@ -53,8 +53,7 @@ 
      * @param bool         $isFirst
      * @param string       $previousName
      */
-    public function __construct
-    (
+    public function __construct(
         StringStream $stream,
         string $globalOrigin = NULL,
         string $globalTtl = NULL,
@@ -112,8 +111,8 @@ 
         $this->stream->ignoreHorizontalSpace();
         $this->extractRData();
 
-        if($this->globalOrigin && substr($this->tokens['NAME'], -1) !== '.' && $this->tokens['NAME'] !== '@') {
-            if($this->globalOrigin === '.') {
+        if ($this->globalOrigin && substr($this->tokens['NAME'], -1) !== '.' && $this->tokens['NAME'] !== '@') {
+            if ($this->globalOrigin === '.') {
                 $this->tokens['NAME'] .= $this->globalOrigin;
             } else {
                 $this->tokens['NAME'] .= '.'.$this->globalOrigin;
@@ -179,33 +178,33 @@ 
                 throw new SyntaxErrorException($this->stream);
             }
         } else {
-            if($this->isFirst) {
+            if ($this->isFirst) {
                 throw new SyntaxErrorException($this->stream);
             } else {
-                if(RData::isKnownType($this->tokens['NAME']) && ! RData::isKnownType($this->tokens['TTL'])) {
+                if (RData::isKnownType($this->tokens['NAME']) && !RData::isKnownType($this->tokens['TTL'])) {
                     // no ttl and no origin in record, and in TTL Rdata
                     last_chance:
-                    if($this->previousName && $this->globalTtl) {
+                    if ($this->previousName && $this->globalTtl) {
                         $this->tokens['TYPE'] = $this->tokens['NAME'];
                         $this->tokens['NAME'] = $this->previousName;
                         $this->tokens['TTL']  = $this->globalTtl;
                     } else {
                         throw new SyntaxErrorException($this->stream);
                     }
-                } elseif(!RData::isKnownType($this->tokens['NAME']) && RData::isKnownType($this->tokens['TTL'])) {
+                } elseif (!RData::isKnownType($this->tokens['NAME']) && RData::isKnownType($this->tokens['TTL'])) {
                     $this->tokens['TYPE'] = $this->tokens['TTL'];
-                    if($this->previousName && ! $this->globalTtl) {
-                        $this->tokens['TTL']  =  $this->tokens['NAME'];
+                    if ($this->previousName && !$this->globalTtl) {
+                        $this->tokens['TTL']  = $this->tokens['NAME'];
                         $this->tokens['NAME'] = $this->previousName;
-                    } elseif(! $this->previousName && $this->globalTtl) {
-                        $this->tokens['TTL'] =  $this->globalTtl;
-                    } elseif($this->previousName && $this->globalTtl) {
+                    } elseif (!$this->previousName && $this->globalTtl) {
+                        $this->tokens['TTL'] = $this->globalTtl;
+                    } elseif ($this->previousName && $this->globalTtl) {
                         $this->tokens['TTL'] = $this->globalTtl;
                     } else {
                         throw new SyntaxErrorException($this->stream);
                     }
 
-                } elseif(RData::isKnownType($this->tokens['NAME']) && RData::isKnownType($this->tokens['TTL'])) {
+                } elseif (RData::isKnownType($this->tokens['NAME']) && RData::isKnownType($this->tokens['TTL'])) {
                     goto last_chance;
                 } else {
                     throw new SyntaxErrorException($this->stream);
@@ -214,12 +213,12 @@ 
                 do {
                     $char = $this->stream->currentAscii();
                     $this->stream->previous();
-                } while($char->isWhiteSpace());
+                } while ($char->isWhiteSpace());
 
                 do {
                     $char = $this->stream->currentAscii();
                     $this->stream->previous();
-                } while($char->isPrintableChar() && ! $char->isHorizontalSpace());
+                } while ($char->isPrintableChar() && !$char->isHorizontalSpace());
             }
         }
     }

src/LTDBeget/dns/record/RData.php

Braces +2 added lines, -4 removed lines

@@ -314,8 +314,7 @@ 
                 return;
             } elseif($this->multiLineOpened && $ord === AsciiChar::LINE_FEED) {
                 goto start;
-            }
-            elseif(!$this->commentOpen) {
+            } elseif(!$this->commentOpen) {
                 // Double quotes aren't required to start a string, but if they start the string then they must also end the string
                 if($ord !== AsciiChar::DOUBLE_QUOTES) {
                     $this->stream->previous();
@@ -352,8 +351,7 @@ 
                 if($this->txtRecordHasQuotes) {
                     $this->stream->previous();
                     throw new SyntaxErrorException($this->stream);
-                }
-                else {
+                } else {
                     return;
                 }
             }

Spacing +39 added lines, -39 removed lines

@@ -106,7 +106,7 @@ 
      */
     public function __construct(StringStream $stream, string $type)
     {
-        if (! self::isKnownType($type)) {
+        if (!self::isKnownType($type)) {
             throw new SyntaxErrorException($stream);
         }
 
@@ -142,7 +142,7 @@ 
      */
     protected function defaultExtractor(string $tokenName)
     {
-        if($this->multiLineOpened) {
+        if ($this->multiLineOpened) {
             $this->stream->ignoreWhitespace();
         } else {
             $this->stream->ignoreHorizontalSpace();
@@ -156,28 +156,28 @@ 
 
         start:
 
-        if ($this->stream->isEnd()){
+        if ($this->stream->isEnd()) {
             return;
         }
         $ord = $this->stream->ord();
 
-        if($ord === AsciiChar::OPEN_BRACKET && !$this->commentOpen) {
+        if ($ord === AsciiChar::OPEN_BRACKET && !$this->commentOpen) {
             $this->multiLineOpened = true;
             $this->stream->next();
             goto start;
-        } elseif($this->multiLineOpened && !$this->commentOpen && $ord === AsciiChar::CLOSE_BRACKET) {
+        } elseif ($this->multiLineOpened && !$this->commentOpen && $ord === AsciiChar::CLOSE_BRACKET) {
             $this->multiLineOpened = false;
             $this->stream->next();
             goto start;
-        } elseif($this->multiLineOpened && !$this->commentOpen && $ord === AsciiChar::LINE_FEED) {
+        } elseif ($this->multiLineOpened && !$this->commentOpen && $ord === AsciiChar::LINE_FEED) {
             $this->stream->next();
             goto start;
-        } elseif($ord === AsciiChar::LINE_FEED && !$this->commentOpen) {
+        } elseif ($ord === AsciiChar::LINE_FEED && !$this->commentOpen) {
             return;
         } else {
-            if($ord === AsciiChar::SEMICOLON) {
+            if ($ord === AsciiChar::SEMICOLON) {
                 $this->stream->previous();
-                if($this->stream->currentAscii()->isHorizontalSpace()) {
+                if ($this->stream->currentAscii()->isHorizontalSpace()) {
 
                     $this->commentOpen = true;
                     $this->stream->next();
@@ -188,25 +188,25 @@ 
                     $this->stream->next();
                 }
                 goto start;
-            } elseif(($this->stream->currentAscii()->isVerticalSpace() || $ord === AsciiChar::NULL) && $this->commentOpen) {
+            } elseif (($this->stream->currentAscii()->isVerticalSpace() || $ord === AsciiChar::NULL) && $this->commentOpen) {
                 $this->stream->next();
                 $this->stream->ignoreHorizontalSpace();
                 $this->commentOpen = false;
                 goto start;
-            } elseif($this->commentOpen) {
+            } elseif ($this->commentOpen) {
                 $this->commentOpen = true;
                 $this->ignoreComment();
                 goto start;
-            } elseif(!$this->commentOpen) {
-                if($ord === AsciiChar::SPACE && $this->tokens[$tokenName] === '') {
+            } elseif (!$this->commentOpen) {
+                if ($ord === AsciiChar::SPACE && $this->tokens[$tokenName] === '') {
                     $this->stream->next();
                     goto start;
-                } elseif($this->stream->currentAscii()->isWhiteSpace()) {
+                } elseif ($this->stream->currentAscii()->isWhiteSpace()) {
                     return;
                 } else {
                     $this->tokens[$tokenName] .= $this->stream->current();
                     $this->stream->next();
-                    if($this->stream->isEnd()) {
+                    if ($this->stream->isEnd()) {
                         $this->tokens[$tokenName] = trim($this->tokens[$tokenName]);
                     }
                     goto start;
@@ -231,12 +231,12 @@ 
             return;
         }
         $ord = $this->stream->ord();
-        if($ord === AsciiChar::SEMICOLON) {
+        if ($ord === AsciiChar::SEMICOLON) {
             $this->stream->next();
             $this->commentOpen = true;
             goto start;
-        } elseif($this->commentOpen) {
-            if($ord === AsciiChar::NULL() || $ord === AsciiChar::LINE_FEED) {
+        } elseif ($this->commentOpen) {
+            if ($ord === AsciiChar::NULL() || $ord === AsciiChar::LINE_FEED) {
                 $this->commentOpen = false;
                 goto start;
             } else {
@@ -244,14 +244,14 @@ 
                 $this->commentOpen = true;
                 goto start;
             }
-        } elseif(!$this->commentOpen)  {
-            if($this->multiLineOpened) {
-                if($ord === AsciiChar::CLOSE_BRACKET) {
+        } elseif (!$this->commentOpen) {
+            if ($this->multiLineOpened) {
+                if ($ord === AsciiChar::CLOSE_BRACKET) {
                     $this->multiLineOpened = false;
                 }
                 $this->stream->next();
                 goto start;
-            } elseif($ord === AsciiChar::NULL() || $ord === AsciiChar::LINE_FEED) {
+            } elseif ($ord === AsciiChar::NULL() || $ord === AsciiChar::LINE_FEED) {
                 return;
             }
         }
@@ -274,45 +274,45 @@ 
         $this->stream->next();
 
         // comment starts
-        if($ord === AsciiChar::SEMICOLON) {
+        if ($ord === AsciiChar::SEMICOLON) {
             $this->commentOpen = true;
             goto start;
-        } elseif($this->commentOpen === true && $ord !== AsciiChar::LINE_FEED) {
+        } elseif ($this->commentOpen === true && $ord !== AsciiChar::LINE_FEED) {
             $this->commentOpen = true;
             goto start;
-        } elseif($this->commentOpen === true && ($ord === AsciiChar::LINE_FEED || $ord === AsciiChar::NULL)) {
+        } elseif ($this->commentOpen === true && ($ord === AsciiChar::LINE_FEED || $ord === AsciiChar::NULL)) {
             $this->stream->previous();
             $this->commentOpen = false;
             goto start;
         } else {
             // ignore whitespace
-            if($ord === AsciiChar::SPACE || $ord === AsciiChar::HORIZONTAL_TAB) {
+            if ($ord === AsciiChar::SPACE || $ord === AsciiChar::HORIZONTAL_TAB) {
                 goto start;
             }
 
             // multi line opened
-            if($ord === AsciiChar::OPEN_BRACKET && !$this->commentOpen) {
+            if ($ord === AsciiChar::OPEN_BRACKET && !$this->commentOpen) {
                 $this->multiLineOpened = true;
                 goto start;
             }
             // multi line closed
-            elseif($this->multiLineOpened && !$this->commentOpen && $ord === AsciiChar::CLOSE_BRACKET) {
+            elseif ($this->multiLineOpened && !$this->commentOpen && $ord === AsciiChar::CLOSE_BRACKET) {
                 $this->multiLineOpened = false;
                 goto start;
             }
             // comment end in multi line TXT record
-            elseif($ord === AsciiChar::LINE_FEED && $this->commentOpen && $this->multiLineOpened) {
+            elseif ($ord === AsciiChar::LINE_FEED && $this->commentOpen && $this->multiLineOpened) {
                 goto start;
             }
             // is record ends?
-            elseif(!$this->multiLineOpened && ($ord === AsciiChar::LINE_FEED || $ord === AsciiChar::NULL)) {
+            elseif (!$this->multiLineOpened && ($ord === AsciiChar::LINE_FEED || $ord === AsciiChar::NULL)) {
                 return;
-            } elseif($this->multiLineOpened && $ord === AsciiChar::LINE_FEED) {
+            } elseif ($this->multiLineOpened && $ord === AsciiChar::LINE_FEED) {
                 goto start;
             }
-            elseif(!$this->commentOpen) {
+            elseif (!$this->commentOpen) {
                 // Double quotes aren't required to start a string, but if they start the string then they must also end the string
-                if($ord !== AsciiChar::DOUBLE_QUOTES) {
+                if ($ord !== AsciiChar::DOUBLE_QUOTES) {
                     $this->stream->previous();
                     $this->txtRecordHasQuotes = false;
                 } else {
@@ -323,7 +323,7 @@ 
         }
         
         // multi line should no longer be open
-        if($this->multiLineOpened) {
+        if ($this->multiLineOpened) {
             throw new SyntaxErrorException($this->stream);
         }
     }
@@ -341,14 +341,14 @@ 
         $ord = $this->stream->ord();
         $this->stream->next();
 
-        if(!$escaping_open && $this->txtRecordHasQuotes && $ord === AsciiChar::DOUBLE_QUOTES) {
+        if (!$escaping_open && $this->txtRecordHasQuotes && $ord === AsciiChar::DOUBLE_QUOTES) {
             $this->txtExtractor($tokenName);
-        } elseif(!$this->txtRecordHasQuotes && $ord === AsciiChar::SPACE) {
+        } elseif (!$this->txtRecordHasQuotes && $ord === AsciiChar::SPACE) {
             // If there aren't quotes around a character string, a space terminates the string
             return;
         } else {
-            if($ord === AsciiChar::LINE_FEED || $ord === AsciiChar::VERTICAL_TAB || $ord === AsciiChar::NULL) {
-                if($this->txtRecordHasQuotes) {
+            if ($ord === AsciiChar::LINE_FEED || $ord === AsciiChar::VERTICAL_TAB || $ord === AsciiChar::NULL) {
+                if ($this->txtRecordHasQuotes) {
                     $this->stream->previous();
                     throw new SyntaxErrorException($this->stream);
                 }
@@ -360,7 +360,7 @@ 
             $this->tokens[$tokenName] .= chr($ord);
 
             // Escaping open is only set for one iteration so that it doesn't break on double slashes ie. \\
-            if($ord === AsciiChar::BACKSLASH) {
+            if ($ord === AsciiChar::BACKSLASH) {
                 $escaping_open = true;
             } else {
                 $escaping_open = false;