coding style updates

Signed-off-by: Demin Yin <deminy@deminy.net>
deminy · Oct 6, 2021 · 3aeab59 · 3aeab59
1 parent e17f3cf
commit 3aeab59
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -2,15 +2,16 @@
 
 declare(strict_types=1);
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRiskyAllowed(true)
     ->setRules([
         '@DoctrineAnnotation'                    => true,
         '@PhpCsFixer'                            => true,
         '@PSR2'                                  => true,
         '@Symfony'                               => true,
+        'align_multiline_comment'                => ['comment_type' => 'all_multiline'],
         'array_syntax'                           => ['syntax' => 'short'],
-        'binary_operator_spaces'                 => ['align_double_arrow' => true, 'align_equals' => true],
+        'binary_operator_spaces'                 => ['operators' => ['=' => 'align', '=>' => 'align', ]],
         'blank_line_after_namespace'             => true,
         'blank_line_before_statement'            => ['statements' => ['declare']],
         'class_attributes_separation'            => true,
@@ -19,7 +20,7 @@
         'combine_consecutive_unsets'             => true,
         'declare_strict_types'                   => true,
         'general_phpdoc_annotation_remove'       => ['annotations' => ['author']],
-        'header_comment'                         => ['commentType' => 'PHPDoc', 'header' => '', 'separate' => 'bottom', 'location' => 'after_open'],
+        'header_comment'                         => ['comment_type' => 'PHPDoc', 'header' => '', 'separate' => 'bottom', 'location' => 'after_open'],
         'increment_style'                        => ['style' => 'post'],
         'lambda_not_used_import'                 => false,
         'linebreak_after_opening_tag'            => true,
@@ -29,11 +30,13 @@
         'multiline_whitespace_before_semicolons' => ['strategy' => 'new_line_for_chained_calls'],
         'no_unused_imports'                      => true,
         'no_useless_else'                        => true,
+        'no_useless_return'                      => true,
         'not_operator_with_space'                => false,
         'not_operator_with_successor_space'      => false,
         'php_unit_strict'                        => false,
         'phpdoc_align'                           => ['align' => 'left'],
-        'phpdoc_no_empty_return'                 => true,
+        'phpdoc_no_empty_return'                 => false,
+        'phpdoc_types_order'                     => ['sort_algorithm' => 'none', 'null_adjustment' => 'always_last'],
         'phpdoc_separation'                      => false,
         'phpdoc_summary'                         => false,
         'ordered_class_elements'                 => true,
@@ -45,4 +48,4 @@
         'yoda_style'                             => ['always_move_variable' => false, 'equal' => false, 'identical' => false],
     ])
     ->setFinder(PhpCsFixer\Finder::create()->in(__DIR__ . '/examples'))
-    ->setUsingCache(false);
+    ->setUsingCache(false);