Completed
Pull Request — master (#77)
by Deven
158:34 queued 93:34
created
src/Statements/NotImplementedStatement.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@
 block discarded – undo
40 40
     public function build()
41 41
     {
42 42
         // Building the parsed part of the query (if any).
43
-        $query = parent::build() . ' ';
43
+        $query = parent::build().' ';
44 44
 
45 45
         // Rebuilding the unknown part from tokens.
46 46
         foreach ($this->unknown as $token) {
Please login to merge, or discard this patch.
src/Statements/TransactionStatement.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -30,14 +30,14 @@  discard block
 block discarded – undo
30 30
      *
31 31
      * @var int
32 32
      */
33
-    const TYPE_BEGIN                    = 1;
33
+    const TYPE_BEGIN = 1;
34 34
 
35 35
     /**
36 36
      * COMMIT and ROLLBACK
37 37
      *
38 38
      * @var int
39 39
      */
40
-    const TYPE_END                      = 2;
40
+    const TYPE_END = 2;
41 41
 
42 42
     /**
43 43
      * The type of this query.
@@ -111,9 +111,9 @@  discard block
 block discarded – undo
111 111
                 /**
112 112
                  * @var SelectStatement $statement
113 113
                  */
114
-                $ret .= ';' . $statement->build();
114
+                $ret .= ';'.$statement->build();
115 115
             }
116
-            $ret .= ';' . $this->end->build();
116
+            $ret .= ';'.$this->end->build();
117 117
         }
118 118
         return $ret;
119 119
     }
Please login to merge, or discard this patch.
src/Statement.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -175,12 +175,12 @@
 block discarded – undo
175 175
 
176 176
             // Checking if the name of the clause should be added.
177 177
             if ($type & 2) {
178
-                $query .= $name . ' ';
178
+                $query .= $name.' ';
179 179
             }
180 180
 
181 181
             // Checking if the result of the builder should be added.
182 182
             if ($type & 1) {
183
-                $query .= $class::build($this->$field) . ' ';
183
+                $query .= $class::build($this->$field).' ';
184 184
             }
185 185
         }
186 186
 
Please login to merge, or discard this patch.
tools/ContextGenerator.php 1 patch
Spacing   +51 added lines, -51 removed lines patch added patch discarded remove patch
@@ -53,47 +53,47 @@  discard block
 block discarded – undo
53 53
      * @var string
54 54
      */
55 55
     const TEMPLATE =
56
-        '<?php'                                                                             . "\n" .
57
-        ''                                                                                  . "\n" .
58
-        '/**'                                                                               . "\n" .
59
-        ' * Context for %1$s.'                                                              . "\n" .
60
-        ' *'                                                                                . "\n" .
61
-        ' * This file was auto-generated.'                                                  . "\n" .
62
-        ' *'                                                                                . "\n" .
63
-        ' * @package    SqlParser'                                                          . "\n" .
64
-        ' * @subpackage Contexts'                                                           . "\n" .
65
-        ' * @link       %3$s'                                                               . "\n" .
66
-        ' */'                                                                               . "\n" .
67
-        'namespace SqlParser\\Contexts;'                                                    . "\n" .
68
-        ''                                                                                  . "\n" .
69
-        'use SqlParser\\Context;'                                                           . "\n" .
70
-        ''                                                                                  . "\n" .
71
-        '/**'                                                                               . "\n" .
72
-        ' * Context for %1$s.'                                                              . "\n" .
73
-        ' *'                                                                                . "\n" .
74
-        ' * @category   Contexts'                                                           . "\n" .
75
-        ' * @package    SqlParser'                                                          . "\n" .
76
-        ' * @subpackage Contexts'                                                           . "\n" .
77
-        ' * @author     Dan Ungureanu <[email protected]>'                                 . "\n" .
78
-        ' * @license    http://opensource.org/licenses/GPL-2.0 GNU Public License'          . "\n" .
79
-        ' */'                                                                               . "\n" .
80
-        'class %2$s extends Context'                                                        . "\n" .
81
-        '{'                                                                                 . "\n" .
82
-        ''                                                                                  . "\n" .
83
-        '    /**'                                                                           . "\n" .
84
-        '     * List of keywords.'                                                          . "\n" .
85
-        '     *'                                                                            . "\n" .
86
-        '     * The value associated to each keyword represents its flags.'                 . "\n" .
87
-        '     *'                                                                            . "\n" .
88
-        '     * @see Token::FLAG_KEYWORD_*'                                                 . "\n" .
89
-        '     *'                                                                            . "\n" .
90
-        '     * @var array'                                                                 . "\n" .
91
-        '     */'                                                                           . "\n" .
92
-        '    public static $KEYWORDS = array('                                              . "\n" .
93
-        ''                                                                                  . "\n" .
94
-        '%4$s'                                                                              .
95
-        '    );'                                                                            . "\n" .
96
-        '}'                                                                                 . "\n";
56
+        '<?php'."\n".
57
+        ''."\n".
58
+        '/**'."\n".
59
+        ' * Context for %1$s.'."\n".
60
+        ' *'."\n".
61
+        ' * This file was auto-generated.'."\n".
62
+        ' *'."\n".
63
+        ' * @package    SqlParser'."\n".
64
+        ' * @subpackage Contexts'."\n".
65
+        ' * @link       %3$s'."\n".
66
+        ' */'."\n".
67
+        'namespace SqlParser\\Contexts;'."\n".
68
+        ''."\n".
69
+        'use SqlParser\\Context;'."\n".
70
+        ''."\n".
71
+        '/**'."\n".
72
+        ' * Context for %1$s.'."\n".
73
+        ' *'."\n".
74
+        ' * @category   Contexts'."\n".
75
+        ' * @package    SqlParser'."\n".
76
+        ' * @subpackage Contexts'."\n".
77
+        ' * @author     Dan Ungureanu <[email protected]>'."\n".
78
+        ' * @license    http://opensource.org/licenses/GPL-2.0 GNU Public License'."\n".
79
+        ' */'."\n".
80
+        'class %2$s extends Context'."\n".
81
+        '{'."\n".
82
+        ''."\n".
83
+        '    /**'."\n".
84
+        '     * List of keywords.'."\n".
85
+        '     *'."\n".
86
+        '     * The value associated to each keyword represents its flags.'."\n".
87
+        '     *'."\n".
88
+        '     * @see Token::FLAG_KEYWORD_*'."\n".
89
+        '     *'."\n".
90
+        '     * @var array'."\n".
91
+        '     */'."\n".
92
+        '    public static $KEYWORDS = array('."\n".
93
+        ''."\n".
94
+        '%4$s'.
95
+        '    );'."\n".
96
+        '}'."\n";
97 97
 
98 98
     /**
99 99
      * Sorts an array of words.
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
                     if ($i == 0) {
199 199
                         $ret .= str_repeat(' ', $spaces);
200 200
                     }
201
-                    $ret .= "'" . $word . "' => " . $type . ', ';
201
+                    $ret .= "'".$word."' => ".$type.', ';
202 202
                     if (++$i == $count) {
203 203
                         $ret .= "\n";
204 204
                         $i = 0;
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
259 259
          *
260 260
          * @var string
261 261
          */
262
-        $directory = dirname($input) . '/';
262
+        $directory = dirname($input).'/';
263 263
 
264 264
         /**
265 265
          * The name of the file that contains the context.
@@ -280,7 +280,7 @@  discard block
 block discarded – undo
280 280
          *
281 281
          * @var string
282 282
          */
283
-        $class = 'Context' . $name;
283
+        $class = 'Context'.$name;
284 284
 
285 285
         /**
286 286
          * The formatted name of this context.
@@ -288,13 +288,13 @@  discard block
 block discarded – undo
288 288
          * @var string
289 289
          */
290 290
         $formattedName = str_replace(
291
-            array('Context', 'MySql',  '00', '0'),
292
-            array('',        'MySQL ', '',   '.'),
291
+            array('Context', 'MySql', '00', '0'),
292
+            array('', 'MySQL ', '', '.'),
293 293
             $class
294 294
         );
295 295
 
296 296
         file_put_contents(
297
-            $output . '/' . $class . '.php',
297
+            $output.'/'.$class.'.php',
298 298
             static::generate(
299 299
                 array(
300 300
                     'name'      => $formattedName,
@@ -302,9 +302,9 @@  discard block
 block discarded – undo
302 302
                     'link'      => static::$LINKS[$name],
303 303
                     'keywords'  => static::readWords(
304 304
                         array(
305
-                            $directory . '_common.txt',
306
-                            $directory . '_functions' . $file,
307
-                            $directory . $file
305
+                            $directory.'_common.txt',
306
+                            $directory.'_functions'.$file,
307
+                            $directory.$file
308 308
                         )
309 309
                     ),
310 310
                 )
@@ -332,7 +332,7 @@  discard block
 block discarded – undo
332 332
 
333 333
             // Building the context.
334 334
             sprintf("Building context for %s...\n", $file);
335
-            static::build($input . '/' . $file, $output);
335
+            static::build($input.'/'.$file, $output);
336 336
         }
337 337
     }
338 338
 }
Please login to merge, or discard this patch.
tools/TestGenerator.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -152,9 +152,9 @@  discard block
 block discarded – undo
152 152
             }
153 153
 
154 154
             // Appending the filename to directories.
155
-            $inputFile = $input . '/' . $file;
156
-            $outputFile = $output . '/' . $file;
157
-            $debugFile = ($debug !== null) ? $debug . '/' . $file : null;
155
+            $inputFile = $input.'/'.$file;
156
+            $outputFile = $output.'/'.$file;
157
+            $debugFile = ($debug !== null) ? $debug.'/'.$file : null;
158 158
 
159 159
             if (is_dir($inputFile)) {
160 160
                 // Creating required directories to maintain the structure.
@@ -171,9 +171,9 @@  discard block
 block discarded – undo
171 171
             } elseif (substr($inputFile, -3) === '.in') {
172 172
                 // Generating file names by replacing `.in` with `.out` and
173 173
                 // `.debug`.
174
-                $outputFile = substr($outputFile, 0, -3) . '.out';
174
+                $outputFile = substr($outputFile, 0, -3).'.out';
175 175
                 if ($debug !== null) {
176
-                    $debugFile = substr($debugFile, 0, -3) . '.debug';
176
+                    $debugFile = substr($debugFile, 0, -3).'.debug';
177 177
                 }
178 178
 
179 179
                 // Building the test.
Please login to merge, or discard this patch.
src/Components/Expression.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -228,7 +228,7 @@  discard block
 block discarded – undo
228 228
                     $ret->subquery = $token->value;
229 229
                 } elseif (($token->flags & Token::FLAG_KEYWORD_FUNCTION)
230 230
                     && (empty($options['parseField'])
231
-                    && ! $alias)
231
+                    && !$alias)
232 232
                 ) {
233 233
                     $isExpr = true;
234 234
                 } elseif (($token->flags & Token::FLAG_KEYWORD_RESERVED)
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
                         continue;
256 256
                     }
257 257
                     $isExpr = true;
258
-                } elseif ($brackets === 0 && count($ret->expr) > 0 && ! $alias) {
258
+                } elseif ($brackets === 0 && count($ret->expr) > 0 && !$alias) {
259 259
                     /* End of expression */
260 260
                     break;
261 261
                 }
@@ -433,7 +433,7 @@  discard block
 block discarded – undo
433 433
             }
434 434
 
435 435
             if (!empty($component->alias)) {
436
-                $ret .= ' AS ' . Context::escape($component->alias);
436
+                $ret .= ' AS '.Context::escape($component->alias);
437 437
             }
438 438
 
439 439
             return $ret;
Please login to merge, or discard this patch.
src/Statements/CreateStatement.php 2 patches
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -11,7 +11,6 @@
 block discarded – undo
11 11
 use SqlParser\Parser;
12 12
 use SqlParser\Statement;
13 13
 use SqlParser\Token;
14
-use SqlParser\Context;
15 14
 use SqlParser\TokensList;
16 15
 use SqlParser\Components\ArrayObj;
17 16
 use SqlParser\Components\DataType;
Please login to merge, or discard this patch.
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -277,80 +277,80 @@
 block discarded – undo
277 277
         $fields = '';
278 278
         if (!empty($this->fields)) {
279 279
             if (is_array($this->fields)) {
280
-                $fields = CreateDefinition::build($this->fields) . ' ';
280
+                $fields = CreateDefinition::build($this->fields).' ';
281 281
             } elseif ($this->fields instanceof ArrayObj) {
282 282
                 $fields = ArrayObj::build($this->fields);
283 283
             }
284 284
         }
285 285
         if ($this->options->has('DATABASE')) {
286 286
             return 'CREATE '
287
-                . OptionsArray::build($this->options) . ' '
288
-                . Expression::build($this->name) . ' '
287
+                . OptionsArray::build($this->options).' '
288
+                . Expression::build($this->name).' '
289 289
                 . OptionsArray::build($this->entityOptions);
290 290
         } elseif ($this->options->has('TABLE') && !is_null($this->select)) {
291 291
             return 'CREATE '
292
-                . OptionsArray::build($this->options) . ' '
293
-                . Expression::build($this->name) . ' '
292
+                . OptionsArray::build($this->options).' '
293
+                . Expression::build($this->name).' '
294 294
                 . $this->select->build();
295 295
         } elseif ($this->options->has('TABLE') && !is_null($this->like)) {
296 296
             return 'CREATE '
297
-                . OptionsArray::build($this->options) . ' '
298
-                . Expression::build($this->name) . ' LIKE '
297
+                . OptionsArray::build($this->options).' '
298
+                . Expression::build($this->name).' LIKE '
299 299
                 . Expression::build($this->like);
300 300
         } elseif ($this->options->has('TABLE')) {
301 301
             $partition = '';
302 302
 
303 303
             if (!empty($this->partitionBy)) {
304
-                $partition .= "\nPARTITION BY " . $this->partitionBy;
304
+                $partition .= "\nPARTITION BY ".$this->partitionBy;
305 305
             }
306 306
             if (!empty($this->partitionsNum)) {
307
-                $partition .= "\nPARTITIONS " . $this->partitionsNum;
307
+                $partition .= "\nPARTITIONS ".$this->partitionsNum;
308 308
             }
309 309
             if (!empty($this->subpartitionBy)) {
310
-                $partition .= "\nSUBPARTITION BY " . $this->subpartitionBy;
310
+                $partition .= "\nSUBPARTITION BY ".$this->subpartitionBy;
311 311
             }
312 312
             if (!empty($this->subpartitionsNum)) {
313
-                $partition .= "\nSUBPARTITIONS " . $this->subpartitionsNum;
313
+                $partition .= "\nSUBPARTITIONS ".$this->subpartitionsNum;
314 314
             }
315 315
             if (!empty($this->partitions)) {
316
-                $partition .= "\n" . PartitionDefinition::build($this->partitions);
316
+                $partition .= "\n".PartitionDefinition::build($this->partitions);
317 317
             }
318 318
 
319 319
             return 'CREATE '
320
-                . OptionsArray::build($this->options) . ' '
321
-                . Expression::build($this->name) . ' '
320
+                . OptionsArray::build($this->options).' '
321
+                . Expression::build($this->name).' '
322 322
                 . $fields
323 323
                 . OptionsArray::build($this->entityOptions)
324 324
                 . $partition;
325 325
         } elseif ($this->options->has('VIEW')) {
326 326
             return 'CREATE '
327
-                . OptionsArray::build($this->options) . ' '
328
-                . Expression::build($this->name) . ' '
329
-                . $fields . ' AS ' . TokensList::build($this->body) . ' '
327
+                . OptionsArray::build($this->options).' '
328
+                . Expression::build($this->name).' '
329
+                . $fields.' AS '.TokensList::build($this->body).' '
330 330
                 . OptionsArray::build($this->entityOptions);
331 331
         } elseif ($this->options->has('TRIGGER')) {
332 332
             return 'CREATE '
333
-                . OptionsArray::build($this->options) . ' '
334
-                . Expression::build($this->name) . ' '
335
-                . OptionsArray::build($this->entityOptions) . ' '
336
-                . 'ON ' . Expression::build($this->table) . ' '
337
-                . 'FOR EACH ROW ' . TokensList::build($this->body);
333
+                . OptionsArray::build($this->options).' '
334
+                . Expression::build($this->name).' '
335
+                . OptionsArray::build($this->entityOptions).' '
336
+                . 'ON '.Expression::build($this->table).' '
337
+                . 'FOR EACH ROW '.TokensList::build($this->body);
338 338
         } elseif (($this->options->has('PROCEDURE'))
339 339
             || ($this->options->has('FUNCTION'))
340 340
         ) {
341 341
             $tmp = '';
342 342
             if ($this->options->has('FUNCTION')) {
343
-                $tmp = 'RETURNS ' . DataType::build($this->return);
343
+                $tmp = 'RETURNS '.DataType::build($this->return);
344 344
             }
345 345
             return 'CREATE '
346
-                . OptionsArray::build($this->options) . ' '
347
-                . Expression::build($this->name) . ' '
348
-                . ParameterDefinition::build($this->parameters) . ' '
349
-                . $tmp . ' ' . TokensList::build($this->body);
346
+                . OptionsArray::build($this->options).' '
347
+                . Expression::build($this->name).' '
348
+                . ParameterDefinition::build($this->parameters).' '
349
+                . $tmp.' '.TokensList::build($this->body);
350 350
         }
351 351
         return 'CREATE '
352
-            . OptionsArray::build($this->options) . ' '
353
-            . Expression::build($this->name) . ' '
352
+            . OptionsArray::build($this->options).' '
353
+            . Expression::build($this->name).' '
354 354
             . TokensList::build($this->body);
355 355
     }
356 356
 
Please login to merge, or discard this patch.
src/Components/AlterOperation.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
                     // We have reached the end of ALTER operation and suddenly found
224 224
                     // a start to new statement, but have not find a delimiter between them
225 225
 
226
-                    if (! ($token->value == 'SET' && $list->tokens[$list->idx - 1]->value == 'CHARACTER')) {
226
+                    if (!($token->value == 'SET' && $list->tokens[$list->idx - 1]->value == 'CHARACTER')) {
227 227
                         $parser->error(
228 228
                             __('A new statement was found, but no delimiter between it and the previous one.'),
229 229
                             $token
@@ -255,9 +255,9 @@  discard block
 block discarded – undo
255 255
      */
256 256
     public static function build($component, array $options = array())
257 257
     {
258
-        $ret = $component->options . ' ';
258
+        $ret = $component->options.' ';
259 259
         if ((isset($component->field)) && ($component->field !== '')) {
260
-            $ret .= $component->field . ' ';
260
+            $ret .= $component->field.' ';
261 261
         }
262 262
         $ret .= TokensList::build($component->unknown);
263 263
         return $ret;
Please login to merge, or discard this patch.
src/Statements/ReplaceStatement.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -93,15 +93,15 @@
 block discarded – undo
93 93
      */
94 94
     public function build()
95 95
     {
96
-        $ret = 'REPLACE ' . $this->options
97
-            . ' INTO ' . $this->into;
96
+        $ret = 'REPLACE '.$this->options
97
+            . ' INTO '.$this->into;
98 98
 
99 99
         if ($this->values != NULL && count($this->values) > 0) {
100
-            $ret .= ' VALUES ' . Array2d::build($this->values);
100
+            $ret .= ' VALUES '.Array2d::build($this->values);
101 101
         } elseif ($this->set != NULL && count($this->set) > 0) {
102
-            $ret .= ' SET ' . SetOperation::build($this->set);
102
+            $ret .= ' SET '.SetOperation::build($this->set);
103 103
         } elseif ($this->select != NULL && count($this->select) > 0) {
104
-            $ret .= ' ' . $this->select->build();
104
+            $ret .= ' '.$this->select->build();
105 105
         }
106 106
 
107 107
         return $ret;
Please login to merge, or discard this patch.