Merge branch 'develop'

Author: jrean

.php_cs

@@ -0,0 +1,8 @@
+<?php
+
+// Needed to get styleci-bridge loaded
+require_once __DIR__.'/vendor/sllh/php-cs-fixer-styleci-bridge/autoload.php';
+
+use SLLH\StyleCIBridge\ConfigBridge;
+
+return ConfigBridge::create();

.styleci.yml

@@ -0,0 +1 @@
+preset: recommended

composer.json

@@ -27,15 +27,18 @@
         "phpunit/phpunit": "^5.5",
         "fzaninotto/faker": "^1.6",
         "mockery/mockery": "^0.9.5",
-        "satooshi/php-coveralls": "^1.0"
+        "satooshi/php-coveralls": "^1.0",
+        "friendsofphp/php-cs-fixer": "^1.12",
+        "sllh/php-cs-fixer-styleci-bridge": "^2.1"
     },
     "autoload-dev": {
         "psr-4": {
             "Jrean\\UserVerification\\Tests\\": "tests"
         }
     },
     "scripts": {
-        "test": "phpunit --colors=always;",
-        "travis": "phpunit --coverage-clover build/logs/clover.xml"
+        "test": "phpunit --colors=always; ./vendor/bin/php-cs-fixer fix src --dry-run --diff --ansi",
+        "travis": "phpunit --coverage-clover build/logs/clover.xml",
+        "fix": "./vendor/bin/php-cs-fixer fix src --diff --ansi"
     }
 }