From 8273113c853ccbdbb106b7ea530298e0841d81e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=B6ller?= <am@localheinz.com>
Date: Wed, 17 Oct 2018 09:49:21 +0200
Subject: [PATCH 1/2] Fix: Pin friendsofphp/php-cs-fixer to minor version

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 8d6e153f..5d20e919 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
         "icecave/parity": "1.0.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^2.1",
+        "friendsofphp/php-cs-fixer": "~2.2.20",
         "json-schema/JSON-Schema-Test-Suite": "1.2.0",
         "phpunit/phpunit": "^4.8.35"
     },

From 276b51cc1309af95858cec4b7c8dbbcf37f9f75a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=B6ller?= <am@localheinz.com>
Date: Wed, 17 Oct 2018 09:51:50 +0200
Subject: [PATCH 2/2] Fix: Remove unknown fixers

---
 .php_cs.dist | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.php_cs.dist b/.php_cs.dist
index c4e84b4e..0b5e2b2c 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -11,11 +11,9 @@ $config
         '@PSR2' => true,
         '@Symfony' => true,
         // additionally
-        'align_multiline_comment' => array('comment_type' => 'phpdocs_like'),
         'array_syntax' => array('syntax' => 'long'),
         'binary_operator_spaces' => false,
         'concat_space' => array('spacing' => 'one'),
-        'increment_style' => false,
         'no_useless_else' => true,
         'no_useless_return' => true,
         'ordered_imports' => true,
@@ -25,7 +23,6 @@ $config
         'pre_increment' => false,
         'simplified_null_return' => false,
         'trailing_comma_in_multiline_array' => false,
-        'yoda_style' => null,
     ))
     ->setFinder($finder)
 ;