CS fixes

.php_cs

@@ -24,14 +24,13 @@ return PhpCsFixer\Config::create()
         '@PSR2' => true,
         // some rules disabled as long as 1.x branch is maintained
         'binary_operator_spaces' => array(
-            'align_double_arrow' => null,
-            'align_equals' => null,
+            'default' => null,
         ),
-        'blank_line_before_return' => true,
-        'cast_spaces' => true,
-        'header_comment' => array('header' => $header),
+        'blank_line_before_statement' => ['statements' => ['continue', 'declare', 'return', 'throw', 'try']],
+        'cast_spaces' => ['space' => 'single'],
+        'header_comment' => ['header' => $header],
         'include' => true,
-        'method_separation' => true,
+        'class_attributes_separation' => ['elements' => ['method']],
         'no_blank_lines_after_class_opening' => true,
         'no_blank_lines_after_phpdoc' => true,
         'no_empty_statement' => true,