summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Components/AlterOperation.php2
-rw-r--r--src/Components/CaseExpression.php10
-rw-r--r--src/Components/CreateDefinition.php9
-rw-r--r--src/Components/OptionsArray.php2
-rw-r--r--src/Statement.php2
-rw-r--r--src/Statements/CreateStatement.php2
-rw-r--r--src/Statements/DeleteStatement.php18
-rw-r--r--src/Statements/InsertStatement.php8
-rw-r--r--src/Statements/ReplaceStatement.php6
9 files changed, 29 insertions, 30 deletions
diff --git a/src/Components/AlterOperation.php b/src/Components/AlterOperation.php
index 2bcb530..582ee84 100644
--- a/src/Components/AlterOperation.php
+++ b/src/Components/AlterOperation.php
@@ -225,7 +225,7 @@ class AlterOperation extends Component
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.'),
+ 'A new statement was found, but no delimiter between it and the previous one.',
$token
);
break;
diff --git a/src/Components/CaseExpression.php b/src/Components/CaseExpression.php
index df5a1bd..e410aab 100644
--- a/src/Components/CaseExpression.php
+++ b/src/Components/CaseExpression.php
@@ -134,7 +134,7 @@ class CaseExpression extends Component
++$list->idx;
break;
} elseif ($token->type === Token::TYPE_KEYWORD) {
- $parser->error(__('Unexpected keyword.'), $token);
+ $parser->error('Unexpected keyword.', $token);
break;
} else {
$ret->value = Expression::parse($parser, $list);
@@ -164,7 +164,7 @@ class CaseExpression extends Component
++$list->idx;
break;
} elseif ($token->type === Token::TYPE_KEYWORD) {
- $parser->error(__('Unexpected keyword.'), $token);
+ $parser->error('Unexpected keyword.', $token);
break;
}
} else {
@@ -176,7 +176,7 @@ class CaseExpression extends Component
$state = 0;
$ret->results[] = $new_result;
} elseif ($token->type === Token::TYPE_KEYWORD) {
- $parser->error(__('Unexpected keyword.'), $token);
+ $parser->error('Unexpected keyword.', $token);
break;
}
}
@@ -190,7 +190,7 @@ class CaseExpression extends Component
$ret->results[] = $new_result;
$state = 1;
} elseif ($token->type === Token::TYPE_KEYWORD) {
- $parser->error(__('Unexpected keyword.'), $token);
+ $parser->error('Unexpected keyword.', $token);
break;
}
}
@@ -199,7 +199,7 @@ class CaseExpression extends Component
if ($state !== 3) {
$parser->error(
- __('Unexpected end of CASE expression'),
+ 'Unexpected end of CASE expression',
$list->tokens[$list->idx - 1]
);
}
diff --git a/src/Components/CreateDefinition.php b/src/Components/CreateDefinition.php
index 1b15c21..4fb8c9c 100644
--- a/src/Components/CreateDefinition.php
+++ b/src/Components/CreateDefinition.php
@@ -224,10 +224,9 @@ class CreateDefinition extends Component
// Reserved keywords can't be used
// as field names without backquotes
$parser->error(
- __('A symbol name was expected! '
- . 'A reserved keyword can not be used '
- . 'as a column name without backquotes.'
- ),
+ 'A symbol name was expected! '
+ . 'A reserved keyword can not be used '
+ . 'as a column name without backquotes.' ,
$token
);
return $ret;
@@ -238,7 +237,7 @@ class CreateDefinition extends Component
}
} else {
$parser->error(
- __('A symbol name was expected!'),
+ 'A symbol name was expected!',
$token
);
return $ret;
diff --git a/src/Components/OptionsArray.php b/src/Components/OptionsArray.php
index 5ecf19c..94b7f66 100644
--- a/src/Components/OptionsArray.php
+++ b/src/Components/OptionsArray.php
@@ -258,7 +258,7 @@ class OptionsArray extends Component
) {
$parser->error(
sprintf(
- __('Value/Expression for the option %1$s was expected'),
+ 'Value/Expression for the option %1$s was expected.',
$ret->options[$lastOptionId]['name']
),
$list->tokens[$list->idx - 1]
diff --git a/src/Statement.php b/src/Statement.php
index 0d18596..a0a2b17 100644
--- a/src/Statement.php
+++ b/src/Statement.php
@@ -492,7 +492,7 @@ abstract class Statement
if ($joinStart == 0 || ($joinStart == 2 && $error = 1)) {
$token = $list->tokens[$clauseStartIdx];
$parser->error(
- __('Unexpected ordering of clauses.'),
+ 'Unexpected ordering of clauses.',
$token
);
return false;
diff --git a/src/Statements/CreateStatement.php b/src/Statements/CreateStatement.php
index f59ad8b..6eeb41f 100644
--- a/src/Statements/CreateStatement.php
+++ b/src/Statements/CreateStatement.php
@@ -433,7 +433,7 @@ class CreateStatement extends Statement
// The 'LIKE' keyword was found, but no table_name was found next to it
if ($this->like == null) {
$parser->error(
- __('A table name was expected.'),
+ 'A table name was expected.',
$list->tokens[$list->idx]
);
}
diff --git a/src/Statements/DeleteStatement.php b/src/Statements/DeleteStatement.php
index d83d0e9..e86f4ec 100644
--- a/src/Statements/DeleteStatement.php
+++ b/src/Statements/DeleteStatement.php
@@ -222,7 +222,7 @@ class DeleteStatement extends Statement
if ($token->type === Token::TYPE_KEYWORD
&& $token->value !== 'FROM'
) {
- $parser->error(__('Unexpected keyword.'), $token);
+ $parser->error('Unexpected keyword.', $token);
break;
} elseif ($token->type === Token::TYPE_KEYWORD
&& $token->value === 'FROM'
@@ -238,7 +238,7 @@ class DeleteStatement extends Statement
if ($token->type === Token::TYPE_KEYWORD
&& $token->value !== 'FROM'
) {
- $parser->error(__('Unexpected keyword.'), $token);
+ $parser->error('Unexpected keyword.', $token);
break;
} elseif ($token->type === Token::TYPE_KEYWORD
&& $token->value === 'FROM'
@@ -247,7 +247,7 @@ class DeleteStatement extends Statement
$this->from = ExpressionArray::parse($parser, $list);
$state = 2;
} else {
- $parser->error(__('Unexpected token.'), $token);
+ $parser->error('Unexpected token.', $token);
break;
}
} elseif ($state === 2) {
@@ -278,7 +278,7 @@ class DeleteStatement extends Statement
$this->limit = Limit::parse($parser, $list);
$state = 6;
} elseif ($token->type === Token::TYPE_KEYWORD) {
- $parser->error(__('Unexpected keyword.'), $token);
+ $parser->error('Unexpected keyword.', $token);
break;
}
} elseif ($state === 3) {
@@ -289,10 +289,10 @@ class DeleteStatement extends Statement
$this->where = Condition::parse($parser, $list);
$state = 4;
} elseif ($token->type === Token::TYPE_KEYWORD) {
- $parser->error(__('Unexpected keyword.'), $token);
+ $parser->error('Unexpected keyword.', $token);
break;
} else {
- $parser->error(__('Unexpected token.'), $token);
+ $parser->error('Unexpected token.', $token);
break;
}
} elseif ($state === 4) {
@@ -300,7 +300,7 @@ class DeleteStatement extends Statement
&& $token->type === Token::TYPE_KEYWORD
) {
$parser->error(
- __('This type of clause is not valid in Multi-table queries.'),
+ 'This type of clause is not valid in Multi-table queries.',
$token
);
break;
@@ -319,7 +319,7 @@ class DeleteStatement extends Statement
$this->limit = Limit::parse($parser, $list);
$state = 6;
} elseif ($token->type === Token::TYPE_KEYWORD) {
- $parser->error(__('Unexpected keyword.'), $token);
+ $parser->error('Unexpected keyword.', $token);
break;
}
} elseif ($state === 5) {
@@ -330,7 +330,7 @@ class DeleteStatement extends Statement
$this->limit = Limit::parse($parser, $list);
$state = 6;
} elseif ($token->type === Token::TYPE_KEYWORD) {
- $parser->error(__('Unexpected keyword.'), $token);
+ $parser->error('Unexpected keyword.', $token);
break;
}
}
diff --git a/src/Statements/InsertStatement.php b/src/Statements/InsertStatement.php
index 9db1a44..1e760ff 100644
--- a/src/Statements/InsertStatement.php
+++ b/src/Statements/InsertStatement.php
@@ -196,7 +196,7 @@ class InsertStatement extends Statement
if ($token->type === Token::TYPE_KEYWORD
&& $token->value !== 'INTO'
) {
- $parser->error(__('Unexpected keyword.'), $token);
+ $parser->error('Unexpected keyword.', $token);
break;
} else {
++$list->idx;
@@ -224,7 +224,7 @@ class InsertStatement extends Statement
$this->select = new SelectStatement($parser, $list);
} else {
$parser->error(
- __('Unexpected keyword.'),
+ 'Unexpected keyword.',
$token
);
break;
@@ -233,7 +233,7 @@ class InsertStatement extends Statement
$miniState = 1;
} else {
$parser->error(
- __('Unexpected token.'),
+ 'Unexpected token.',
$token
);
break;
@@ -253,7 +253,7 @@ class InsertStatement extends Statement
if ($lastCount === $miniState) {
$parser->error(
- __('Unexpected token.'),
+ 'Unexpected token.',
$token
);
break;
diff --git a/src/Statements/ReplaceStatement.php b/src/Statements/ReplaceStatement.php
index 0e85507..d03cf5c 100644
--- a/src/Statements/ReplaceStatement.php
+++ b/src/Statements/ReplaceStatement.php
@@ -162,7 +162,7 @@ class ReplaceStatement extends Statement
if ($token->type === Token::TYPE_KEYWORD
&& $token->value !== 'INTO'
) {
- $parser->error(__('Unexpected keyword.'), $token);
+ $parser->error('Unexpected keyword.', $token);
break;
} else {
++$list->idx;
@@ -190,7 +190,7 @@ class ReplaceStatement extends Statement
$this->select = new SelectStatement($parser, $list);
} else {
$parser->error(
- __('Unexpected keyword.'),
+ 'Unexpected keyword.',
$token
);
break;
@@ -198,7 +198,7 @@ class ReplaceStatement extends Statement
$state = 2;
} else {
$parser->error(
- __('Unexpected token.'),
+ 'Unexpected token.',
$token
);
break;
generated by cgit v1.1 at 2025-06-03 15:24:15 +0000