Merge branch 'master' into motranslator

Author: nijel

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## [Unreleased]
 
+## [4.0.1] - 2017-01-23
+
+* Fixed CLI wrappers for new API.
+* Fixed README for new API.
+
+## [4.0.0] - 2017-01-23
+
+* Added PhpMyAdmin namespace prefix to follow PSR-4.
+
 ## [3.4.17] - 2017-01-20
 
 * Coding style fixes.

README.md

@@ -48,8 +48,8 @@ echo SqlParser\Utils\Formatter::format($query, array('type' => 'html'));
 ### Discoverying query type
 
 ```php
-use SqlParser\Parser;
-use SqlParser\Utils\Query;
+use PhpMyAdmin\SqlParser\Parser;
+use PhpMyAdmin\SqlParser\Utils\Query;
 
 $query = 'OPTIMIZE TABLE tbl';
 $parser = new Parser($query);
@@ -64,16 +64,16 @@ echo $flags['querytype'];
 require __DIR__."/vendor/autoload.php";
 
 $query1 = "select * from a";
-$parser = new SqlParser\Parser($query1);
+$parser = new PhpMyAdmin\SqlParser\Parser($query1);
 
 // inspect query
-var_dump($parser->statements[0]); // outputs object(SqlParser\Statements\SelectStatement)
+var_dump($parser->statements[0]); // outputs object(PhpMyAdmin\SqlParser\Statements\SelectStatement)
 
 // modify query by replacing table a with table b
-$table2 = new \SqlParser\Components\Expression("", "b", "", "");
+$table2 = new \PhpMyAdmin\SqlParser\Components\Expression("", "b", "", "");
 $parser->statements[0]->from[0] = $table2;
 
-// build query again from an array of object(SqlParser\Statements\SelectStatement) to a string
+// build query again from an array of object(PhpMyAdmin\SqlParser\Statements\SelectStatement) to a string
 $statement = $parser->statements[0];
 $query2 = $statement->build();
 var_dump($query2); // outputs string(19) "SELECT  * FROM `b` "

bin/highlight-query

@@ -25,5 +25,5 @@ if (!$found) {
     );
 }
 
-$cli = new SqlParser\Utils\CLI();
+$cli = new PhpMyAdmin\SqlParser\Utils\CLI();
 exit($cli->runHighlight());

bin/lint-query

@@ -25,6 +25,6 @@ if (!$found) {
     );
 }
 
-$cli = new SqlParser\Utils\CLI();
+$cli = new PhpMyAdmin\SqlParser\Utils\CLI();
 exit($cli->runLint());
 

composer.json

@@ -30,12 +30,12 @@
     ],
     "autoload": {
         "psr-4": {
-            "SqlParser\\": "src"
+            "PhpMyAdmin\\SqlParser\\": "src"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "SqlParser\\Tests\\": "tests"
+            "PhpMyAdmin\\SqlParser\\Tests\\": "tests"
         }
     }
 }

src/Component.php

@@ -9,7 +9,7 @@
  * count on the *Component classes to do their job.
  */
 
-namespace SqlParser;
+namespace PhpMyAdmin\SqlParser;
 
 /**
  * A component (of a statement) is a part of a statement that is common to

src/Components/AlterOperation.php

@@ -4,12 +4,12 @@
  * Parses an alter operation.
  */
 
-namespace SqlParser\Components;
+namespace PhpMyAdmin\SqlParser\Components;
 
-use SqlParser\Component;
-use SqlParser\Parser;
-use SqlParser\Token;
-use SqlParser\TokensList;
+use PhpMyAdmin\SqlParser\Component;
+use PhpMyAdmin\SqlParser\Parser;
+use PhpMyAdmin\SqlParser\Token;
+use PhpMyAdmin\SqlParser\TokensList;
 
 /**
  * Parses an alter operation.

src/Components/Array2d.php

@@ -4,13 +4,13 @@
  * `VALUES` keyword parser.
  */
 
-namespace SqlParser\Components;
+namespace PhpMyAdmin\SqlParser\Components;
 
-use SqlParser\Component;
-use SqlParser\Parser;
-use SqlParser\Token;
-use SqlParser\TokensList;
-use SQLParser\Translator;
+use PhpMyAdmin\SqlParser\Component;
+use PhpMyAdmin\SqlParser\Parser;
+use PhpMyAdmin\SqlParser\Token;
+use PhpMyAdmin\SqlParser\TokensList;
+use PhpMyAdmin\SqlParser\Translator;
 
 /**
  * `VALUES` keyword parser.

src/Components/ArrayObj.php

@@ -4,12 +4,12 @@
  * Parses an array.
  */
 
-namespace SqlParser\Components;
+namespace PhpMyAdmin\SqlParser\Components;
 
-use SqlParser\Component;
-use SqlParser\Parser;
-use SqlParser\Token;
-use SqlParser\TokensList;
+use PhpMyAdmin\SqlParser\Component;
+use PhpMyAdmin\SqlParser\Parser;
+use PhpMyAdmin\SqlParser\Token;
+use PhpMyAdmin\SqlParser\TokensList;
 
 /**
  * Parses an array.

src/Components/CaseExpression.php

@@ -4,12 +4,12 @@
  * Parses a reference to a CASE expression.
  */
 
-namespace SqlParser\Components;
+namespace PhpMyAdmin\SqlParser\Components;
 
-use SqlParser\Component;
-use SqlParser\Parser;
-use SqlParser\Token;
-use SqlParser\TokensList;
+use PhpMyAdmin\SqlParser\Component;
+use PhpMyAdmin\SqlParser\Parser;
+use PhpMyAdmin\SqlParser\Token;
+use PhpMyAdmin\SqlParser\TokensList;
 
 /**
  * Parses a reference to a CASE expression.