From f7c9b779e5c14ad37d27b108f2a370bb3c0312e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dariusz=20Rumi=C5=84ski?= <dariusz.ruminski@gmail.com>
Date: Sat, 9 Jun 2018 14:39:29 +0200
Subject: [PATCH] DX: Update PHP CS Fixer (#3)

---
 .php_cs.dist           | 34 +++++++++++++++++++++++++++++++---
 composer.json          |  2 +-
 src/PolyfillTrait7.php |  2 +-
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/.php_cs.dist b/.php_cs.dist
index 149e4db..8a2af04 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -14,20 +14,48 @@ return PhpCsFixer\Config::create()
     ->setRules(array(
         '@Symfony' => true,
         '@Symfony:risky' => true,
-        'array_syntax' => array('syntax' => 'short'),
+        'align_multiline_comment' => true,
+        'array_indentation' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'blank_line_before_statement' => true,
+        'combine_consecutive_issets' => true,
         'combine_consecutive_unsets' => true,
-        'header_comment' => array('header' => $header),
+        'comment_to_phpdoc' => true,
+        'compact_nullable_typehint' => true,
+        'escape_implicit_backslashes' => true,
+        'explicit_indirect_variable' => true,
+        'explicit_string_variable' => true,
+        'final_internal_class' => true,
+        'fully_qualified_strict_types' => true,
+        'function_to_constant' => ['functions' => ['get_class', 'get_called_class', 'php_sapi_name', 'phpversion', 'pi']],
+        'header_comment' => ['header' => $header],
         'heredoc_to_nowdoc' => true,
-        'no_extra_consecutive_blank_lines' => array('break', 'continue', 'extra', 'return', 'throw', 'use', 'parenthesis_brace_block', 'square_brace_block', 'curly_brace_block'),
+        'list_syntax' => ['syntax' => 'long'],
+        'logical_operators' => true,
+        'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline'],
+        'method_chaining_indentation' => true,
+        'multiline_comment_opening_closing' => true,
+        'no_alternative_syntax' => true,
+        'no_binary_string' => true,
+        'no_extra_blank_lines' => ['tokens' => ['break', 'continue', 'extra', 'return', 'throw', 'use', 'parenthesis_brace_block', 'square_brace_block', 'curly_brace_block']],
+        'no_null_property_initialization' => true,
         'no_short_echo_tag' => true,
+        'no_superfluous_elseif' => true,
+        'no_unneeded_curly_braces' => true,
+        'no_unneeded_final_method' => true,
         'no_unreachable_default_argument_value' => true,
+        'no_unset_on_property' => true,
         'no_useless_else' => true,
         'no_useless_return' => true,
         'ordered_class_elements' => true,
         'ordered_imports' => true,
         'phpdoc_add_missing_param_annotation' => true,
         'phpdoc_order' => true,
+        'phpdoc_trim_consecutive_blank_line_separation' => true,
+        'phpdoc_types_order' => true,
+        'return_assignment' => true,
         'semicolon_after_instruction' => true,
+        'single_line_comment_style' => true,
         'strict_comparison' => true,
         'strict_param' => true,
     ))
diff --git a/composer.json b/composer.json
index e04f450..f26f435 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
         "phpunit/phpunit": "^4.0 || ^5.3 || ^6.0 || ^7.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^2.11"
+        "friendsofphp/php-cs-fixer": "^2.12"
     },
     "conflict": {
         "hhvm": "*"
diff --git a/src/PolyfillTrait7.php b/src/PolyfillTrait7.php
index 24462ea..5d06b95 100644
--- a/src/PolyfillTrait7.php
+++ b/src/PolyfillTrait7.php
@@ -13,7 +13,7 @@
 
 namespace PHPUnitGoodPractices\Polyfill;
 
-/*
+/**
  * @internal
  */
 trait PolyfillTrait7