Changed namespace plus updated composer.json dev dependencies

nilportugues · nilportugues · commit a8d73017609f · 2015-04-10T21:24:05.000+02:00
diff --git a/composer.json b/composer.json
@@ -16,12 +16,12 @@
     ],
     "autoload":{
         "psr-4":{
-            "NilPortugues\\SqlQueryFormatter\\":"src/"
+            "NilPortugues\\Sql\\QueryFormatter\\":"src/"
         }
     },
     "autoload-dev":{
         "psr-4":{
-            "Tests\\NilPortugues\\SqlQueryFormatter\\":"tests/"
+            "NilPortugues\\Tests\\Sql\\QueryFormatter\\":"tests/"
         }
     },
     "require":
@@ -30,17 +30,9 @@
     },
     "require-dev":
     {
-        "phpunit/phpunit": "4.2.*@dev",
-        "phpunit/phpunit-mock-objects": "2.2.*@dev",
-        "phpunit/php-code-coverage": "2.0.x-dev",
-        "sebastian/comparator": "dev-master",
-        "sebastian/finder-facade": "dev-master",
-        "theseer/fdomdocument": "dev-master",
-        "fabpot/php-cs-fixer": "dev-master",
-        "pdepend/pdepend": "2.*",
-        "phpmd/phpmd": "dev-master",
-        "squizlabs/php_codesniffer": "2.*@dev",
-        "fiunchinho/phpunit-randomizer": "1.0.*@dev"
+        "phpunit/phpunit": "~4.2",
+        "fiunchinho/phpunit-randomizer": "1.0.*@dev",
+        "fabpot/php-cs-fixer": "dev-master"
     },
     "config":
     {
diff --git a/src/Formatter.php b/src/Formatter.php
@@ -7,21 +7,21 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace NilPortugues\SqlQueryFormatter;
+namespace NilPortugues\Sql\QueryFormatter;
 
-use NilPortugues\SqlQueryFormatter\Helper\Comment;
-use NilPortugues\SqlQueryFormatter\Helper\Indent;
-use NilPortugues\SqlQueryFormatter\Helper\NewLine;
-use NilPortugues\SqlQueryFormatter\Helper\Parentheses;
-use NilPortugues\SqlQueryFormatter\Helper\Token;
-use NilPortugues\SqlQueryFormatter\Helper\WhiteSpace;
-use NilPortugues\SqlQueryFormatter\Tokenizer\Tokenizer;
+use NilPortugues\Sql\QueryFormatter\Helper\Comment;
+use NilPortugues\Sql\QueryFormatter\Helper\Indent;
+use NilPortugues\Sql\QueryFormatter\Helper\NewLine;
+use NilPortugues\Sql\QueryFormatter\Helper\Parentheses;
+use NilPortugues\Sql\QueryFormatter\Helper\Token;
+use NilPortugues\Sql\QueryFormatter\Helper\WhiteSpace;
+use NilPortugues\Sql\QueryFormatter\Tokenizer\Tokenizer;
 
 /**
  * Lightweight Formatter heavily based on https://github.com/jdorn/sql-formatter.
  *
  * Class Formatter
- * @package NilPortugues\SqlQueryFormatter
+ * @package NilPortugues\Sql\QueryFormatter
  */
 class Formatter
 {
diff --git a/src/Helper/Comment.php b/src/Helper/Comment.php
@@ -8,19 +8,19 @@
  * file that was distributed with this source code.
  */
 
-namespace NilPortugues\SqlQueryFormatter\Helper;
+namespace NilPortugues\Sql\QueryFormatter\Helper;
 
-use NilPortugues\SqlQueryFormatter\Formatter;
-use NilPortugues\SqlQueryFormatter\Tokenizer\Tokenizer;
+use NilPortugues\Sql\QueryFormatter\Formatter;
+use NilPortugues\Sql\QueryFormatter\Tokenizer\Tokenizer;
 
 /**
  * Class Comment
- * @package NilPortugues\SqlQueryFormatter\Helper
+ * @package NilPortugues\Sql\QueryFormatter\Helper
  */
 class Comment
 {
     /**
-     * @var \NilPortugues\SqlQueryFormatter\Formatter
+     * @var \NilPortugues\Sql\QueryFormatter\Formatter
      */
     protected $formatter;
 
diff --git a/src/Helper/Indent.php b/src/Helper/Indent.php
@@ -8,13 +8,13 @@
  * file that was distributed with this source code.
  */
 
-namespace NilPortugues\SqlQueryFormatter\Helper;
+namespace NilPortugues\Sql\QueryFormatter\Helper;
 
-use NilPortugues\SqlQueryFormatter\Formatter;
+use NilPortugues\Sql\QueryFormatter\Formatter;
 
 /**
  * Class Indent
- * @package NilPortugues\SqlQueryFormatter\Helper
+ * @package NilPortugues\Sql\QueryFormatter\Helper
  */
 class Indent
 {
diff --git a/src/Helper/NewLine.php b/src/Helper/NewLine.php
@@ -8,14 +8,14 @@
  * file that was distributed with this source code.
  */
 
-namespace NilPortugues\SqlQueryFormatter\Helper;
+namespace NilPortugues\Sql\QueryFormatter\Helper;
 
-use NilPortugues\SqlQueryFormatter\Formatter;
-use NilPortugues\SqlQueryFormatter\Tokenizer\Tokenizer;
+use NilPortugues\Sql\QueryFormatter\Formatter;
+use NilPortugues\Sql\QueryFormatter\Tokenizer\Tokenizer;
 
 /**
  * Class NewLine
- * @package NilPortugues\SqlQueryFormatter\Helper
+ * @package NilPortugues\Sql\QueryFormatter\Helper
  */
 class NewLine
 {
@@ -25,7 +25,7 @@ class NewLine
     protected $newline = false;
 
     /**
-     * @var \NilPortugues\SqlQueryFormatter\Formatter
+     * @var \NilPortugues\Sql\QueryFormatter\Formatter
      */
     protected $formatter;
 
diff --git a/src/Helper/Parentheses.php b/src/Helper/Parentheses.php
@@ -8,14 +8,14 @@
  * file that was distributed with this source code.
  */
 
-namespace NilPortugues\SqlQueryFormatter\Helper;
+namespace NilPortugues\Sql\QueryFormatter\Helper;
 
-use NilPortugues\SqlQueryFormatter\Formatter;
-use NilPortugues\SqlQueryFormatter\Tokenizer\Tokenizer;
+use NilPortugues\Sql\QueryFormatter\Formatter;
+use NilPortugues\Sql\QueryFormatter\Tokenizer\Tokenizer;
 
 /**
  * Class Parentheses
- * @package NilPortugues\SqlQueryFormatter\Helper
+ * @package NilPortugues\Sql\QueryFormatter\Helper
  */
 class Parentheses
 {
@@ -24,7 +24,7 @@ class Parentheses
      */
     protected $inlineParentheses = false;
     /**
-     * @var \NilPortugues\SqlQueryFormatter\Formatter
+     * @var \NilPortugues\Sql\QueryFormatter\Formatter
      */
     protected $formatter;
 
diff --git a/src/Helper/Token.php b/src/Helper/Token.php
@@ -8,14 +8,14 @@
  * file that was distributed with this source code.
  */
 
-namespace NilPortugues\SqlQueryFormatter\Helper;
+namespace NilPortugues\Sql\QueryFormatter\Helper;
 
-use NilPortugues\SqlQueryFormatter\Formatter;
-use NilPortugues\SqlQueryFormatter\Tokenizer\Tokenizer;
+use NilPortugues\Sql\QueryFormatter\Formatter;
+use NilPortugues\Sql\QueryFormatter\Tokenizer\Tokenizer;
 
 /**
  * Class Token
- * @package NilPortugues\SqlQueryFormatter\Helper
+ * @package NilPortugues\Sql\QueryFormatter\Helper
  */
 final class Token
 {
diff --git a/src/Helper/WhiteSpace.php b/src/Helper/WhiteSpace.php
@@ -8,13 +8,13 @@
  * file that was distributed with this source code.
  */
 
-namespace NilPortugues\SqlQueryFormatter\Helper;
+namespace NilPortugues\Sql\QueryFormatter\Helper;
 
-use NilPortugues\SqlQueryFormatter\Tokenizer\Tokenizer;
+use NilPortugues\Sql\QueryFormatter\Tokenizer\Tokenizer;
 
 /**
  * Class WhiteSpace
- * @package NilPortugues\SqlQueryFormatter\Helper
+ * @package NilPortugues\Sql\QueryFormatter\Helper
  */
 class WhiteSpace
 {
diff --git a/src/Tokenizer/Parser/Boundary.php b/src/Tokenizer/Parser/Boundary.php
@@ -8,13 +8,13 @@
  * file that was distributed with this source code.
  */
 
-namespace NilPortugues\SqlQueryFormatter\Tokenizer\Parser;
+namespace NilPortugues\Sql\QueryFormatter\Tokenizer\Parser;
 
-use NilPortugues\SqlQueryFormatter\Tokenizer\Tokenizer;
+use NilPortugues\Sql\QueryFormatter\Tokenizer\Tokenizer;
 
 /**
  * Class Boundary
- * @package NilPortugues\SqlQueryFormatter\Tokenizer\Parser
+ * @package NilPortugues\Sql\QueryFormatter\Tokenizer\Parser
  */
 final class Boundary
 {
diff --git a/src/Tokenizer/Parser/Comment.php b/src/Tokenizer/Parser/Comment.php
@@ -8,13 +8,13 @@
  * file that was distributed with this source code.
  */
 
-namespace NilPortugues\SqlQueryFormatter\Tokenizer\Parser;
+namespace NilPortugues\Sql\QueryFormatter\Tokenizer\Parser;
 
-use NilPortugues\SqlQueryFormatter\Tokenizer\Tokenizer;
+use NilPortugues\Sql\QueryFormatter\Tokenizer\Tokenizer;
 
 /**
  * Class Comment
- * @package NilPortugues\SqlQueryFormatter\Tokenizer\Parser
+ * @package NilPortugues\Sql\QueryFormatter\Tokenizer\Parser
  */
 final class Comment
 {
diff --git a/src/Tokenizer/Parser/Numeral.php b/src/Tokenizer/Parser/Numeral.php
@@ -8,13 +8,13 @@
  * file that was distributed with this source code.
  */
 
-namespace NilPortugues\SqlQueryFormatter\Tokenizer\Parser;
+namespace NilPortugues\Sql\QueryFormatter\Tokenizer\Parser;
 
-use NilPortugues\SqlQueryFormatter\Tokenizer\Tokenizer;
+use NilPortugues\Sql\QueryFormatter\Tokenizer\Tokenizer;
 
 /**
  * Class Numeral
- * @package NilPortugues\SqlQueryFormatter\Tokenizer\Parser
+ * @package NilPortugues\Sql\QueryFormatter\Tokenizer\Parser
  */
 final class Numeral
 {
diff --git a/src/Tokenizer/Parser/Quoted.php b/src/Tokenizer/Parser/Quoted.php
@@ -8,13 +8,13 @@
  * file that was distributed with this source code.
  */
 
-namespace NilPortugues\SqlQueryFormatter\Tokenizer\Parser;
+namespace NilPortugues\Sql\QueryFormatter\Tokenizer\Parser;
 
-use NilPortugues\SqlQueryFormatter\Tokenizer\Tokenizer;
+use NilPortugues\Sql\QueryFormatter\Tokenizer\Tokenizer;
 
 /**
  * Class Quoted
- * @package NilPortugues\SqlQueryFormatter\Tokenizer\Parser
+ * @package NilPortugues\Sql\QueryFormatter\Tokenizer\Parser
  */
 final class Quoted
 {
diff --git a/src/Tokenizer/Parser/Reserved.php b/src/Tokenizer/Parser/Reserved.php
@@ -8,13 +8,13 @@
  * file that was distributed with this source code.
  */
 
-namespace NilPortugues\SqlQueryFormatter\Tokenizer\Parser;
+namespace NilPortugues\Sql\QueryFormatter\Tokenizer\Parser;
 
-use NilPortugues\SqlQueryFormatter\Tokenizer\Tokenizer;
+use NilPortugues\Sql\QueryFormatter\Tokenizer\Tokenizer;
 
 /**
  * Class Reserved
- * @package NilPortugues\SqlQueryFormatter\Tokenizer
+ * @package NilPortugues\Sql\QueryFormatter\Tokenizer
  */
 final class Reserved
 {
diff --git a/src/Tokenizer/Parser/String.php b/src/Tokenizer/Parser/String.php
@@ -8,13 +8,13 @@
  * file that was distributed with this source code.
  */
 
-namespace NilPortugues\SqlQueryFormatter\Tokenizer\Parser;
+namespace NilPortugues\Sql\QueryFormatter\Tokenizer\Parser;
 
-use NilPortugues\SqlQueryFormatter\Tokenizer\Tokenizer;
+use NilPortugues\Sql\QueryFormatter\Tokenizer\Tokenizer;
 
 /**
  * Class String
- * @package NilPortugues\SqlQueryFormatter\Tokenizer\Parser
+ * @package NilPortugues\Sql\QueryFormatter\Tokenizer\Parser
  */
 final class String
 {
diff --git a/src/Tokenizer/Parser/UserDefined.php b/src/Tokenizer/Parser/UserDefined.php
@@ -8,13 +8,13 @@
  * file that was distributed with this source code.
  */
 
-namespace NilPortugues\SqlQueryFormatter\Tokenizer\Parser;
+namespace NilPortugues\Sql\QueryFormatter\Tokenizer\Parser;
 
-use NilPortugues\SqlQueryFormatter\Tokenizer\Tokenizer;
+use NilPortugues\Sql\QueryFormatter\Tokenizer\Tokenizer;
 
 /**
  * Class UserDefined
- * @package NilPortugues\SqlQueryFormatter\Tokenizer\Parser
+ * @package NilPortugues\Sql\QueryFormatter\Tokenizer\Parser
  */
 final class UserDefined
 {
diff --git a/src/Tokenizer/Parser/WhiteSpace.php b/src/Tokenizer/Parser/WhiteSpace.php
@@ -8,13 +8,13 @@
  * file that was distributed with this source code.
  */
 
-namespace NilPortugues\SqlQueryFormatter\Tokenizer\Parser;
+namespace NilPortugues\Sql\QueryFormatter\Tokenizer\Parser;
 
-use NilPortugues\SqlQueryFormatter\Tokenizer\Tokenizer;
+use NilPortugues\Sql\QueryFormatter\Tokenizer\Tokenizer;
 
 /**
  * Class WhiteSpace
- * @package NilPortugues\SqlQueryFormatter\Tokenizer
+ * @package NilPortugues\Sql\QueryFormatter\Tokenizer
  */
 final class WhiteSpace
 {
diff --git a/src/Tokenizer/Tokenizer.php b/src/Tokenizer/Tokenizer.php
@@ -8,21 +8,21 @@
  * file that was distributed with this source code.
  */
 
-namespace NilPortugues\SqlQueryFormatter\Tokenizer;
-
-use NilPortugues\SqlQueryFormatter\Helper\Token;
-use NilPortugues\SqlQueryFormatter\Tokenizer\Parser\Boundary;
-use NilPortugues\SqlQueryFormatter\Tokenizer\Parser\Comment;
-use NilPortugues\SqlQueryFormatter\Tokenizer\Parser\Numeral;
-use NilPortugues\SqlQueryFormatter\Tokenizer\Parser\Quoted;
-use NilPortugues\SqlQueryFormatter\Tokenizer\Parser\Reserved;
-use NilPortugues\SqlQueryFormatter\Tokenizer\Parser\String;
-use NilPortugues\SqlQueryFormatter\Tokenizer\Parser\UserDefined;
-use NilPortugues\SqlQueryFormatter\Tokenizer\Parser\WhiteSpace;
+namespace NilPortugues\Sql\QueryFormatter\Tokenizer;
+
+use NilPortugues\Sql\QueryFormatter\Helper\Token;
+use NilPortugues\Sql\QueryFormatter\Tokenizer\Parser\Boundary;
+use NilPortugues\Sql\QueryFormatter\Tokenizer\Parser\Comment;
+use NilPortugues\Sql\QueryFormatter\Tokenizer\Parser\Numeral;
+use NilPortugues\Sql\QueryFormatter\Tokenizer\Parser\Quoted;
+use NilPortugues\Sql\QueryFormatter\Tokenizer\Parser\Reserved;
+use NilPortugues\Sql\QueryFormatter\Tokenizer\Parser\String as LiteralString;
+use NilPortugues\Sql\QueryFormatter\Tokenizer\Parser\UserDefined;
+use NilPortugues\Sql\QueryFormatter\Tokenizer\Parser\WhiteSpace;
 
 /**
  * Class Tokenizer
- * @package NilPortugues\SqlQueryFormatter\Helper
+ * @package NilPortugues\Sql\QueryFormatter\Helper
  */
 class Tokenizer
 {
@@ -271,8 +271,8 @@ protected function parseNextToken($string, $previous = null)
         Numeral::isNumeral($this, $string, $matches);
         Boundary::isBoundary($this, $string, $matches);
         Reserved::isReserved($this, $string, $previous);
-        String::isFunction($this, $string, $matches);
-        String::getNonReservedString($this, $string, $matches);
+        LiteralString::isFunction($this, $string, $matches);
+        LiteralString::getNonReservedString($this, $string, $matches);
 
         return $this->nextToken;
     }
diff --git a/tests/FormatterTest.php b/tests/FormatterTest.php
@@ -8,13 +8,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Tests\NilPortugues\SqlQueryFormatter;
+namespace NilPortugues\Tests\Sql\QueryFormatter;
 
-use NilPortugues\SqlQueryFormatter\Formatter;
+use NilPortugues\Sql\QueryFormatter\Formatter;
 
 /**
  * Class FormatterTest
- * @package Tests\NilPortugues\SqlQueryFormatter\Helper
+ * @package NilPortugues\Tests\Sql\QueryFormatter\Helper
  */
 class FormatterTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Tokenizer/TokenizerTest.php b/tests/Tokenizer/TokenizerTest.php
