Merge branch 'master' of https://github.com/top-think/framework

.travis.yml

@@ -36,8 +36,6 @@ install:
 script:
   ## LINT
   - find . -path ./vendor -prune -o -type f -name \*.php -exec php -l {} \;
-  ## PHP_CodeSniffer
-  - vendor/bin/phpcs --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 --standard=PSR2 --ignore="vendor/*" ./
   ## PHP Copy/Paste Detector
   - vendor/bin/phpcpd --verbose --exclude vendor ./ || true
   ## PHPLOC

composer.json

@@ -25,12 +25,11 @@
         "mikey179/vfsStream": "~1.6",
         "phploc/phploc": "2.*",
         "sebastian/phpcpd": "2.*",
-        "squizlabs/php_codesniffer": "2.*",
         "phpdocumentor/reflection-docblock": "^2.0"
     },
     "autoload": {
         "psr-4": {
             "think\\": "library/think"
         }
-    }    
+    }
 }