From 2d02544173c34c00c33398eb5240a0a78d6d8e2c Mon Sep 17 00:00:00 2001
From: QWp6t <hi@qwp6t.me>
Date: Sun, 27 Dec 2015 23:13:05 -0800
Subject: [PATCH] Create new phpcs rules

---
 .travis.yml         |  3 ++-
 phpcs-templates.xml | 43 ++++++++++++++++++++++++++++++++++++++++++
 phpcs.xml           | 17 +++++++++++++++++
 ruleset.xml         | 46 ---------------------------------------------
 4 files changed, 62 insertions(+), 47 deletions(-)
 create mode 100644 phpcs-templates.xml
 create mode 100644 phpcs.xml
 delete mode 100644 ruleset.xml

diff --git a/.travis.yml b/.travis.yml
index fa0403e870..5d2ecc03c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,5 +43,6 @@ install:
 
 script:
   - npm run build
-  - phpcs --standard=ruleset.xml --extensions=php --ignore=node_modules,bower_components,vendor -n -s .
+  - phpcs --report=summary
+  - phpcs --report=summary --standard=phpcs-templates.xml -n
   - phpmd src text cleancode,codesize,controversial,design,naming,unusedcode
diff --git a/phpcs-templates.xml b/phpcs-templates.xml
new file mode 100644
index 0000000000..ce1fba4be7
--- /dev/null
+++ b/phpcs-templates.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<ruleset name="Roots">
+  <description>Roots Templates Coding Standards</description>
+
+  <!-- Scan these files by default -->
+  <file>templates</file>
+
+  <!-- Show colors in console -->
+  <arg value="-colors"/>
+
+  <!-- Show sniff codes in all reports -->
+  <arg value="s"/>
+
+  <!-- Use PSR-2 as a base -->
+  <rule ref="PSR2">
+    <!-- Allow closing braces to be on the same line -->
+    <exclude name="Squiz.WhiteSpace.ScopeClosingBrace"/>
+
+    <!-- Disable newline after opening brace -->
+    <exclude name="Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace"/>
+
+    <!-- Allow multiple PHP statements in the same line -->
+    <exclude name="Generic.Formatting.DisallowMultipleStatements.SameLine"/>
+
+    <!-- Disable PSR-2 indentation rules that are buggy with 2 spaces -->
+    <exclude name="PSR2.ControlStructures.SwitchDeclaration.BreakIndent"/>
+    <exclude name="PSR2.Methods.FunctionCallSignature.Indent"/>
+    
+    <!-- Don't require a blank line after the last `use` -->
+    <exclude name="PSR2.Namespaces.UseDeclaration.SpaceAfterLastUse"/>
+    
+    <!-- Allow PHP closing tags -->
+    <exclude name="PSR2.Files.ClosingTag.NotAllowed"/>
+  </rule>
+
+  <!-- Force 2 spaces indentation -->
+  <rule ref="Generic.WhiteSpace.ScopeIndent">
+    <properties>
+      <property name="indent" value="2"/>
+      <property name="tabIndent" value="false"/>
+    </properties>
+  </rule>
+</ruleset>
diff --git a/phpcs.xml b/phpcs.xml
new file mode 100644
index 0000000000..d5fce9b533
--- /dev/null
+++ b/phpcs.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<ruleset name="Roots">
+  <description>Roots Coding Standards</description>
+
+  <!-- Use PSR-2 as a base -->
+  <rule ref="PSR2"/>
+
+  <!-- Show colors in console -->
+  <arg value="-colors"/>
+
+  <!-- Show sniff codes in all reports -->
+  <arg value="s"/>
+
+  <!-- Scan these files -->
+ <file>functions.php</file>
+ <file>src</file>
+</ruleset>
diff --git a/ruleset.xml b/ruleset.xml
deleted file mode 100644
index 20f716c97b..0000000000
--- a/ruleset.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="Roots">
-  <description>Roots Coding Standards</description>
-
-  <!-- Use PSR-2 as a base -->
-  <rule ref="PSR2">
-    <!-- Allow opening and closing braces for functions and classes to be on the same line -->
-    <exclude name="Squiz.Functions.MultiLineFunctionDeclaration.BraceOnSameLine"/>
-    <exclude name="PSR2.Classes.ClassDeclaration.OpenBraceNewLine"/>
-    <exclude name="Squiz.WhiteSpace.ScopeClosingBrace"/>
-
-    <!-- Disable newline after opening brace -->
-    <exclude name="Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace"/>
-
-    <!-- Allow multiple PHP statements in the same line (usually in template files) -->
-    <exclude name="Generic.Formatting.DisallowMultipleStatements.SameLine"/>
-
-    <!-- Disable PSR-2 indentation rules that are buggy with 2 spaces -->
-    <exclude name="PSR2.ControlStructures.SwitchDeclaration.BreakIndent"/>
-    <exclude name="PSR2.Methods.FunctionCallSignature.Indent"/>
-  </rule>
-
-  <!-- Don't require a blank line after the last `use` in templates/ directory -->
-  <rule ref="PSR2.Namespaces.UseDeclaration.SpaceAfterLastUse">
-    <exclude-pattern>templates/*</exclude-pattern>
-  </rule>
-
-  <!-- Allow PHP closing tags on templates -->
-  <rule ref="PSR2.Files.ClosingTag.NotAllowed">
-    <exclude-pattern>templates/*</exclude-pattern>
-  </rule>
-
-  <!-- Force 2 spaces indentation -->
-  <rule ref="Generic.WhiteSpace.ScopeIndent">
-    <properties>
-      <property name="indent" value="2"/>
-      <property name="tabIndent" value="false"/>
-    </properties>
-  </rule>
-
-  <!-- Verify that operators have valid spacing surrounding them -->
-  <rule ref="Squiz.WhiteSpace.OperatorSpacing"/>
-  
-  <!-- Force braces to be on the same lines in function declarations -->
-  <rule ref="Generic.Functions.OpeningFunctionBraceKernighanRitchie"/>
-</ruleset>