From d109792673bb0755cfbd92daa363311bf287a786 Mon Sep 17 00:00:00 2001 From: Koopzington Date: Wed, 9 Nov 2016 23:56:59 +0100 Subject: [PATCH 1/5] Use outsourced coding standard --- composer.json | 3 ++- phpcs.xml | 19 +------------------ 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/composer.json b/composer.json index 739661199..c2b78426a 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,8 @@ "require-dev": { "athletic/athletic": "~0.1", "phpunit/PHPUnit": "~4.0", - "squizlabs/php_codesniffer": "^2.6.2" + "squizlabs/php_codesniffer": "^2.6.2", + "zendframework/zend-coding-standard": "~1.0.0" }, "extra": { "branch-alias": { diff --git a/phpcs.xml b/phpcs.xml index 7aa21c070..b6e02f5e7 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -2,24 +2,7 @@ Zend Framework coding standard - - - - - - - - - - - - - - - - - - + src From 650e90e33d01bb7ec02cf3e906d0f056c7cacc10 Mon Sep 17 00:00:00 2001 From: Don Koopa Date: Thu, 10 Nov 2016 12:26:34 +0100 Subject: [PATCH 2/5] Remove description --- phpcs.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/phpcs.xml b/phpcs.xml index b6e02f5e7..c48d19c5d 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -1,7 +1,5 @@ - Zend Framework coding standard - From f4980124b97d4f432f57079f37e9ed08ffcb432b Mon Sep 17 00:00:00 2001 From: Don Koopa Date: Sun, 13 Nov 2016 02:23:36 +0100 Subject: [PATCH 3/5] Remove dependency on php_codesniffer --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index c2b78426a..e76c631ca 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,6 @@ "require-dev": { "athletic/athletic": "~0.1", "phpunit/PHPUnit": "~4.0", - "squizlabs/php_codesniffer": "^2.6.2", "zendframework/zend-coding-standard": "~1.0.0" }, "extra": { From d859015b19b8744a0ef90cfe36a6b14e12d2a283 Mon Sep 17 00:00:00 2001 From: Don Koopa Date: Sun, 13 Nov 2016 16:36:03 +0100 Subject: [PATCH 4/5] --colors options no longer needed Since the coding standard enables colors per default the option is no longer needed --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index e76c631ca..868a2060e 100644 --- a/composer.json +++ b/composer.json @@ -33,8 +33,8 @@ } }, "scripts": { - "cs-check": "phpcs --colors", - "cs-fix": "phpcbf --colors", + "cs-check": "phpcs", + "cs-fix": "phpcbf", "test": "phpunit --colors=always", "test-coverage": "phpunit --colors=always --coverage-clover clover.xml", "upload-coverage": "coveralls -v" From 6494cef3ec36e6a4c33bac1d38fbfb8477714464 Mon Sep 17 00:00:00 2001 From: Don Koopa Date: Sun, 13 Nov 2016 17:55:39 +0100 Subject: [PATCH 5/5] Add check script --- composer.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/composer.json b/composer.json index 868a2060e..679d1f355 100644 --- a/composer.json +++ b/composer.json @@ -33,6 +33,10 @@ } }, "scripts": { + "check": [ + "@cs-check", + "@test" + ], "cs-check": "phpcs", "cs-fix": "phpcbf", "test": "phpunit --colors=always",