Apply code standards

Author: jbboehr

Diff for: Makefile

@@ -1,30 +1,32 @@
 
-COMPOSER := $(shell which composer || which composer.phar)
+PHPCS_OPTS := -n -p --standard=vendor/jbboehr/coding-standard/JbboehrStandard/ruleset.xml \
+	--report=full --tab-width=4 --encoding=utf-8 --ignore=tests/Spec/* src tests
+
+cbf: vendor
+	./vendor/bin/phpcbf $(PHPCS_OPTS)
 
 clean:
 	rm -rf docs reports
 
-composer.phar:
-	@if [ -z "$(COMPOSER)" ]; then wget https://getcomposer.org/composer.phar; chmod +x composer.phar; fi
-	@if [ ! -z "$(COMPOSER)" ]; then ln -s $(COMPOSER) composer.phar; fi
-
 coverage: vendor
 	./vendor/bin/phpunit --coverage-text --coverage-html=reports
 
+cs: vendor
+	./vendor/bin/phpcs $(PHPCS_OPTS)
+
 docs:
 	apigen generate
 
-php-cs-fixer: vendor
-	./vendor/bin/php-cs-fixer fix src --fixers=-braces,-elseif,-parenthesis,-phpdoc_no_access,-phpdoc_no_empty_return,-phpdoc_params,-phpdoc_scalar,-phpdoc_separation,-phpdoc_short_description,-align_double_arrow,-align_equals,-return,long_array_syntax,ordered_use,newline_after_open_tag,concat_with_spaces
-
-test: vendor tests/Spec
+phpunit: vendor tests/Spec
 	./vendor/bin/phpunit
 
+test: cs phpunit
+
 tests/Spec:
 	php generate-tests.php
 
-vendor: composer.phar
-	./composer.phar install
+vendor: 
+	composer install --optimize-autoloader
 
-.PHONY: clean coverage php-cs-fixer test
+.PHONY: cbf clean coverage cs phpunit test
 

Diff for: composer.json

@@ -25,10 +25,11 @@
         "php" : ">=5.3.0"
     },
     "require-dev": {
-        "fabpot/php-cs-fixer": "~1.8",
+        "jbboehr/coding-standard": "1.0.*@dev",
         "pear/console_table": "~1.2.1",
         "phpunit/phpunit": "~4.5",
-        "scrutinizer/ocular": "~1.1"
+        "scrutinizer/ocular": "~1.1",
+        "squizlabs/php_codesniffer": "~2.3.2"
     },
     "type" : "library"
 }