summaryrefslogtreecommitdiffstats
path: root/src/Components
diff options
context:
space:
mode:
Diffstat (limited to 'src/Components')
-rw-r--r--src/Components/AlterOperation.php2
-rw-r--r--src/Components/Array2d.php2
-rw-r--r--src/Components/CaseExpression.php88
-rw-r--r--src/Components/Condition.php6
-rw-r--r--src/Components/CreateDefinition.php6
-rw-r--r--src/Components/DataType.php2
-rw-r--r--src/Components/Expression.php44
-rw-r--r--src/Components/IntoKeyword.php12
-rw-r--r--src/Components/JoinKeyword.php37
-rw-r--r--src/Components/OptionsArray.php8
-rw-r--r--src/Components/ParameterDefinition.php2
-rw-r--r--src/Components/SetOperation.php4
-rw-r--r--src/Components/UnionKeyword.php4
13 files changed, 108 insertions, 109 deletions
diff --git a/src/Components/AlterOperation.php b/src/Components/AlterOperation.php
index 9383eca..1ae28ae 100644
--- a/src/Components/AlterOperation.php
+++ b/src/Components/AlterOperation.php
@@ -236,7 +236,7 @@ class AlterOperation extends Component
// We have reached the end of ALTER operation and suddenly found
// a start to new statement, but have not find a delimiter between them
- if (!($token->value == 'SET' && $list->tokens[$list->idx - 1]->value == 'CHARACTER')) {
+ if (!($token->value === 'SET' && $list->tokens[$list->idx - 1]->value === 'CHARACTER')) {
$parser->error(
'A new statement was found, but no delimiter between it and the previous one.',
$token
diff --git a/src/Components/Array2d.php b/src/Components/Array2d.php
index 92d8b16..984179c 100644
--- a/src/Components/Array2d.php
+++ b/src/Components/Array2d.php
@@ -82,7 +82,7 @@ class Array2d extends Component
$arrCount = count($arr->values);
if ($count === -1) {
$count = $arrCount;
- } elseif ($arrCount != $count) {
+ } elseif ($arrCount !== $count) {
$parser->error(
sprintf(
Translator::gettext('%1$d values were expected, but found %2$d.'),
diff --git a/src/Components/CaseExpression.php b/src/Components/CaseExpression.php
index 820947b..19061db 100644
--- a/src/Components/CaseExpression.php
+++ b/src/Components/CaseExpression.php
@@ -112,29 +112,28 @@ class CaseExpression extends Component
}
if ($state === 0) {
- if ($token->type === Token::TYPE_KEYWORD
- && $token->keyword === 'WHEN'
- ) {
- ++$list->idx; // Skip 'WHEN'
- $new_condition = Condition::parse($parser, $list);
- $type = 1;
- $state = 1;
- $ret->conditions[] = $new_condition;
- } elseif ($token->type === Token::TYPE_KEYWORD
- && $token->keyword === 'ELSE'
- ) {
- ++$list->idx; // Skip 'ELSE'
- $ret->else_result = Expression::parse($parser, $list);
- $state = 0; // last clause of CASE expression
- } elseif ($token->type === Token::TYPE_KEYWORD
- && $token->keyword === 'END'
- ) {
- $state = 3; // end of CASE expression
- ++$list->idx;
- break;
- } elseif ($token->type === Token::TYPE_KEYWORD) {
- $parser->error('Unexpected keyword.', $token);
- break;
+ if ($token->type === Token::TYPE_KEYWORD) {
+ switch($token->keyword) {
+ case 'WHEN':
+ ++$list->idx; // Skip 'WHEN'
+ $new_condition = Condition::parse($parser, $list);
+ $type = 1;
+ $state = 1;
+ $ret->conditions[] = $new_condition;
+ break;
+ case 'ELSE':
+ ++$list->idx; // Skip 'ELSE'
+ $ret->else_result = Expression::parse($parser, $list);
+ $state = 0; // last clause of CASE expression
+ break;
+ case 'END':
+ $state = 3; // end of CASE expression
+ ++$list->idx;
+ break 2;
+ default:
+ $parser->error('Unexpected keyword.', $token);
+ break 2;
+ }
} else {
$ret->value = Expression::parse($parser, $list);
$type = 0;
@@ -142,28 +141,27 @@ class CaseExpression extends Component
}
} elseif ($state === 1) {
if ($type === 0) {
- if ($token->type === Token::TYPE_KEYWORD
- && $token->keyword === 'WHEN'
- ) {
- ++$list->idx; // Skip 'WHEN'
- $new_value = Expression::parse($parser, $list);
- $state = 2;
- $ret->compare_values[] = $new_value;
- } elseif ($token->type === Token::TYPE_KEYWORD
- && $token->keyword === 'ELSE'
- ) {
- ++$list->idx; // Skip 'ELSE'
- $ret->else_result = Expression::parse($parser, $list);
- $state = 0; // last clause of CASE expression
- } elseif ($token->type === Token::TYPE_KEYWORD
- && $token->keyword === 'END'
- ) {
- $state = 3; // end of CASE expression
- ++$list->idx;
- break;
- } elseif ($token->type === Token::TYPE_KEYWORD) {
- $parser->error('Unexpected keyword.', $token);
- break;
+ if ($token->type === Token::TYPE_KEYWORD) {
+ switch($token->keyword) {
+ case 'WHEN':
+ ++$list->idx; // Skip 'WHEN'
+ $new_value = Expression::parse($parser, $list);
+ $state = 2;
+ $ret->compare_values[] = $new_value;
+ break;
+ case 'ELSE':
+ ++$list->idx; // Skip 'ELSE'
+ $ret->else_result = Expression::parse($parser, $list);
+ $state = 0; // last clause of CASE expression
+ break;
+ case 'END':
+ $state = 3; // end of CASE expression
+ ++$list->idx;
+ break 2;
+ default:
+ $parser->error('Unexpected keyword.', $token);
+ break 2;
+ }
}
} else {
if ($token->type === Token::TYPE_KEYWORD
diff --git a/src/Components/Condition.php b/src/Components/Condition.php
index 99ab34c..2be0abd 100644
--- a/src/Components/Condition.php
+++ b/src/Components/Condition.php
@@ -142,7 +142,7 @@ class Condition extends Component
// Conditions are delimited by logical operators.
if (in_array($token->value, static::$DELIMITERS, true)) {
- if (($betweenBefore) && ($token->value === 'AND')) {
+ if ($betweenBefore && ($token->value === 'AND')) {
// The syntax of keyword `BETWEEN` is hard-coded.
$betweenBefore = false;
} else {
@@ -170,7 +170,7 @@ class Condition extends Component
if ($token->value === 'BETWEEN') {
$betweenBefore = true;
}
- if (($brackets === 0) && (empty(static::$ALLOWED_KEYWORDS[$token->value]))) {
+ if (($brackets === 0) && empty(static::$ALLOWED_KEYWORDS[$token->value])) {
break;
}
}
@@ -179,7 +179,7 @@ class Condition extends Component
if ($token->value === '(') {
++$brackets;
} elseif ($token->value === ')') {
- if ($brackets == 0) {
+ if ($brackets === 0) {
break;
}
--$brackets;
diff --git a/src/Components/CreateDefinition.php b/src/Components/CreateDefinition.php
index f85ad0f..21ddae9 100644
--- a/src/Components/CreateDefinition.php
+++ b/src/Components/CreateDefinition.php
@@ -259,7 +259,7 @@ class CreateDefinition extends Component
}
$state = 5;
} elseif ($state === 5) {
- if ((!empty($expr->type)) || (!empty($expr->key))) {
+ if (!empty($expr->type) || !empty($expr->key)) {
$ret[] = $expr;
}
$expr = new self();
@@ -281,7 +281,7 @@ class CreateDefinition extends Component
}
// Last iteration was not saved.
- if ((!empty($expr->type)) || (!empty($expr->key))) {
+ if (!empty($expr->type) || !empty($expr->key)) {
$ret[] = $expr;
}
@@ -315,7 +315,7 @@ class CreateDefinition extends Component
$tmp .= 'CONSTRAINT ';
}
- if ((isset($component->name)) && ($component->name !== '')) {
+ if (isset($component->name) && ($component->name !== '')) {
$tmp .= Context::escape($component->name) . ' ';
}
diff --git a/src/Components/DataType.php b/src/Components/DataType.php
index 52d8775..51f04fa 100644
--- a/src/Components/DataType.php
+++ b/src/Components/DataType.php
@@ -153,7 +153,7 @@ class DataType extends Component
*/
public static function build($component, array $options = array())
{
- $name = (empty($options['lowercase'])) ?
+ $name = empty($options['lowercase']) ?
$component->name : strtolower($component->name);
$parameters = '';
diff --git a/src/Components/Expression.php b/src/Components/Expression.php
index cce797f..5350e36 100644
--- a/src/Components/Expression.php
+++ b/src/Components/Expression.php
@@ -215,8 +215,8 @@ class Expression extends Component
}
if ($token->type === Token::TYPE_KEYWORD) {
- if (($brackets > 0) && (empty($ret->subquery))
- && (!empty(Parser::$STATEMENT_PARSERS[$token->keyword]))
+ if (($brackets > 0) && empty($ret->subquery)
+ && !empty(Parser::$STATEMENT_PARSERS[$token->keyword])
) {
// A `(` was previously found and this keyword is the
// beginning of a statement, so this is a subquery.
@@ -282,7 +282,7 @@ class Expression extends Component
}
if ($token->type === Token::TYPE_OPERATOR) {
- if ((!empty($options['breakOnParentheses']))
+ if (!empty($options['breakOnParentheses'])
&& (($token->value === '(') || ($token->value === ')'))
) {
// No brackets were expected.
@@ -290,7 +290,7 @@ class Expression extends Component
}
if ($token->value === '(') {
++$brackets;
- if ((empty($ret->function)) && ($prev[1] !== null)
+ if (empty($ret->function) && ($prev[1] !== null)
&& (($prev[1]->type === Token::TYPE_NONE)
|| ($prev[1]->type === Token::TYPE_SYMBOL)
|| (($prev[1]->type === Token::TYPE_KEYWORD)
@@ -298,23 +298,25 @@ class Expression extends Component
) {
$ret->function = $prev[1]->value;
}
- } elseif ($token->value === ')' && $brackets == 0) {
- // Not our bracket
- break;
} elseif ($token->value === ')') {
- --$brackets;
if ($brackets === 0) {
- if (!empty($options['parenthesesDelimited'])) {
- // The current token is the last bracket, the next
- // one will be outside the expression.
- $ret->expr .= $token->token;
- ++$list->idx;
+ // Not our bracket
+ break;
+ } else {
+ --$brackets;
+ if ($brackets === 0) {
+ if (!empty($options['parenthesesDelimited'])) {
+ // The current token is the last bracket, the next
+ // one will be outside the expression.
+ $ret->expr .= $token->token;
+ ++$list->idx;
+ break;
+ }
+ } elseif ($brackets < 0) {
+ // $parser->error('Unexpected closing bracket.', $token);
+ // $brackets = 0;
break;
}
- } elseif ($brackets < 0) {
- // $parser->error('Unexpected closing bracket.', $token);
- // $brackets = 0;
- break;
}
} elseif ($token->value === ',') {
// Expressions are comma-delimited.
@@ -362,7 +364,7 @@ class Expression extends Component
// Found a `.` which means we expect a column name and
// the column name we parsed is actually the table name
// and the table name is actually a database name.
- if ((!empty($ret->database)) || ($dot)) {
+ if (!empty($ret->database) || $dot) {
$parser->error('Unexpected dot.', $token);
}
$ret->database = $ret->table;
@@ -426,13 +428,13 @@ class Expression extends Component
$ret = $component->expr;
} else {
$fields = array();
- if ((isset($component->database)) && ($component->database !== '')) {
+ if (isset($component->database) && ($component->database !== '')) {
$fields[] = $component->database;
}
- if ((isset($component->table)) && ($component->table !== '')) {
+ if (isset($component->table) && ($component->table !== '')) {
$fields[] = $component->table;
}
- if ((isset($component->column)) && ($component->column !== '')) {
+ if (isset($component->column) && ($component->column !== '')) {
$fields[] = $component->column;
}
$ret = implode('.', Context::escape($fields));
diff --git a/src/Components/IntoKeyword.php b/src/Components/IntoKeyword.php
index 17615f6..c0fa390 100644
--- a/src/Components/IntoKeyword.php
+++ b/src/Components/IntoKeyword.php
@@ -207,10 +207,10 @@ class IntoKeyword extends Component
$ret->dest = $token->value;
$state = 3;
- } elseif ($state == 3) {
+ } elseif ($state === 3) {
$ret->parseFileOptions($parser, $list, $token->value);
$state = 4;
- } elseif ($state == 4) {
+ } elseif ($state === 4) {
if ($token->type === Token::TYPE_KEYWORD && $token->keyword !== 'LINES') {
break;
}
@@ -237,11 +237,7 @@ class IntoKeyword extends Component
static::$FIELDS_OPTIONS
);
- if ($keyword === 'FIELDS') {
- $this->fields_keyword = true;
- } else {
- $this->fields_keyword = false;
- }
+ $this->fields_keyword = ($keyword === 'FIELDS');
} else {
// parse line options
$this->lines_options = OptionsArray::parse(
@@ -272,7 +268,7 @@ class IntoKeyword extends Component
$fields_options_str = OptionsArray::build($component->fields_options);
if (trim($fields_options_str) !== '') {
- $ret .= ($component->fields_keyword) ? ' FIELDS' : ' COLUMNS';
+ $ret .= $component->fields_keyword ? ' FIELDS' : ' COLUMNS';
$ret .= ' ' . $fields_options_str;
}
diff --git a/src/Components/JoinKeyword.php b/src/Components/JoinKeyword.php
index 55b69ae..786092d 100644
--- a/src/Components/JoinKeyword.php
+++ b/src/Components/JoinKeyword.php
@@ -151,7 +151,7 @@ class JoinKeyword extends Component
if ($state === 0) {
if (($token->type === Token::TYPE_KEYWORD)
- && (!empty(static::$JOINS[$token->keyword]))
+ && !empty(static::$JOINS[$token->keyword])
) {
$expr->type = static::$JOINS[$token->keyword];
$state = 1;
@@ -163,22 +163,25 @@ class JoinKeyword extends Component
$state = 2;
} elseif ($state === 2) {
if ($token->type === Token::TYPE_KEYWORD) {
- if ($token->keyword === 'ON') {
- $state = 3;
- } elseif ($token->keyword === 'USING') {
- $state = 4;
- } else {
- if (($token->type === Token::TYPE_KEYWORD)
- && (!empty(static::$JOINS[$token->keyword]))
- ) {
- $ret[] = $expr;
- $expr = new self();
- $expr->type = static::$JOINS[$token->keyword];
- $state = 1;
- } else {
- /* Next clause is starting */
- break;
- }
+ switch($token->keyword) {
+ case 'ON':
+ $state = 3;
+ break;
+ case 'USING':
+ $state = 4;
+ break;
+ default:
+ if (!empty(static::$JOINS[$token->keyword])
+ ) {
+ $ret[] = $expr;
+ $expr = new self();
+ $expr->type = static::$JOINS[$token->keyword];
+ $state = 1;
+ } else {
+ /* Next clause is starting */
+ break 2;
+ }
+ break;
}
}
} elseif ($state === 3) {
diff --git a/src/Components/OptionsArray.php b/src/Components/OptionsArray.php
index 871772b..fd02d22 100644
--- a/src/Components/OptionsArray.php
+++ b/src/Components/OptionsArray.php
@@ -247,10 +247,10 @@ class OptionsArray extends Component
*/
if ($state === 1
&& $lastOption
- && ($lastOption[1] == 'expr'
- || $lastOption[1] == 'var'
- || $lastOption[1] == 'var='
- || $lastOption[1] == 'expr=')
+ && ($lastOption[1] === 'expr'
+ || $lastOption[1] === 'var'
+ || $lastOption[1] === 'var='
+ || $lastOption[1] === 'expr=')
) {
$parser->error(
sprintf(
diff --git a/src/Components/ParameterDefinition.php b/src/Components/ParameterDefinition.php
index 82a3567..1f810f5 100644
--- a/src/Components/ParameterDefinition.php
+++ b/src/Components/ParameterDefinition.php
@@ -138,7 +138,7 @@ class ParameterDefinition extends Component
}
// Last iteration was not saved.
- if ((isset($expr->name)) && ($expr->name !== '')) {
+ if (isset($expr->name) && ($expr->name !== '')) {
$ret[] = $expr;
}
diff --git a/src/Components/SetOperation.php b/src/Components/SetOperation.php
index 83f2e55..7dab0a1 100644
--- a/src/Components/SetOperation.php
+++ b/src/Components/SetOperation.php
@@ -94,7 +94,7 @@ class SetOperation extends Component
// No keyword is expected.
if (($token->type === Token::TYPE_KEYWORD)
&& ($token->flags & Token::FLAG_KEYWORD_RESERVED)
- && ($state == 0)
+ && ($state === 0)
) {
break;
}
@@ -113,7 +113,7 @@ class SetOperation extends Component
'breakOnAlias' => true,
)
);
- if ($tmp == null) {
+ if (is_null($tmp)) {
$parser->error('Missing expression.', $token);
break;
}
diff --git a/src/Components/UnionKeyword.php b/src/Components/UnionKeyword.php
index 4aa0f94..2de5126 100644
--- a/src/Components/UnionKeyword.php
+++ b/src/Components/UnionKeyword.php
@@ -26,8 +26,8 @@ class UnionKeyword extends Component
public static function build($component, array $options = array())
{
$tmp = array();
- foreach ($component as $component) {
- $tmp[] = $component[0] . ' ' . $component[1];
+ foreach ($component as $componentPart) {
+ $tmp[] = $componentPart[0] . ' ' . $componentPart[1];
}
return implode(' ', $tmp);
generated by cgit v1.1 at 2025-05-29 01:44:32 +0000