瀏覽代碼

restablish original rules

Frédéric FRANCE 5 年之前
父節點
當前提交
e5ef19cd0e
共有 2 個文件被更改,包括 3 次插入3 次删除
  1. 1 2
      .travis.yml
  2. 2 1
      dev/setup/codesniffer/ruleset.xml

+ 1 - 2
.travis.yml

@@ -295,8 +295,7 @@ script:
   set -e
   # Exclusions are defined in the ruleset.xml file
   #phpcs -s -n -p -d memory_limit=-1 --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 .
-  #if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .; fi
-  phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .
+  if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .; fi
   set +e
   echo
 

+ 2 - 1
dev/setup/codesniffer/ruleset.xml

@@ -186,7 +186,7 @@
 	<!-- Check indent are done with spaces and with correct number -->
 	<!-- Disabled as this does not support tab -->
 	<!-- <rule ref="Generic.WhiteSpace.ScopeIndent" /> -->
-
+ 	<!-- TODO Enable this
 	<arg name="tab-width" value="4"/>
 	<rule ref="Generic.WhiteSpace.ScopeIndent">
 	  <properties>
@@ -194,6 +194,7 @@
 	    <property name="tabIndent" value="true"/>
 	  </properties>
 	</rule>
+	-->
 
     <rule ref="Squiz.WhiteSpace.ScopeClosingBrace.Indent" />