phpmyadmin / sql-parser

src/Components/OptionsArray.php

Spacing +1 added lines, -1 removed lines

@@ -183,7 +183,7 @@
                         'value' => '',
                     );
                     $state = 1;
-                } elseif ($lastOption[1] === 'expr'  || $lastOption[1] === 'expr=') {
+                } elseif ($lastOption[1] === 'expr' || $lastOption[1] === 'expr=') {
                     // This is a keyword that is followed by an expression.
                     // The expression is used by the specialized parser.
 

src/Utils/Formatter.php

Spacing +8 added lines, -8 removed lines

@@ -350,7 +350,7 @@ 
                     // pieces only if the clause is not inlined or this fragment
                     // is between brackets that are on new line.
                     if (((empty(self::$INLINE_CLAUSES[$lastClause]))
-                        && ! $shortGroup
+                        && !$shortGroup
                         && ($this->options['parts_newline']))
                         || (end($blocksLineEndings) === true)
                     ) {
@@ -424,7 +424,7 @@ 
         }
 
         if ($this->options['type'] === 'cli') {
-            return $ret . "\x1b[0m";
+            return $ret."\x1b[0m";
         }
 
         return $ret;
@@ -436,9 +436,9 @@ 
             array(
                 "\x00", "\x01", "\x02", "\x03", "\x04",
                 "\x05", "\x06", "\x07", "\x08", "\x09", "\x0A",
-                "\x0B","\x0C","\x0D", "\x0E", "\x0F", "\x10", "\x11",
-                "\x12","\x13","\x14","\x15", "\x16", "\x17", "\x18",
-                "\x19","\x1A","\x1B","\x1C","\x1D", "\x1E", "\x1F"
+                "\x0B", "\x0C", "\x0D", "\x0E", "\x0F", "\x10", "\x11",
+                "\x12", "\x13", "\x14", "\x15", "\x16", "\x17", "\x18",
+                "\x19", "\x1A", "\x1B", "\x1C", "\x1D", "\x1E", "\x1F"
             ),
             array(
                 '\x00', '\x01', '\x02', '\x03', '\x04',
@@ -474,9 +474,9 @@ 
 
                 // Formatting HTML.
                 if ($this->options['type'] === 'html') {
-                    return '<span ' . $format['html'] . '>' . htmlspecialchars($text, ENT_NOQUOTES) . '</span>';
+                    return '<span '.$format['html'].'>'.htmlspecialchars($text, ENT_NOQUOTES).'</span>';
                 } elseif ($this->options['type'] === 'cli') {
-                    return $format['cli'] . $this->escapeConsole($text);
+                    return $format['cli'].$this->escapeConsole($text);
                 }
 
                 break;
@@ -484,7 +484,7 @@ 
         }
 
         if ($this->options['type'] === 'cli') {
-            return "\x1b[39m" . $this->escapeConsole($text);
+            return "\x1b[39m".$this->escapeConsole($text);
         } elseif ($this->options['type'] === 'html') {
             return htmlspecialchars($text, ENT_NOQUOTES);
         }

src/Statements/DeleteStatement.php

Braces +1 added lines, -1 removed lines

@@ -302,7 +302,7 @@
                     ++$list->idx; // Skip 'ORDER  BY'
                     $this->order = OrderKeyword::parse($parser, $list);
                     $state = 5;
-                }  elseif ($token->type === Token::TYPE_KEYWORD
+                } elseif ($token->type === Token::TYPE_KEYWORD
                     && $token->value === 'LIMIT'
                 ) {
                     ++$list->idx; // Skip 'LIMIT'

Spacing +15 added lines, -15 removed lines

@@ -71,15 +71,15 @@ 
      * @var array
      */
     public static $CLAUSES = array(
-        'DELETE'                        => array('DELETE',      2),
+        'DELETE'                        => array('DELETE', 2),
         // Used for options.
-        '_OPTIONS'                      => array('_OPTIONS',    1),
-        'FROM'                          => array('FROM',        3),
-        'PARTITION'                     => array('PARTITION',   3),
-        'USING'                         => array('USING',       3),
-        'WHERE'                         => array('WHERE',       3),
-        'ORDER BY'                      => array('ORDER BY',    3),
-        'LIMIT'                         => array('LIMIT',       3),
+        '_OPTIONS'                      => array('_OPTIONS', 1),
+        'FROM'                          => array('FROM', 3),
+        'PARTITION'                     => array('PARTITION', 3),
+        'USING'                         => array('USING', 3),
+        'WHERE'                         => array('WHERE', 3),
+        'ORDER BY'                      => array('ORDER BY', 3),
+        'LIMIT'                         => array('LIMIT', 3),
     );
 
     /**
@@ -137,25 +137,25 @@ 
      */
     public function build()
     {
-        $ret = 'DELETE ' . OptionsArray::build($this->options);
+        $ret = 'DELETE '.OptionsArray::build($this->options);
 
         if ($this->columns != NULL && count($this->columns) > 0) {
-            $ret .= ' ' . ExpressionArray::build($this->columns);
+            $ret .= ' '.ExpressionArray::build($this->columns);
         }
         if ($this->from != NULL && count($this->from) > 0) {
-            $ret .= ' FROM ' . ExpressionArray::build($this->from);
+            $ret .= ' FROM '.ExpressionArray::build($this->from);
         }
         if ($this->using != NULL && count($this->using) > 0) {
-            $ret .= ' USING ' . ExpressionArray::build($this->using);
+            $ret .= ' USING '.ExpressionArray::build($this->using);
         }
         if ($this->where != NULL && count($this->where) > 0) {
-            $ret .= ' WHERE ' . Condition::build($this->where);
+            $ret .= ' WHERE '.Condition::build($this->where);
         }
         if ($this->order != NULL && count($this->order) > 0) {
-            $ret .= ' ORDER BY ' . ExpressionArray::build($this->order);
+            $ret .= ' ORDER BY '.ExpressionArray::build($this->order);
         }
         if ($this->limit != NULL && count($this->limit) > 0) {
-            $ret .= ' LIMIT ' . Limit::build($this->limit);
+            $ret .= ' LIMIT '.Limit::build($this->limit);
         }
 
         return $ret;

src/Components/Limit.php

Spacing +1 added lines, -1 removed lines

@@ -127,6 +127,6 @@
      */
     public static function build($component, array $options = array())
     {
-        return $component->offset . ', ' . $component->rowCount;
+        return $component->offset.', '.$component->rowCount;
     }
 }

src/Components/CaseExpression.php

Doc Comments +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
      * @param Parser     $parser  The parser that serves as context.
      * @param TokensList $list    The list of tokens that are being parsed.
      *
-     * @return Expression
+     * @return CaseExpression
      */
     public static function parse(Parser $parser, TokensList $list)
     {

Spacing +6 added lines, -6 removed lines

@@ -254,14 +254,14 @@ 
         $ret = 'CASE ';
         if (isset($component->value)) {
             // Syntax type 0
-            $ret .= $component->value . ' ';
+            $ret .= $component->value.' ';
             for (
                 $i = 0;
                 $i < count($component->compare_values) && $i < count($component->results);
                 $i++
             ) {
-                $ret .= 'WHEN ' . $component->compare_values[$i] . ' ';
-                $ret .= 'THEN ' . $component->results[$i] . ' ';
+                $ret .= 'WHEN '.$component->compare_values[$i].' ';
+                $ret .= 'THEN '.$component->results[$i].' ';
             }
         } else {
             // Syntax type 1
@@ -270,12 +270,12 @@ 
                 $i < count($component->conditions) && $i < count($component->results);
                 $i++
             ) {
-                $ret .= 'WHEN ' . Condition::build($component->conditions[$i]) . ' ';
-                $ret .= 'THEN ' . $component->results[$i] . ' ';
+                $ret .= 'WHEN '.Condition::build($component->conditions[$i]).' ';
+                $ret .= 'THEN '.$component->results[$i].' ';
             }
         }
         if (isset($component->else_result)) {
-            $ret .= 'ELSE ' . $component->else_result . ' ';
+            $ret .= 'ELSE '.$component->else_result.' ';
         }
         $ret .= 'END';
 

tools/ContextGenerator.php

Spacing +50 added lines, -50 removed lines

@@ -52,46 +52,46 @@ 
      * @var string
      */
     const TEMPLATE =
-        '<?php'                                                                             . "\n" .
-        ''                                                                                  . "\n" .
-        '/**'                                                                               . "\n" .
-        ' * Context for %1$s.'                                                              . "\n" .
-        ' *'                                                                                . "\n" .
-        ' * This file was auto-generated.'                                                  . "\n" .
-        ' *'                                                                                . "\n" .
-        ' * @package    SqlParser'                                                          . "\n" .
-        ' * @subpackage Contexts'                                                           . "\n" .
-        ' * @link       %3$s'                                                               . "\n" .
-        ' */'                                                                               . "\n" .
-        'namespace SqlParser\\Contexts;'                                                    . "\n" .
-        ''                                                                                  . "\n" .
-        'use SqlParser\\Context;'                                                           . "\n" .
-        ''                                                                                  . "\n" .
-        '/**'                                                                               . "\n" .
-        ' * Context for %1$s.'                                                              . "\n" .
-        ' *'                                                                                . "\n" .
-        ' * @category   Contexts'                                                           . "\n" .
-        ' * @package    SqlParser'                                                          . "\n" .
-        ' * @subpackage Contexts'                                                           . "\n" .
-        ' * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+'                  . "\n" .
-        ' */'                                                                               . "\n" .
-        'class %2$s extends Context'                                                        . "\n" .
-        '{'                                                                                 . "\n" .
-        ''                                                                                  . "\n" .
-        '    /**'                                                                           . "\n" .
-        '     * List of keywords.'                                                          . "\n" .
-        '     *'                                                                            . "\n" .
-        '     * The value associated to each keyword represents its flags.'                 . "\n" .
-        '     *'                                                                            . "\n" .
-        '     * @see Token::FLAG_KEYWORD_*'                                                 . "\n" .
-        '     *'                                                                            . "\n" .
-        '     * @var array'                                                                 . "\n" .
-        '     */'                                                                           . "\n" .
-        '    public static $KEYWORDS = array('                                              . "\n" .
-        ''                                                                                  . "\n" .
-        '%4$s'                                                                              .
-        '    );'                                                                            . "\n" .
-        '}'                                                                                 . "\n";
+        '<?php'."\n".
+        ''."\n".
+        '/**'."\n".
+        ' * Context for %1$s.'."\n".
+        ' *'."\n".
+        ' * This file was auto-generated.'."\n".
+        ' *'."\n".
+        ' * @package    SqlParser'."\n".
+        ' * @subpackage Contexts'."\n".
+        ' * @link       %3$s'."\n".
+        ' */'."\n".
+        'namespace SqlParser\\Contexts;'."\n".
+        ''."\n".
+        'use SqlParser\\Context;'."\n".
+        ''."\n".
+        '/**'."\n".
+        ' * Context for %1$s.'."\n".
+        ' *'."\n".
+        ' * @category   Contexts'."\n".
+        ' * @package    SqlParser'."\n".
+        ' * @subpackage Contexts'."\n".
+        ' * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+'."\n".
+        ' */'."\n".
+        'class %2$s extends Context'."\n".
+        '{'."\n".
+        ''."\n".
+        '    /**'."\n".
+        '     * List of keywords.'."\n".
+        '     *'."\n".
+        '     * The value associated to each keyword represents its flags.'."\n".
+        '     *'."\n".
+        '     * @see Token::FLAG_KEYWORD_*'."\n".
+        '     *'."\n".
+        '     * @var array'."\n".
+        '     */'."\n".
+        '    public static $KEYWORDS = array('."\n".
+        ''."\n".
+        '%4$s'.
+        '    );'."\n".
+        '}'."\n";
 
     /**
      * Sorts an array of words.
@@ -196,7 +196,7 @@ 
                     if ($i == 0) {
                         $ret .= str_repeat(' ', $spaces);
                     }
-                    $ret .= "'" . $word . "' => " . $type . ', ';
+                    $ret .= "'".$word."' => ".$type.', ';
                     if (++$i == $count) {
                         $ret .= "\n";
                         $i = 0;
@@ -257,7 +257,7 @@ 
          *
          * @var string
          */
-        $directory = dirname($input) . '/';
+        $directory = dirname($input).'/';
 
         /**
          * The name of the file that contains the context.
@@ -278,7 +278,7 @@ 
          *
          * @var string
          */
-        $class = 'Context' . $name;
+        $class = 'Context'.$name;
 
         /**
          * The formatted name of this context.
@@ -286,13 +286,13 @@ 
          * @var string
          */
         $formattedName = str_replace(
-            array('Context', 'MySql',  '00', '0'),
-            array('',        'MySQL ', '',   '.'),
+            array('Context', 'MySql', '00', '0'),
+            array('', 'MySQL ', '', '.'),
             $class
         );
 
         file_put_contents(
-            $output . '/' . $class . '.php',
+            $output.'/'.$class.'.php',
             static::generate(
                 array(
                     'name'      => $formattedName,
@@ -300,9 +300,9 @@ 
                     'link'      => static::$LINKS[$name],
                     'keywords'  => static::readWords(
                         array(
-                            $directory . '_common.txt',
-                            $directory . '_functions' . $file,
-                            $directory . $file
+                            $directory.'_common.txt',
+                            $directory.'_functions'.$file,
+                            $directory.$file
                         )
                     ),
                 )
@@ -330,7 +330,7 @@ 
 
             // Building the context.
             sprintf("Building context for %s...\n", $file);
-            static::build($input . '/' . $file, $output);
+            static::build($input.'/'.$file, $output);
         }
     }
 }

src/Components/JoinKeyword.php

Spacing +3 added lines, -3 removed lines

@@ -183,11 +183,11 @@
     {
         $ret = array();
         foreach ($component as $c) {
-            $ret[] = array_search($c->type, static::$JOINS) . ' ' . $c->expr
+            $ret[] = array_search($c->type, static::$JOINS).' '.$c->expr
                 . (!empty($c->on)
-                    ? ' ON ' . Condition::build($c->on) : '')
+                    ? ' ON '.Condition::build($c->on) : '')
                 . (!empty($c->using)
-                    ? ' USING ' . ArrayObj::build($c->using) : '');
+                    ? ' USING '.ArrayObj::build($c->using) : '');
         }
         return implode(' ', $ret);
     }

src/Components/IntoKeyword.php

Spacing +3 added lines, -3 removed lines

@@ -138,10 +138,10 @@
     {
         if ($component->dest instanceof Expression) {
             $columns = !empty($component->columns) ?
-                '(`' . implode('`, `', $component->columns) . '`)' : '';
-            return $component->dest . $columns;
+                '(`'.implode('`, `', $component->columns).'`)' : '';
+            return $component->dest.$columns;
         } else {
-            return 'OUTFILE "' . $component->dest . '"';
+            return 'OUTFILE "'.$component->dest.'"';
         }
     }
 }
\ No newline at end of file

src/Token.php

Spacing +34 added lines, -34 removed lines

@@ -29,14 +29,14 @@ 
      *
      * @var int
      */
-    const TYPE_NONE                     =  0;
+    const TYPE_NONE = 0;
 
     /**
      * SQL specific keywords: SELECT, UPDATE, INSERT, etc.
      *
      * @var int
      */
-    const TYPE_KEYWORD                  =  1;
+    const TYPE_KEYWORD = 1;
 
     /**
      * Any type of legal operator.
@@ -50,14 +50,14 @@ 
      *
      * @var int
      */
-    const TYPE_OPERATOR                 =  2;
+    const TYPE_OPERATOR = 2;
 
     /**
      * Spaces, tabs, new lines, etc.
      *
      * @var int
      */
-    const TYPE_WHITESPACE               =  3;
+    const TYPE_WHITESPACE = 3;
 
     /**
      * Any type of legal comment.
@@ -79,21 +79,21 @@ 
      *
      * @var int
      */
-    const TYPE_COMMENT                  =  4;
+    const TYPE_COMMENT = 4;
 
     /**
      * Boolean values: true or false.
      *
      * @var int
      */
-    const TYPE_BOOL                     =  5;
+    const TYPE_BOOL = 5;
 
     /**
      * Numbers: 4, 0x8, 15.16, 23e42, etc.
      *
      * @var int
      */
-    const TYPE_NUMBER                   =  6;
+    const TYPE_NUMBER = 6;
 
     /**
      * Literal strings: 'string', "test".
@@ -101,7 +101,7 @@ 
      *
      * @var int
      */
-    const TYPE_STRING                   =  7;
+    const TYPE_STRING = 7;
 
     /**
      * Database, table names, variables, etc.
@@ -109,7 +109,7 @@ 
      *
      * @var int
      */
-    const TYPE_SYMBOL                   =  8;
+    const TYPE_SYMBOL = 8;
 
     /**
      * Delimits an unknown string.
@@ -117,7 +117,7 @@ 
      *
      * @var int
      */
-    const TYPE_DELIMITER                =  9;
+    const TYPE_DELIMITER = 9;
 
     /**
      * Labels in LOOP statement, ITERATE statement etc.
@@ -129,46 +129,46 @@ 
      *
      * @var int
      */
-    const TYPE_LABEL                =  10;
+    const TYPE_LABEL = 10;
 
     // Flags that describe the tokens in more detail.
     // All keywords must have flag 1 so `Context::isKeyword` method doesn't
     // require strict comparison.
-    const FLAG_KEYWORD_RESERVED         =  2;
-    const FLAG_KEYWORD_COMPOSED         =  4;
-    const FLAG_KEYWORD_DATA_TYPE        =  8;
+    const FLAG_KEYWORD_RESERVED         = 2;
+    const FLAG_KEYWORD_COMPOSED         = 4;
+    const FLAG_KEYWORD_DATA_TYPE        = 8;
     const FLAG_KEYWORD_KEY              = 16;
     const FLAG_KEYWORD_FUNCTION         = 32;
 
     // Numbers related flags.
-    const FLAG_NUMBER_HEX               =  1;
-    const FLAG_NUMBER_FLOAT             =  2;
-    const FLAG_NUMBER_APPROXIMATE       =  4;
-    const FLAG_NUMBER_NEGATIVE          =  8;
+    const FLAG_NUMBER_HEX               = 1;
+    const FLAG_NUMBER_FLOAT             = 2;
+    const FLAG_NUMBER_APPROXIMATE       = 4;
+    const FLAG_NUMBER_NEGATIVE          = 8;
     const FLAG_NUMBER_BINARY            = 16;
 
     // Strings related flags.
-    const FLAG_STRING_SINGLE_QUOTES     =  1;
-    const FLAG_STRING_DOUBLE_QUOTES     =  2;
+    const FLAG_STRING_SINGLE_QUOTES     = 1;
+    const FLAG_STRING_DOUBLE_QUOTES     = 2;
 
     // Comments related flags.
-    const FLAG_COMMENT_BASH             =  1;
-    const FLAG_COMMENT_C                =  2;
-    const FLAG_COMMENT_SQL              =  4;
-    const FLAG_COMMENT_MYSQL_CMD        =  8;
+    const FLAG_COMMENT_BASH             = 1;
+    const FLAG_COMMENT_C                = 2;
+    const FLAG_COMMENT_SQL              = 4;
+    const FLAG_COMMENT_MYSQL_CMD        = 8;
 
     // Operators related flags.
-    const FLAG_OPERATOR_ARITHMETIC      =  1;
-    const FLAG_OPERATOR_LOGICAL         =  2;
-    const FLAG_OPERATOR_BITWISE         =  4;
-    const FLAG_OPERATOR_ASSIGNMENT      =  8;
+    const FLAG_OPERATOR_ARITHMETIC      = 1;
+    const FLAG_OPERATOR_LOGICAL         = 2;
+    const FLAG_OPERATOR_BITWISE         = 4;
+    const FLAG_OPERATOR_ASSIGNMENT      = 8;
     const FLAG_OPERATOR_SQL             = 16;
 
     // Symbols related flags.
-    const FLAG_SYMBOL_VARIABLE          =  1;
-    const FLAG_SYMBOL_BACKTICK          =  2;
-    const FLAG_SYMBOL_USER              =  4;
-    const FLAG_SYMBOL_SYSTEM            =  8;
+    const FLAG_SYMBOL_VARIABLE          = 1;
+    const FLAG_SYMBOL_BACKTICK          = 2;
+    const FLAG_SYMBOL_USER              = 4;
+    const FLAG_SYMBOL_SYSTEM            = 8;
 
     /**
      * The token it its raw string representation.
@@ -261,7 +261,7 @@ 
                 return $ret;
             case Token::TYPE_STRING:
                 $quote = $this->token[0];
-                $str = str_replace($quote . $quote, $quote, $this->token);
+                $str = str_replace($quote.$quote, $quote, $this->token);
                 return mb_substr($str, 1, -1, 'UTF-8'); // trims quotes
             case Token::TYPE_SYMBOL:
                 $str = $this->token;
@@ -279,7 +279,7 @@ 
                 || ($str[0] === '"') || ($str[0] === '\''))
                 ) {
                     $quote = $str[0];
-                    $str = str_replace($quote . $quote, $quote, $str);
+                    $str = str_replace($quote.$quote, $quote, $str);
                     $str = mb_substr($str, 1, -1, 'UTF-8');
                 }
                 return $str;