phpmyadmin / sql-parser

src/Statements/InsertStatement.php

Spacing +6 added lines, -6 removed lines

@@ -115,19 +115,19 @@
      */
     public function build()
     {
-        $ret = 'INSERT ' . $this->options
-            . ' INTO ' . $this->into;
+        $ret = 'INSERT '.$this->options
+            . ' INTO '.$this->into;
 
         if ($this->values != NULL && count($this->values) > 0) {
-            $ret .= ' VALUES ' . Array2d::build($this->values);
+            $ret .= ' VALUES '.Array2d::build($this->values);
         } elseif ($this->set != NULL && count($this->set) > 0) {
-            $ret .= ' SET ' . SetOperation::build($this->set);
+            $ret .= ' SET '.SetOperation::build($this->set);
         } elseif ($this->select != NULL && count($this->select) > 0) {
-            $ret .= ' ' . $this->select->build();
+            $ret .= ' '.$this->select->build();
         }
 
         if ($this->onDuplicateSet != NULL && count($this->onDuplicateSet) > 0) {
-            $ret .= ' ON DUPLICATE KEY UPDATE ' . SetOperation::build($this->onDuplicateSet);
+            $ret .= ' ON DUPLICATE KEY UPDATE '.SetOperation::build($this->onDuplicateSet);
         }
 
         return $ret;

src/Statements/ReplaceStatement.php

Spacing +5 added lines, -5 removed lines

@@ -93,15 +93,15 @@
      */
     public function build()
     {
-        $ret = 'REPLACE ' . $this->options
-            . ' INTO ' . $this->into;
+        $ret = 'REPLACE '.$this->options
+            . ' INTO '.$this->into;
 
         if ($this->values != NULL && count($this->values) > 0) {
-            $ret .= ' VALUES ' . Array2d::build($this->values);
+            $ret .= ' VALUES '.Array2d::build($this->values);
         } elseif ($this->set != NULL && count($this->set) > 0) {
-            $ret .= ' SET ' . SetOperation::build($this->set);
+            $ret .= ' SET '.SetOperation::build($this->set);
         } elseif ($this->select != NULL && count($this->select) > 0) {
-            $ret .= ' ' . $this->select->build();
+            $ret .= ' '.$this->select->build();
         }
 
         return $ret;

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/Statements/SelectStatement.php

Spacing +22 added lines, -22 removed lines

@@ -82,30 +82,30 @@
      * @var array
      */
     public static $CLAUSES = array(
-        'SELECT'                        => array('SELECT',              2),
+        'SELECT'                        => array('SELECT', 2),
         // Used for options.
-        '_OPTIONS'                      => array('_OPTIONS',            1),
+        '_OPTIONS'                      => array('_OPTIONS', 1),
         // Used for selected expressions.
-        '_SELECT'                       => array('SELECT',              1),
-        'INTO'                          => array('INTO',                3),
-        'FROM'                          => array('FROM',                3),
-        'PARTITION'                     => array('PARTITION',           3),
-
-        'JOIN'                          => array('JOIN',                1),
-        'FULL JOIN'                     => array('FULL JOIN',           1),
-        'INNER JOIN'                    => array('INNER JOIN',          1),
-        'LEFT JOIN'                     => array('LEFT JOIN',           1),
-        'LEFT OUTER JOIN'               => array('LEFT OUTER JOIN',     1),
-        'RIGHT JOIN'                    => array('RIGHT JOIN',          1),
-        'RIGHT OUTER JOIN'              => array('RIGHT OUTER JOIN',    1),
-
-        'WHERE'                         => array('WHERE',               3),
-        'GROUP BY'                      => array('GROUP BY',            3),
-        'HAVING'                        => array('HAVING',              3),
-        'ORDER BY'                      => array('ORDER BY',            3),
-        'LIMIT'                         => array('LIMIT',               3),
-        'PROCEDURE'                     => array('PROCEDURE',           3),
-        'UNION'                         => array('UNION',               1),
+        '_SELECT'                       => array('SELECT', 1),
+        'INTO'                          => array('INTO', 3),
+        'FROM'                          => array('FROM', 3),
+        'PARTITION'                     => array('PARTITION', 3),
+
+        'JOIN'                          => array('JOIN', 1),
+        'FULL JOIN'                     => array('FULL JOIN', 1),
+        'INNER JOIN'                    => array('INNER JOIN', 1),
+        'LEFT JOIN'                     => array('LEFT JOIN', 1),
+        'LEFT OUTER JOIN'               => array('LEFT OUTER JOIN', 1),
+        'RIGHT JOIN'                    => array('RIGHT JOIN', 1),
+        'RIGHT OUTER JOIN'              => array('RIGHT OUTER JOIN', 1),
+
+        'WHERE'                         => array('WHERE', 3),
+        'GROUP BY'                      => array('GROUP BY', 3),
+        'HAVING'                        => array('HAVING', 3),
+        'ORDER BY'                      => array('ORDER BY', 3),
+        'LIMIT'                         => array('LIMIT', 3),
+        'PROCEDURE'                     => array('PROCEDURE', 3),
+        'UNION'                         => array('UNION', 1),
         // These are available only when `UNION` is present.
         // 'ORDER BY'                      => array('ORDER BY',    3),
         // 'LIMIT'                         => array('LIMIT',       3),