Merge branch 'master' of github.com:nilportugues/sql-query-formatter

Author: nilportugues

.travis.yml

@@ -6,14 +6,19 @@ php:
   - 5.6
   - 5.5
   - 5.4
-  - hhvm-nightly
+  - nightly
+
+matrix:
+  allow_failures:
+    - php: nightly
 
 before_script:
   - alias composer="php -d zend.enable_gc=0 /usr/bin/composer"
   - composer require --dev satooshi/php-coveralls:dev-master
   - composer install
 
 after_script:
+  - export COVERALLS_RUN_LOCALLY=1
   - php bin/coveralls -v
 
 script: 
@@ -22,4 +27,4 @@ script:
 
 matrix:
      allow_failures:
-         - php: hhvm-nightly  
+         - php: nightly  

README.md

@@ -16,16 +16,11 @@ A very lightweight PHP class that re-formats unreadable or computer-generated SQ
 
 <a name="block1"></a>
 ## 1.Installation
-Add the following to your `composer.json` file :
-
-```js
-{
-    "require": {
-        "nilportugues/sql-query-formatter": "1.0.0"
-    }
-}
-```
+The recommended way to install the SQL Query Formatter is through [Composer](http://getcomposer.org). Run the following command to install it:
 
+```sh
+php composer.phar require nilportugues/sql-query-formatter
+```
 
 <a name="block2"></a>
 ## 2. Features

phpunit.xml.dist

@@ -37,6 +37,7 @@
             <directory>./</directory>
             <exclude>
                 <directory>./vendor/</directory>
+                <directory>./tests/</directory>
             </exclude>
         </whitelist>
     </filter>

src/Formatter.php

@@ -207,8 +207,8 @@ protected function stringIsEndOfLimitClause($token)
     }
 
     /**
-     * @param $addedNewline
-     * @param $tab
+     * @param boolean $addedNewline
+     * @param string $tab
      * @param $token
      * @param $queryValue
      *

src/Tokenizer/Parser/Reserved.php

@@ -84,10 +84,10 @@ protected static function getReservedString(array &$tokenData, $type, $string, T
     }
 
     /**
-     * @param       string        $upper
-     * @param array               $matches
-     * @param              string $regexReserved
-     * @param              string $regexBoundaries
+     * @param string $upper
+     * @param array $matches
+     * @param string $regexReserved
+     * @param string $regexBoundaries
      *
      * @return bool
      */
@@ -101,9 +101,9 @@ protected static function isReservedString($upper, array &$matches, $regexReserv
     }
 
     /**
-     * @param              string $type
-     * @param       string        $string
-     * @param array               $matches
+     * @param string $type
+     * @param string $string
+     * @param array $matches
      *
      * @return array
      */

src/Tokenizer/Tokenizer.php

@@ -187,9 +187,9 @@ protected function processOneToken($string)
     }
 
     /**
-     * @param $string
+     * @param string $string
      * @param integer $currentStringLength
-     * @param string $previousToken
+     * @param string string
      *
      * @return array|mixed
      */