Updated coding style to follow PSR-2 coding standards.

udan11 · udan11 · commit 8f19b8f15e09 · 2015-09-25T11:01:45.000+03:00
diff --git a/src/Component.php b/src/Component.php
@@ -39,7 +39,9 @@ abstract class Component
      * @return mixed
      */
     public static function parse(
-        Parser $parser, TokensList $list, array $options = array()
+        Parser $parser,
+        TokensList $list,
+        array $options = array()
     ) {
         // This method should be abstract, but it can't be both static and
         // abstract.
diff --git a/src/Components/AlterOperation.php b/src/Components/AlterOperation.php
@@ -137,7 +137,6 @@ public static function parse(Parser $parser, TokensList $list, array $options =
         $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
@@ -58,7 +58,6 @@ public static function parse(Parser $parser, TokensList $list, array $options =
         $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
@@ -79,7 +79,6 @@ public static function parse(Parser $parser, TokensList $list, array $options =
         $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
@@ -111,7 +111,6 @@ public static function parse(Parser $parser, TokensList $list, array $options =
         $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
@@ -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 @@ public static function parse(Parser $parser, TokensList $list, array $options =
         $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
@@ -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 @@ public static function parse(Parser $parser, TokensList $list, array $options =
         $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
@@ -160,7 +160,6 @@ public static function parse(Parser $parser, TokensList $list, array $options =
         $prev = null;
 
         for (; $list->idx < $list->count; ++$list->idx) {
-
             /**
              * Token parsed at this moment.
              *
@@ -274,7 +273,6 @@ public static function parse(Parser $parser, TokensList $list, array $options =
                         // 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
@@ -51,7 +51,6 @@ public static function parse(Parser $parser, TokensList $list, array $options =
         $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
@@ -80,7 +80,6 @@ public static function parse(Parser $parser, TokensList $list, array $options =
         $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
@@ -74,7 +74,6 @@ public static function parse(Parser $parser, TokensList $list, array $options =
         $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
@@ -98,7 +98,6 @@ public static function parse(Parser $parser, TokensList $list, array $options =
         }
 
         for (; $list->idx < $list->count; ++$list->idx) {
-
             /**
              * Token parsed at this moment.
              *
@@ -132,7 +131,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
                 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
@@ -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 @@ public static function parse(Parser $parser, TokensList $list, array $options =
         $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
@@ -65,7 +65,6 @@ public static function parse(Parser $parser, TokensList $list, array $options =
         $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
@@ -99,7 +99,6 @@ public static function parse(Parser $parser, TokensList $list, array $options =
         $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
@@ -79,7 +79,6 @@ public static function parse(Parser $parser, TokensList $list, array $options =
         $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
@@ -80,7 +80,6 @@ public static function parse(Parser $parser, TokensList $list, array $options =
         $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
@@ -125,7 +125,6 @@ public static function parse(Parser $parser, TokensList $list, array $options =
         $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
@@ -99,7 +99,6 @@ public static function parse(Parser $parser, TokensList $list, array $options =
         $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
@@ -71,7 +71,6 @@ public static function parse(Parser $parser, TokensList $list, array $options =
         $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
@@ -67,7 +67,6 @@ public static function parse(Parser $parser, TokensList $list, array $options =
         $state = 0;
 
         for (; $list->idx < $list->count; ++$list->idx) {
-
             /**
              * Token parsed at this moment.
              *
diff --git a/src/Context.php b/src/Context.php
@@ -464,7 +464,11 @@ public static function loadClosest($context = '')
                 // If it didn't work, we are looking for a new one and skipping
                 // over to the next generation that will try the new context.
                 $context = preg_replace(
-                    '/[1-9](0*)$/', '0$1', $context, -1, $count
+                    '/[1-9](0*)$/',
+                    '0$1',
+                    $context,
+                    -1,
+                    $count
                 );
                 continue;
             }
diff --git a/src/Lexer.php b/src/Lexer.php
@@ -16,7 +16,6 @@
 use SqlParser\Exceptions\LexerException;
 
 if (!defined('USE_UTF_STRINGS')) {
-
     // NOTE: In previous versions of PHP (5.5 and older) the default
     // internal encoding is "ISO-8859-1".
     // All `mb_` functions must specify the correct encoding, which is
@@ -232,7 +231,6 @@ public function lex()
         $lastToken = null;
 
         for ($this->last = 0, $lastIdx = 0; $this->last < $this->len; $lastIdx = ++$this->last) {
-
             /**
              * The new token.
              *
@@ -399,7 +397,6 @@ public function parseKeyword()
         $lastSpace = false;
 
         for ($j = 1; $j < Context::KEYWORD_MAX_LENGTH && $this->last < $this->len; ++$j, ++$this->last) {
-
             // Composed keywords shouldn't have more than one whitespace between
             // keywords.
             if (Context::isWhitespace($this->str[$this->last])) {
diff --git a/src/Parser.php b/src/Parser.php
@@ -354,7 +354,6 @@ public function parse()
         $list = &$this->list;
 
         for (; $list->idx < $list->count; ++$list->idx) {
-
             /**
              * Token parsed at this moment.
              *
@@ -441,7 +440,6 @@ public function parse()
                 && ($lastStatement instanceof SelectStatement)
                 && ($statement instanceof SelectStatement)
             ) {
-
                 /**
                  * This SELECT statement.
                  *
@@ -472,7 +470,6 @@ public function parse()
 
             // Handles transactions.
             if ($statement instanceof TransactionStatement) {
-
                 /**
                  * @var TransactionStatement $statement
                  */
diff --git a/src/Statement.php b/src/Statement.php
@@ -109,7 +109,6 @@ public function build()
         $query = '';
 
         foreach (static::$CLAUSES as $clause) {
-
             /**
              * The name of the clause.
              *
@@ -190,7 +189,6 @@ public function parse(Parser $parser, TokensList $list)
         $parsedOptions = empty(static::$OPTIONS);
 
         for (; $list->idx < $list->count; ++$list->idx) {
-
             /**
              * Token parsed at this moment.
              *
@@ -247,7 +245,8 @@ public function parse(Parser $parser, TokensList $list)
             ) {
                 if (!empty($parsedClauses[$token->value])) {
                     $parser->error(
-                        __('This type of clause was previously parsed.'), $token
+                        __('This type of clause was previously parsed.'),
+                        $token
                     );
                     break;
                 }
diff --git a/src/Statements/AlterStatement.php b/src/Statements/AlterStatement.php
@@ -73,7 +73,9 @@ public function parse(Parser $parser, TokensList $list)
 
         // Parsing affected table.
         $this->table = Expression::parse(
-            $parser, $list, array(
+            $parser,
+            $list,
+            array(
             'noAlias' => true,
             'noBrackets' => true,
             )
@@ -94,7 +96,6 @@ public function parse(Parser $parser, TokensList $list)
         $state = 0;
 
         for (; $list->idx < $list->count; ++$list->idx) {
-
             /**
              * Token parsed at this moment.
              *
@@ -115,7 +116,7 @@ public function parse(Parser $parser, TokensList $list)
             if ($state === 0) {
                 $this->altered[] = AlterOperation::parse($parser, $list);
                 $state = 1;
-            } else if ($state === 1) {
+            } elseif ($state === 1) {
                 if (($token->type === Token::TYPE_OPERATOR) && ($token->value === ',')) {
                     $state = 0;
                 }
diff --git a/src/Statements/CreateStatement.php b/src/Statements/CreateStatement.php
@@ -395,7 +395,6 @@ public function parse(Parser $parser, TokensList $list)
              * Handles partitions.
              */
             for (; $list->idx < $list->count; ++$list->idx) {
-
                 /**
                  * Token parsed at this moment.
                  *
@@ -428,7 +427,6 @@ public function parse(Parser $parser, TokensList $list)
                     --$list->idx; // `getNextOfType` also advances one position.
                     $this->subpartitionsNum = $token->value;
                 } elseif (!empty($field)) {
-
                     /*
                      * Handling the content of `PARTITION BY` and `SUBPARTITION BY`.
                      */
@@ -499,7 +497,7 @@ public function parse(Parser $parser, TokensList $list)
                 $token = $list->tokens[$list->idx];
                 $this->body[] = $token;
             }
-        } else if ($this->options->has('VIEW')) {
+        } elseif ($this->options->has('VIEW')) {
             $token = $list->getNext(); // Skipping whitespaces and comments.
 
             // Parsing columns list.
@@ -518,7 +516,7 @@ public function parse(Parser $parser, TokensList $list)
                 }
                 $this->body[] = $token;
             }
-        } else if ($this->options->has('TRIGGER')) {
+        } elseif ($this->options->has('TRIGGER')) {
             // Parsing the time and the event.
             $this->entityOptions = OptionsArray::parse(
                 $parser,
diff --git a/src/Token.php b/src/Token.php
diff --git a/src/Utils/BufferedQuery.php b/src/Utils/BufferedQuery.php
diff --git a/src/Utils/Error.php b/src/Utils/Error.php
diff --git a/src/Utils/Formatter.php b/src/Utils/Formatter.php
diff --git a/src/common.php b/src/common.php
diff --git a/tests/Components/Array2dTest.php b/tests/Components/Array2dTest.php
diff --git a/tests/Lexer/LexerTest.php b/tests/Lexer/LexerTest.php
diff --git a/tests/Utils/BufferedQueryTest.php b/tests/Utils/BufferedQueryTest.php
diff --git a/tests/Utils/QueryTest.php b/tests/Utils/QueryTest.php
diff --git a/tools/ContextGenerator.php b/tools/ContextGenerator.php
diff --git a/tools/TestGenerator.php b/tools/TestGenerator.php

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,6 @@ public static function parse(Parser $parser, TokensList $list, array $options =`
`137`	`137`	`$state = 0;`
`138`	`138`
`139`	`139`	`for (; $list->idx < $list->count; ++$list->idx) {`
`140`		`-`
`141`	`140`	`/**`
`142`	`141`	`* Token parsed at this moment.`
`143`	`142`	`*`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,6 @@ public static function parse(Parser $parser, TokensList $list, array $options =`
`58`	`58`	`$state = 0;`
`59`	`59`
`60`	`60`	`for (; $list->idx < $list->count; ++$list->idx) {`
`61`		`-`
`62`	`61`	`/**`
`63`	`62`	`* Token parsed at this moment.`
`64`	`63`	`*`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,6 @@ public static function parse(Parser $parser, TokensList $list, array $options =`
`79`	`79`	`$state = 0;`
`80`	`80`
`81`	`81`	`for (; $list->idx < $list->count; ++$list->idx) {`
`82`		`-`
`83`	`82`	`/**`
`84`	`83`	`* Token parsed at this moment.`
`85`	`84`	`*`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,6 @@ public static function parse(Parser $parser, TokensList $list, array $options =`
`111`	`111`	`$betweenBefore = false;`
`112`	`112`
`113`	`113`	`for (; $list->idx < $list->count; ++$list->idx) {`
`114`		`-`
`115`	`114`	`/**`
`116`	`115`	`* Token parsed at this moment.`
`117`	`116`	`*`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,6 @@ public static function parse(Parser $parser, TokensList $list, array $options =`
`51`	`51`	`$state = 0;`
`52`	`52`
`53`	`53`	`for (; $list->idx < $list->count; ++$list->idx) {`
`54`		`-`
`55`	`54`	`/**`
`56`	`55`	`* Token parsed at this moment.`
`57`	`56`	`*`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,6 @@ public static function parse(Parser $parser, TokensList $list, array $options =`
`80`	`80`	`$state = 0;`
`81`	`81`
`82`	`82`	`for (; $list->idx < $list->count; ++$list->idx) {`
`83`		`-`
`84`	`83`	`/**`
`85`	`84`	`* Token parsed at this moment.`
`86`	`85`	`*`