Merge branch 'feature/minor-changes' into develop

Author: crodas

.php_cs.dist

@@ -34,8 +34,14 @@ $config
     ->setRules([
         '@PHP56Migration' => true,
         '@PHPUnit75Migration:risky' => true,
+        '@Symfony' => true,
         '@PhpCsFixer' => true,
         '@PhpCsFixer:risky' => true,
+        'binary_operator_spaces' => ['default' => 'align_single_space'],
+        'align_multiline_comment' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'array_indentation' => true,
+        'blank_line_before_return' => true,
         'header_comment' => ['header' => $header],
         'list_syntax' => ['syntax' => 'long'],
     ])

README.md

@@ -10,7 +10,7 @@ Sometimes we need to parse and validate SQL.
 What does it do?
 ---------------
 
-It parse SQL (mostly MySQL's SQL) and exposes the SQL query as an object so it can be manipulated and assembled back to a query.
+It parses SQL (mostly MySQL's SQL) and returns the SQL query as an object. This object can be modified programmatically to generate another SQL query.
 
 How to install?
 --------------

build.php

@@ -5,9 +5,11 @@
 use SQLParser\Lexer;
 
 $constants = '';
+$array     = '';
 
 foreach (Lexer::getKeywords() as $code => $id) {
-    $constants .= 'const T_' . strtoupper($code) . ' = ' . var_export($code, true) . ";\n\n";
+    $array     .= 'self::T_' . strtoupper($code) . " => true,\n";
+    $constants .= 'const T_' . strtoupper($code) . ' = ' . var_export($code, true) . ";\n";
 }
 
 $code = '<?php
@@ -16,8 +18,8 @@
 
 class ReservedWords
 {
-    ' . $constants . '
-    public static $words = ' . var_export(Lexer::getKeywords(), true) . ';
+    ' . $constants ."
+    public static \$words = [\n" . $array . '];
 }';
 
 

composer.json

@@ -16,6 +16,9 @@
             "src/"
         ]
     },
+    "requires": {
+        "php": "^7.0 || ^8.0"
+    },
     "require-dev": {
         "crodas/phpunit-compat": "^1.7",
         "fpoirotte/php_parsergenerator": "^0.2.4",

src/SQL/AlterTable/AddColumn.php

@@ -32,7 +32,7 @@ class AddColumn extends AlterTable
 {
     public function __construct(Column $column, $position)
     {
-        $this->column = $column;
+        $this->column   = $column;
         $this->position = $position;
     }
 }

src/SQL/AlterTable/AddIndex.php

@@ -38,7 +38,7 @@ public function __construct($type, $name, ExprList $columns)
     {
         $this->indexType = $type;
         $this->indexName = $name;
-        $this->columns = $columns;
+        $this->columns   = $columns;
     }
 
     public function getIndexName()

src/SQL/AlterTable/ChangeColumn.php

@@ -34,8 +34,8 @@ class ChangeColumn extends AlterTable
 
     public function __construct($oldName, Column $column, $position)
     {
-        $this->oldName = $oldName;
-        $this->column = $column;
+        $this->oldName  = $oldName;
+        $this->column   = $column;
         $this->position = $position;
     }
 

src/SQL/AlterTable/SetDefault.php

@@ -33,7 +33,7 @@ class SetDefault extends AlterTable
     public function __construct($columnName, $value)
     {
         $this->column = $columnName;
-        $this->value = $value;
+        $this->value  = $value;
     }
 
     public function getValue()

src/SQL/Drop.php

@@ -50,7 +50,7 @@ class Drop extends Statement
      */
     public function __construct($type, array $tables)
     {
-        $this->type = $type;
+        $this->type   = $type;
         $this->tables = $tables;
     }