CS fixes

.php_cs

@@ -19,11 +19,14 @@ $finder = PhpCsFixer\Finder::create()
 
 return PhpCsFixer\Config::create()
     ->setUsingCache(true)
-    //->setUsingLinter(false)
     ->setRiskyAllowed(true)
     ->setRules(array(
         '@PSR2' => true,
-        'binary_operator_spaces' => true,
+        // some rules disabled as long as 1.x branch is maintained
+        'binary_operator_spaces' => array(
+            'align_double_arrow' => null,
+            'align_equals' => null,
+        ),
         'blank_line_before_return' => true,
         'cast_spaces' => true,
         'header_comment' => array('header' => $header),
@@ -31,29 +34,29 @@ return PhpCsFixer\Config::create()
         'method_separation' => true,
         'no_blank_lines_after_class_opening' => true,
         'no_blank_lines_after_phpdoc' => true,
-        'no_blank_lines_between_uses' => true,
         'no_empty_statement' => true,
         'no_extra_consecutive_blank_lines' => true,
         'no_leading_import_slash' => true,
         'no_leading_namespace_whitespace' => true,
         'no_trailing_comma_in_singleline_array' => true,
         'no_unused_imports' => true,
-        'no_whitespace_in_blank_lines' => true,
+        'no_whitespace_in_blank_line' => true,
         'object_operator_without_whitespace' => true,
         'phpdoc_align' => true,
         'phpdoc_indent' => true,
         'phpdoc_no_access' => true,
         'phpdoc_no_package' => true,
         'phpdoc_order' => true,
-        'phpdoc_scalar' => true,
+        //'phpdoc_scalar' => true,
         'phpdoc_trim' => true,
-        'phpdoc_type_to_var' => true,
+        //'phpdoc_types' => true,
         'psr0' => true,
-        'short_array_syntax' => true,
+        //'array_syntax' => array('syntax' => 'short'),
+        'declare_strict_types' => true,
         'single_blank_line_before_namespace' => true,
         'standardize_not_equals' => true,
         'ternary_operator_spaces' => true,
         'trailing_comma_in_multiline_array' => true,
     ))
-    ->finder($finder)
+    ->setFinder($finder)
 ;