Merge 4db306d40b into b0d41af3ee

.gitignore

@@ -3,6 +3,9 @@ mage.phar
 bin
 !bin/mage
 
+# development tools
+.php_cs.cache
+
 # OS generated files # // GitHub Recommendation
 ######################
 .DS_Store*

.php_cs

@@ -0,0 +1,12 @@
+<?php
+
+return Symfony\CS\Config\Config::create()
+    ->level(Symfony\CS\FixerInterface::PSR2_LEVEL)
+    ->setUsingCache(true)
+    ->finder(
+        Symfony\CS\Finder\DefaultFinder::create()
+            ->in(__DIR__)
+	)
+;
+
+// vim:ft=php

composer.json

@@ -11,7 +11,8 @@
     "require-dev": {
         "phpunit/phpunit": "4.3.5",
         "satooshi/php-coveralls": ">=0.6.1",
-        "php-mock/php-mock": "^0.1"
+        "php-mock/php-mock": "^0.1",
+        "fabpot/php-cs-fixer": "*"
     },
     "autoload": {
         "psr-4": {
@@ -25,6 +26,11 @@
             "MageTest\\": "./tests/MageTest"
         }
     },
+    "scripts": {
+        "cs-fix": [
+            "php-cs-fixer -vv -n fix; echo"
+        ]
+    },
     "config": {
         "bin-dir": "bin"
     },