diff options
author | Dan Ungureanu <udan1107@gmail.com> | 2015-09-25 11:01:45 +0300 |
---|---|---|
committer | Dan Ungureanu <udan1107@gmail.com> | 2015-09-25 11:01:45 +0300 |
commit | 8f19b8f15e098b06587cc67ce02ecc204fd201c7 (patch) | |
tree | 4219e5576893acc5edf7035218114ce2dbd39ffc /src/Components | |
parent | 1415469b34b1fc33189e2c801302597b5b50f704 (diff) | |
download | sql-parser-8f19b8f15e098b06587cc67ce02ecc204fd201c7.zip sql-parser-8f19b8f15e098b06587cc67ce02ecc204fd201c7.tar.gz sql-parser-8f19b8f15e098b06587cc67ce02ecc204fd201c7.tar.bz2 |
Updated coding style to follow PSR-2 coding standards.
Diffstat (limited to 'src/Components')
-rw-r--r-- | src/Components/AlterOperation.php | 1 | ||||
-rw-r--r-- | src/Components/Array2d.php | 1 | ||||
-rw-r--r-- | src/Components/ArrayObj.php | 1 | ||||
-rw-r--r-- | src/Components/Condition.php | 1 | ||||
-rw-r--r-- | src/Components/CreateDefinition.php | 9 | ||||
-rw-r--r-- | src/Components/DataType.php | 5 | ||||
-rw-r--r-- | src/Components/Expression.php | 2 | ||||
-rw-r--r-- | src/Components/ExpressionArray.php | 1 | ||||
-rw-r--r-- | src/Components/FunctionCall.php | 1 | ||||
-rw-r--r-- | src/Components/IntoKeyword.php | 1 | ||||
-rw-r--r-- | src/Components/JoinKeyword.php | 3 | ||||
-rw-r--r-- | src/Components/Key.php | 8 | ||||
-rw-r--r-- | src/Components/Limit.php | 1 | ||||
-rw-r--r-- | src/Components/OptionsArray.php | 1 | ||||
-rw-r--r-- | src/Components/OrderKeyword.php | 1 | ||||
-rw-r--r-- | src/Components/ParameterDefinition.php | 1 | ||||
-rw-r--r-- | src/Components/PartitionDefinition.php | 1 | ||||
-rw-r--r-- | src/Components/Reference.php | 1 | ||||
-rw-r--r-- | src/Components/RenameOperation.php | 1 | ||||
-rw-r--r-- | src/Components/SetOperation.php | 1 |
20 files changed, 15 insertions, 27 deletions
diff --git a/src/Components/AlterOperation.php b/src/Components/AlterOperation.php index ee9302c..8dad8e8 100644 --- a/src/Components/AlterOperation.php +++ b/src/Components/AlterOperation.php @@ -137,7 +137,6 @@ class AlterOperation extends Component $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * diff --git a/src/Components/Array2d.php b/src/Components/Array2d.php index e4c0ed7..a46813b 100644 --- a/src/Components/Array2d.php +++ b/src/Components/Array2d.php @@ -58,7 +58,6 @@ class Array2d extends Component $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * diff --git a/src/Components/ArrayObj.php b/src/Components/ArrayObj.php index 01d79cc..fb199ea 100644 --- a/src/Components/ArrayObj.php +++ b/src/Components/ArrayObj.php @@ -79,7 +79,6 @@ class ArrayObj extends Component $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * diff --git a/src/Components/Condition.php b/src/Components/Condition.php index 43347a8..30be971 100644 --- a/src/Components/Condition.php +++ b/src/Components/Condition.php @@ -111,7 +111,6 @@ class Condition extends Component $betweenBefore = false; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * diff --git a/src/Components/CreateDefinition.php b/src/Components/CreateDefinition.php index 0ef7c4a..21f44fe 100644 --- a/src/Components/CreateDefinition.php +++ b/src/Components/CreateDefinition.php @@ -126,8 +126,12 @@ class CreateDefinition extends Component * @param bool $isConstraint Whether this field is a constraint or not. * @param Reference $references References. */ - public function __construct($name = null, $options = null, $type = null, - $isConstraint = false, $references = null + public function __construct( + $name = null, + $options = null, + $type = null, + $isConstraint = false, + $references = null ) { $this->name = $name; $this->options = $options; @@ -178,7 +182,6 @@ class CreateDefinition extends Component $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * diff --git a/src/Components/DataType.php b/src/Components/DataType.php index a3aca73..aac40ee 100644 --- a/src/Components/DataType.php +++ b/src/Components/DataType.php @@ -75,7 +75,9 @@ class DataType extends Component * @param array $parameters The parameters (size or possible values). * @param OptionsArray $options The options of this data type. */ - public function __construct($name = null, array $parameters = array(), + public function __construct( + $name = null, + array $parameters = array(), $options = null ) { $this->name = $name; @@ -108,7 +110,6 @@ class DataType extends Component $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * diff --git a/src/Components/Expression.php b/src/Components/Expression.php index 1f8752e..22cd23f 100644 --- a/src/Components/Expression.php +++ b/src/Components/Expression.php @@ -160,7 +160,6 @@ class Expression extends Component $prev = null; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * @@ -274,7 +273,6 @@ class Expression extends Component // field should be skipped; used to parse table names). $field = (!empty($options['skipColumn'])) ? 'table' : 'column'; if (!empty($ret->$field)) { - // No alias is expected. if (!empty($options['noAlias'])) { break; diff --git a/src/Components/ExpressionArray.php b/src/Components/ExpressionArray.php index 8327296..5c84dcd 100644 --- a/src/Components/ExpressionArray.php +++ b/src/Components/ExpressionArray.php @@ -51,7 +51,6 @@ class ExpressionArray extends Component $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * diff --git a/src/Components/FunctionCall.php b/src/Components/FunctionCall.php index 54e95ac..9d2dfed 100644 --- a/src/Components/FunctionCall.php +++ b/src/Components/FunctionCall.php @@ -80,7 +80,6 @@ class FunctionCall extends Component $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * diff --git a/src/Components/IntoKeyword.php b/src/Components/IntoKeyword.php index b230308..1ac7be8 100644 --- a/src/Components/IntoKeyword.php +++ b/src/Components/IntoKeyword.php @@ -74,7 +74,6 @@ class IntoKeyword extends Component $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * diff --git a/src/Components/JoinKeyword.php b/src/Components/JoinKeyword.php index 28756ab..ac2fa02 100644 --- a/src/Components/JoinKeyword.php +++ b/src/Components/JoinKeyword.php @@ -98,7 +98,6 @@ class JoinKeyword extends Component } for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * @@ -132,7 +131,7 @@ class JoinKeyword extends Component if (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'ON')) { $state = 3; } - } else if ($state === 3) { + } elseif ($state === 3) { $expr->on = Condition::parse($parser, $list); $ret[] = $expr; $expr = new JoinKeyword(); diff --git a/src/Components/Key.php b/src/Components/Key.php index 70b2b93..490d067 100644 --- a/src/Components/Key.php +++ b/src/Components/Key.php @@ -75,8 +75,11 @@ class Key extends Component * @param string $type The type of this key. * @param OptionsArray $options The options of this key. */ - public function __construct($name = null, array $columns = array(), - $type = null, $options = null + public function __construct( + $name = null, + array $columns = array(), + $type = null, + $options = null ) { $this->name = $name; $this->columns = $columns; @@ -119,7 +122,6 @@ class Key extends Component $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * diff --git a/src/Components/Limit.php b/src/Components/Limit.php index edf663a..c6b3290 100644 --- a/src/Components/Limit.php +++ b/src/Components/Limit.php @@ -65,7 +65,6 @@ class Limit extends Component $offset = false; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * diff --git a/src/Components/OptionsArray.php b/src/Components/OptionsArray.php index f24635a..a7fbf41 100644 --- a/src/Components/OptionsArray.php +++ b/src/Components/OptionsArray.php @@ -99,7 +99,6 @@ class OptionsArray extends Component $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * diff --git a/src/Components/OrderKeyword.php b/src/Components/OrderKeyword.php index 9c1ad59..fc226f0 100644 --- a/src/Components/OrderKeyword.php +++ b/src/Components/OrderKeyword.php @@ -79,7 +79,6 @@ class OrderKeyword extends Component $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * diff --git a/src/Components/ParameterDefinition.php b/src/Components/ParameterDefinition.php index 9ed9cfc..aea8f9c 100644 --- a/src/Components/ParameterDefinition.php +++ b/src/Components/ParameterDefinition.php @@ -80,7 +80,6 @@ class ParameterDefinition extends Component $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * diff --git a/src/Components/PartitionDefinition.php b/src/Components/PartitionDefinition.php index 34acbb8..766d58d 100644 --- a/src/Components/PartitionDefinition.php +++ b/src/Components/PartitionDefinition.php @@ -125,7 +125,6 @@ class PartitionDefinition extends Component $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * diff --git a/src/Components/Reference.php b/src/Components/Reference.php index 6826f7f..037499a 100644 --- a/src/Components/Reference.php +++ b/src/Components/Reference.php @@ -99,7 +99,6 @@ class Reference extends Component $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * diff --git a/src/Components/RenameOperation.php b/src/Components/RenameOperation.php index 5f7c9a5..8776963 100644 --- a/src/Components/RenameOperation.php +++ b/src/Components/RenameOperation.php @@ -71,7 +71,6 @@ class RenameOperation extends Component $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * diff --git a/src/Components/SetOperation.php b/src/Components/SetOperation.php index 3d04320..9281902 100644 --- a/src/Components/SetOperation.php +++ b/src/Components/SetOperation.php @@ -67,7 +67,6 @@ class SetOperation extends Component $state = 0; for (; $list->idx < $list->count; ++$list->idx) { - /** * Token parsed at this moment. * |