Merge pull request #468 from kamil-tekiela/remove-elseif

MauricioFauth · web-flow · commit 87af0c9ac597 · 2023-06-07T14:44:00.000-03:00
Remove elseif
diff --git a/src/Components/ParameterDefinition.php b/src/Components/ParameterDefinition.php
@@ -104,8 +104,6 @@ public static function parse(Parser $parser, TokensList $list, array $options =
                 if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) {
                     $state = 1;
                 }
-
-                continue;
             } elseif ($state === 1) {
                 if (($token->value === 'IN') || ($token->value === 'OUT') || ($token->value === 'INOUT')) {
                     $expr->inOut = $token->value;
diff --git a/src/Statements/CreateStatement.php b/src/Statements/CreateStatement.php
@@ -476,7 +476,9 @@ public function build(): string
                 . $fields
                 . OptionsArray::build($this->entityOptions)
                 . $partition;
-        } elseif ($this->options->has('VIEW')) {
+        }
+
+        if ($this->options->has('VIEW')) {
             $builtStatement = '';
             if ($this->select !== null) {
                 $builtStatement = $this->select->build();
@@ -490,14 +492,18 @@ public function build(): string
                 . $fields . ' AS ' . $builtStatement
                 . (! empty($this->body) ? TokensList::build($this->body) : '') . ' '
                 . OptionsArray::build($this->entityOptions);
-        } elseif ($this->options->has('TRIGGER')) {
+        }
+
+        if ($this->options->has('TRIGGER')) {
             return 'CREATE '
                 . OptionsArray::build($this->options) . ' '
                 . Expression::build($this->name) . ' '
                 . OptionsArray::build($this->entityOptions) . ' '
                 . 'ON ' . Expression::build($this->table) . ' '
                 . 'FOR EACH ROW ' . TokensList::build($this->body);
-        } elseif ($this->options->has('PROCEDURE') || $this->options->has('FUNCTION')) {
+        }
+
+        if ($this->options->has('PROCEDURE') || $this->options->has('FUNCTION')) {
             $tmp = '';
             if ($this->options->has('FUNCTION')) {
                 $tmp = 'RETURNS ' . DataType::build($this->return);
diff --git a/src/Utils/BufferedQuery.php b/src/Utils/BufferedQuery.php
@@ -189,30 +189,38 @@ public function extract($end = false)
 
                 $this->current .= $this->query[$i];
                 continue;
-            } elseif ($this->status === self::STATUS_STRING_DOUBLE_QUOTES) {
+            }
+
+            if ($this->status === self::STATUS_STRING_DOUBLE_QUOTES) {
                 // Double-quoted strings like "bar".
                 if ($this->query[$i] === '"') {
                     $this->status = 0;
                 }
 
                 $this->current .= $this->query[$i];
                 continue;
-            } elseif ($this->status === self::STATUS_STRING_BACKTICK) {
+            }
+
+            if ($this->status === self::STATUS_STRING_BACKTICK) {
                 if ($this->query[$i] === '`') {
                     $this->status = 0;
                 }
 
                 $this->current .= $this->query[$i];
                 continue;
-            } elseif (($this->status === self::STATUS_COMMENT_BASH) || ($this->status === self::STATUS_COMMENT_SQL)) {
+            }
+
+            if (($this->status === self::STATUS_COMMENT_BASH) || ($this->status === self::STATUS_COMMENT_SQL)) {
                 // Bash-like (#) or SQL-like (-- ) comments end in new line.
                 if ($this->query[$i] === "\n") {
                     $this->status = 0;
                 }
 
                 $this->current .= $this->query[$i];
                 continue;
-            } elseif ($this->status === self::STATUS_COMMENT_C) {
+            }
+
+            if ($this->status === self::STATUS_COMMENT_C) {
                 // C-like comments end in */.
                 if (($this->query[$i - 1] === '*') && ($this->query[$i] === '/')) {
                     $this->status = 0;

Original file line number	Diff line number	Diff line change
`@@ -104,8 +104,6 @@ public static function parse(Parser $parser, TokensList $list, array $options =`
`104`	`104`	`if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) {`
`105`	`105`	`$state = 1;`
`106`	`106`	`}`
`107`		`-`
`108`		`- continue;`
`109`	`107`	`} elseif ($state === 1) {`
`110`	`108`	`if (($token->value === 'IN') \|\| ($token->value === 'OUT') \|\| ($token->value === 'INOUT')) {`
`111`	`109`	`$expr->inOut = $token->value;`