From 8b5c920c98b81407805a79f17ecd3e419583df8f Mon Sep 17 00:00:00 2001
From: Stefan Kalscheuer <stefan@stklcode.de>
Date: Tue, 5 Dec 2017 19:28:45 +0100
Subject: [PATCH] Composer and PHPCS config updates

---
 composer.json | 21 ++++++++++++++++++++-
 phpcs.xml     | 21 +++++++++++++++++++--
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index e3d4349..25900d4 100644
--- a/composer.json
+++ b/composer.json
@@ -23,6 +23,25 @@
   "require-dev": {
     "php": ">=5.3",
     "phpunit/phpunit": "*",
-    "wp-coding-standards/wpcs": "~0.14.0"
+    "phpunit/php-code-coverage": "*",
+    "dealerdirect/phpcodesniffer-composer-installer": "^0.4","slowprog/composer-copy-file": "~0.2",
+    "squizlabs/php_codesniffer": "^3.1",
+    "wimg/php-compatibility": "^8.0",
+    "wp-coding-standards/wpcs": "~0.14"
+  },
+  "scripts": {
+    "test-all": [
+      "@test",
+      "@test-cs"
+    ],
+    "test": [
+      "phpunit"
+    ],
+    "test-cs": [
+      "phpcs --standard=phpcs.xml -s"
+    ],
+    "fix-cs": [
+      "phpcbf --standard=phpcs.xml"
+    ]
   }
 }
diff --git a/phpcs.xml b/phpcs.xml
index d4ff217..a0c171d 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -2,8 +2,25 @@
 <ruleset name="WPLiveticker2">
 	<description>Derived from WordPress Coding Standard</description>
 
+	<!-- Config arguments -->
+	<arg value="psvn"/>
+	<arg name="colors"/>
+
+	<!-- Files to sniff -->
+	<file>wp-liveticker2.php</file>
+	<file>includes</file>
+	<file>views</file>
+
+	<!-- Compliance with WordPress Coding Standard -->
+	<config name="minimum_supported_wp_version" value="4.0"/>
 	<rule ref="WordPress">
-		<!-- Type hint checks mess up PHP 7 checks, while this plugin has compatibility level 5.5 and above. -->
-		<exclude name="Squiz.Commenting.FunctionComment.ScalarTypeHintMissing"/>
+		<!-- Makes view HTML code messy -->
+		<exclude name="Squiz.PHP.EmbeddedPhp.ContentBeforeEnd"/>
+		<exclude name="Squiz.PHP.EmbeddedPhp.ContentBeforeOpen"/>
+		<exclude name="Squiz.PHP.EmbeddedPhp.ContentAfterOpen"/>
 	</rule>
+
+	<!-- PHP compatibility level -->
+	<config name="testVersion" value="5.5-"/>
+	<rule ref="PHPCompatibility"/>
 </ruleset>