From c91304c9a1de284197f16eab2f0635736be16b53 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sun, 25 Sep 2016 09:54:14 +0200
Subject: [PATCH] style: expand sniffer now that src/opnsense/contrib is gone

---
 Makefile    | 4 ++--
 ruleset.xml | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 62a544ca4c..4d80e76db2 100644
--- a/Makefile
+++ b/Makefile
@@ -295,7 +295,7 @@ sweep: force
 	    xargs -0 -n1 scripts/cleanfile
 
 style: want-pear-PHP_CodeSniffer
-	@(phpcs --standard=ruleset.xml ${.CURDIR}/src/opnsense/mvc \
+	@(phpcs --standard=ruleset.xml ${.CURDIR}/src/opnsense \
 	    || true) > ${.CURDIR}/.style.out
 	@echo -n "Total number of style warnings: "
 	@grep '| WARNING' ${.CURDIR}/.style.out | wc -l
@@ -305,7 +305,7 @@ style: want-pear-PHP_CodeSniffer
 	@rm ${.CURDIR}/.style.out
 
 style-fix: want-pear-PHP_CodeSniffer
-	phpcbf --standard=ruleset.xml ${.CURDIR}/src/opnsense/mvc || true
+	phpcbf --standard=ruleset.xml ${.CURDIR}/src/opnsense || true
 
 setup: force
 	${.CURDIR}/src/etc/rc.php_ini_setup
diff --git a/ruleset.xml b/ruleset.xml
index 72a7c77733..be1f5f8607 100644
--- a/ruleset.xml
+++ b/ruleset.xml
@@ -3,4 +3,6 @@
   <description>Slightly enhanced version of the PSR2 standard</description>
   <rule ref="Squiz.WhiteSpace.SemicolonSpacing"/>
   <rule ref="PSR2"/>
+  <exclude-pattern>*.css</exclude-pattern>
+  <exclude-pattern>*.js</exclude-pattern>
 </ruleset>