浏览代码

Update editorconfig, supress warnings in Travis build, set cakephp-codesniffer to dev-master

Bryan Crowe 11 年之前
父节点
当前提交
e2bf915d0d
共有 3 个文件被更改,包括 4 次插入3 次删除
  1. 2 1
      .editorconfig
  2. 1 1
      .travis.yml
  3. 1 1
      composer.json

+ 2 - 1
.editorconfig

@@ -4,7 +4,8 @@
 root = true
 
 [*]
-indent_style = tab
+indent_style = space
+indent_size = 4
 end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true

+ 1 - 1
.travis.yml

@@ -42,7 +42,7 @@ before_script:
 
 script:
   - sh -c "if [ '$PHPCS' != '1' ]; then phpunit; fi"
-  - sh -c "if [ '$PHPCS' = '1' ]; then vendor/bin/phpcs -p --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests; fi"
+  - sh -c "if [ '$PHPCS' = '1' ]; then vendor/bin/phpcs -p -n --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests; fi"
 
 notifications:
   email: false

+ 1 - 1
composer.json

@@ -28,7 +28,7 @@
 	},
 	"require-dev": {
 		"phpunit/phpunit": "*",
-		"cakephp/cakephp-codesniffer": "*"
+		"cakephp/cakephp-codesniffer": "dev-master"
 	},
 	"autoload": {
 		"psr-4": {