Update the coding standard

woohoolabs · Dec 21, 2018 · c562003 · c562003
1 parent 594d81a
commit c562003
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 25 deletions.
diff --git a/.styleci.yml b/.styleci.yml
diff --git a/Makefile b/Makefile
@@ -27,13 +27,7 @@ test:
 	docker-compose -f docker-compose.yml up
 
 cs:
-	docker-compose -f docker-compose.yml run yin-php /var/www/vendor/bin/phpcs \
-	    --standard=/var/www/phpcs.xml \
-	    --encoding=UTF-8 \
-	    --report-full \
-	   /var/www/src/ /var/www/tests/
+	docker-compose -f docker-compose.yml run --rm yin-php /var/www/vendor/bin/phpcs --standard=/var/www/phpcs.xml
 
 cs-fix:
-	docker-compose -f docker-compose.yml run yin-php /var/www/vendor/bin/phpcbf \
-	    --standard=/var/www/phpcs.xml \
-	   /var/www/src/ /var/www/tests/
+	docker-compose -f docker-compose.yml run --rm yin-php /var/www/vendor/bin/phpcbf --standard=/var/www/phpcs.xml
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
         "phpunit/phpunit": "^7.0.0",
         "seld/jsonlint": "^1.7.0",
         "squizlabs/php_codesniffer": "^3.4.0",
-        "woohoolabs/coding-standard": "dev-master as 1.0.0",
+        "woohoolabs/coding-standard": "^1.0.0",
         "zendframework/zend-diactoros": "^2.0.0",
         "zendframework/zend-httphandlerrunner": "^1.0.0"
     },

diff --git a/phpcs.xml b/phpcs.xml
@@ -3,10 +3,13 @@
     <description>PHP Coding Standards for Yin</description>
 
     <arg name="basepath" value="."/>
-    <arg name="extensions" value="php"/>
+    <arg name="cache" value=".phpcs-cache"/>
     <arg name="colors" />
+    <arg name="encoding" value="UTF-8"/>
+    <arg name="extensions" value="php"/>
     <arg name="parallel" value="80"/>
-    <arg name="cache" value=".phpcs-cache"/>
+    <arg name="report" value="code"/>
+    <arg name="report-width" value="160"/>
 
     <!-- Show progress of the run -->
     <arg value="nps"/>