Merge pull request #138 from hks-systeme/dependabot/composer/friendso…

…fphp/php-cs-fixer-3.2.0 composer(deps): bump friendsofphp/php-cs-fixer from 3.1.0 to 3.2.0
hks-systeme · Oct 6, 2021 · 780721d · 780721d
2 parents 4710ed6 + 08d130a
commit 780721d
Show file tree

Hide file tree

Showing 13 changed files with 97 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 For a full diff see [`2.2.0...main`][2.2.0...main].
 
+### Changed
+
+* Updated `friendsofphp/php-cs-fixer` ([#138]), by [@dependabot]
+
 ## [`2.2.0`][2.2.0]
 
 For a full diff see [`2.1.0...2.2.0`][2.1.0...2.2.0].
@@ -128,6 +132,7 @@ For a full diff see [`3a0205c...1.0.0`][3a0205c...1.0.0].
 [#130]: https://github.com/hks-systeme/php-cs-fixer-config/pull/130
 [#131]: https://github.com/hks-systeme/php-cs-fixer-config/pull/131
 [#132]: https://github.com/hks-systeme/php-cs-fixer-config/pull/132
+[#138]: https://github.com/hks-systeme/php-cs-fixer-config/pull/138
 
 [@dependabot]: https://github.com/apps/dependabot
 [@localheinz]: https://github.com/localheinz
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
   ],
   "require": {
     "php": "^7.2 || ^8.0",
-    "friendsofphp/php-cs-fixer": "~3.1.0"
+    "friendsofphp/php-cs-fixer": "~3.2.0"
   },
   "require-dev": {
     "ergebnis/composer-normalize": "^2.15.0",

diff --git a/composer.lock b/composer.lock
diff --git a/src/RuleSet/Php71.php b/src/RuleSet/Php71.php
@@ -25,6 +25,7 @@ final class Php71 extends AbstractRuleSet implements ExplicitRuleSet
         'array_syntax' => [
             'syntax' => 'short',
         ],
+        'assign_null_coalescing_to_coalesce_equal' => false,
         'backtick_to_shell_exec' => true,
         'binary_operator_spaces' => [
             'default' => 'single_space',
@@ -88,6 +89,7 @@ final class Php71 extends AbstractRuleSet implements ExplicitRuleSet
             'spacing' => 'one',
         ],
         'constant_case' => true,
+        'control_structure_continuation_position' => false,
         'date_time_immutable' => false,
         'declare_equal_normalize' => true,
         'declare_parentheses' => true,
@@ -122,6 +124,7 @@ final class Php71 extends AbstractRuleSet implements ExplicitRuleSet
         'empty_loop_body' => [
             'style' => 'braces',
         ],
+        'empty_loop_condition' => false,
         'encoding' => true,
         'ereg_to_preg' => true,
         'error_suppression' => true,
@@ -170,6 +173,7 @@ final class Php71 extends AbstractRuleSet implements ExplicitRuleSet
             'style' => 'pre',
         ],
         'indentation_type' => true,
+        'integer_literal_case' => false,
         'is_null' => true,
         'lambda_not_used_import' => true,
         'line_ending' => true,
@@ -190,6 +194,7 @@ final class Php71 extends AbstractRuleSet implements ExplicitRuleSet
             'on_multiline' => 'ensure_fully_multiline',
         ],
         'method_chaining_indentation' => true,
+        'modernize_strpos' => false,
         'modernize_types_casting' => true,
         'multiline_comment_opening_closing' => true,
         'multiline_whitespace_before_semicolons' => [
@@ -257,6 +262,7 @@ final class Php71 extends AbstractRuleSet implements ExplicitRuleSet
         'no_php4_constructor' => false,
         'no_short_bool_cast' => true,
         'no_singleline_whitespace_before_semicolons' => true,
+        'no_space_around_double_colon' => false,
         'no_spaces_after_function_name' => true,
         'no_spaces_around_offset' => true,
         'no_spaces_inside_parenthesis' => true,
@@ -291,6 +297,7 @@ final class Php71 extends AbstractRuleSet implements ExplicitRuleSet
         'not_operator_with_successor_space' => false,
         'nullable_type_declaration_for_default_null_value' => true,
         'object_operator_without_whitespace' => true,
+        'octal_notation' => false,
         'operator_linebreak' => [
             'only_booleans' => true,
             'position' => 'beginning',
@@ -549,6 +556,7 @@ final class Php71 extends AbstractRuleSet implements ExplicitRuleSet
         'static_lambda' => true,
         'strict_comparison' => false,
         'strict_param' => false,
+        'string_length_to_empty' => false,
         'string_line_ending' => true,
         'switch_case_semicolon_to_colon' => true,
         'switch_case_space' => true,

diff --git a/src/RuleSet/Php72.php b/src/RuleSet/Php72.php
@@ -25,6 +25,7 @@ final class Php72 extends AbstractRuleSet implements ExplicitRuleSet
         'array_syntax' => [
             'syntax' => 'short',
         ],
+        'assign_null_coalescing_to_coalesce_equal' => false,
         'backtick_to_shell_exec' => true,
         'binary_operator_spaces' => [
             'default' => 'single_space',
@@ -88,6 +89,7 @@ final class Php72 extends AbstractRuleSet implements ExplicitRuleSet
             'spacing' => 'one',
         ],
         'constant_case' => true,
+        'control_structure_continuation_position' => false,
         'date_time_immutable' => false,
         'declare_equal_normalize' => true,
         'declare_parentheses' => true,
@@ -122,6 +124,7 @@ final class Php72 extends AbstractRuleSet implements ExplicitRuleSet
         'empty_loop_body' => [
             'style' => 'braces',
         ],
+        'empty_loop_condition' => false,
         'encoding' => true,
         'ereg_to_preg' => true,
         'error_suppression' => true,
@@ -170,6 +173,7 @@ final class Php72 extends AbstractRuleSet implements ExplicitRuleSet
             'style' => 'pre',
         ],
         'indentation_type' => true,
+        'integer_literal_case' => false,
         'is_null' => true,
         'lambda_not_used_import' => true,
         'line_ending' => true,
@@ -190,6 +194,7 @@ final class Php72 extends AbstractRuleSet implements ExplicitRuleSet
             'on_multiline' => 'ensure_fully_multiline',
         ],
         'method_chaining_indentation' => true,
+        'modernize_strpos' => false,
         'modernize_types_casting' => true,
         'multiline_comment_opening_closing' => true,
         'multiline_whitespace_before_semicolons' => [
@@ -257,6 +262,7 @@ final class Php72 extends AbstractRuleSet implements ExplicitRuleSet
         'no_php4_constructor' => false,
         'no_short_bool_cast' => true,
         'no_singleline_whitespace_before_semicolons' => true,
+        'no_space_around_double_colon' => false,
         'no_spaces_after_function_name' => true,
         'no_spaces_around_offset' => true,
         'no_spaces_inside_parenthesis' => true,
@@ -291,6 +297,7 @@ final class Php72 extends AbstractRuleSet implements ExplicitRuleSet
         'not_operator_with_successor_space' => false,
         'nullable_type_declaration_for_default_null_value' => true,
         'object_operator_without_whitespace' => true,
+        'octal_notation' => false,
         'operator_linebreak' => [
             'only_booleans' => true,
             'position' => 'beginning',
@@ -549,6 +556,7 @@ final class Php72 extends AbstractRuleSet implements ExplicitRuleSet
         'static_lambda' => true,
         'strict_comparison' => false,
         'strict_param' => false,
+        'string_length_to_empty' => false,
         'string_line_ending' => true,
         'switch_case_semicolon_to_colon' => true,
         'switch_case_space' => true,

diff --git a/src/RuleSet/Php73.php b/src/RuleSet/Php73.php
@@ -25,6 +25,7 @@ final class Php73 extends AbstractRuleSet implements ExplicitRuleSet
         'array_syntax' => [
             'syntax' => 'short',
         ],
+        'assign_null_coalescing_to_coalesce_equal' => false,
         'backtick_to_shell_exec' => true,
         'binary_operator_spaces' => [
             'default' => 'single_space',
@@ -88,6 +89,7 @@ final class Php73 extends AbstractRuleSet implements ExplicitRuleSet
             'spacing' => 'one',
         ],
         'constant_case' => true,
+        'control_structure_continuation_position' => false,
         'date_time_immutable' => false,
         'declare_equal_normalize' => true,
         'declare_parentheses' => true,
@@ -122,6 +124,7 @@ final class Php73 extends AbstractRuleSet implements ExplicitRuleSet
         'empty_loop_body' => [
             'style' => 'braces',
         ],
+        'empty_loop_condition' => false,
         'encoding' => true,
         'ereg_to_preg' => true,
         'error_suppression' => true,
@@ -170,6 +173,7 @@ final class Php73 extends AbstractRuleSet implements ExplicitRuleSet
             'style' => 'pre',
         ],
         'indentation_type' => true,
+        'integer_literal_case' => false,
         'is_null' => true,
         'lambda_not_used_import' => true,
         'line_ending' => true,
@@ -190,6 +194,7 @@ final class Php73 extends AbstractRuleSet implements ExplicitRuleSet
             'on_multiline' => 'ensure_fully_multiline',
         ],
         'method_chaining_indentation' => true,
+        'modernize_strpos' => false,
         'modernize_types_casting' => true,
         'multiline_comment_opening_closing' => true,
         'multiline_whitespace_before_semicolons' => [
@@ -257,6 +262,7 @@ final class Php73 extends AbstractRuleSet implements ExplicitRuleSet
         'no_php4_constructor' => false,
         'no_short_bool_cast' => true,
         'no_singleline_whitespace_before_semicolons' => true,
+        'no_space_around_double_colon' => false,
         'no_spaces_after_function_name' => true,
         'no_spaces_around_offset' => true,
         'no_spaces_inside_parenthesis' => true,
@@ -293,6 +299,7 @@ final class Php73 extends AbstractRuleSet implements ExplicitRuleSet
         'not_operator_with_successor_space' => false,
         'nullable_type_declaration_for_default_null_value' => true,
         'object_operator_without_whitespace' => true,
+        'octal_notation' => false,
         'operator_linebreak' => [
             'only_booleans' => true,
             'position' => 'beginning',
@@ -551,6 +558,7 @@ final class Php73 extends AbstractRuleSet implements ExplicitRuleSet
         'static_lambda' => true,
         'strict_comparison' => false,
         'strict_param' => false,
+        'string_length_to_empty' => false,
         'string_line_ending' => true,
         'switch_case_semicolon_to_colon' => true,
         'switch_case_space' => true,

diff --git a/src/RuleSet/Php74.php b/src/RuleSet/Php74.php
@@ -25,6 +25,7 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet
         'array_syntax' => [
             'syntax' => 'short',
         ],
+        'assign_null_coalescing_to_coalesce_equal' => false,
         'backtick_to_shell_exec' => true,
         'binary_operator_spaces' => [
             'default' => 'single_space',
@@ -88,6 +89,7 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet
             'spacing' => 'one',
         ],
         'constant_case' => true,
+        'control_structure_continuation_position' => false,
         'date_time_immutable' => false,
         'declare_equal_normalize' => true,
         'declare_parentheses' => true,
@@ -122,6 +124,7 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet
         'empty_loop_body' => [
             'style' => 'braces',
         ],
+        'empty_loop_condition' => false,
         'encoding' => true,
         'ereg_to_preg' => true,
         'error_suppression' => true,
@@ -170,6 +173,7 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet
             'style' => 'pre',
         ],
         'indentation_type' => true,
+        'integer_literal_case' => false,
         'is_null' => true,
         'lambda_not_used_import' => true,
         'line_ending' => true,
@@ -190,6 +194,7 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet
             'on_multiline' => 'ensure_fully_multiline',
         ],
         'method_chaining_indentation' => true,
+        'modernize_strpos' => false,
         'modernize_types_casting' => true,
         'multiline_comment_opening_closing' => true,
         'multiline_whitespace_before_semicolons' => [
@@ -257,6 +262,7 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet
         'no_php4_constructor' => false,
         'no_short_bool_cast' => true,
         'no_singleline_whitespace_before_semicolons' => true,
+        'no_space_around_double_colon' => false,
         'no_spaces_after_function_name' => true,
         'no_spaces_around_offset' => true,
         'no_spaces_inside_parenthesis' => true,
@@ -293,6 +299,7 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet
         'not_operator_with_successor_space' => false,
         'nullable_type_declaration_for_default_null_value' => true,
         'object_operator_without_whitespace' => true,
+        'octal_notation' => false,
         'operator_linebreak' => [
             'only_booleans' => true,
             'position' => 'beginning',
@@ -551,6 +558,7 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet
         'static_lambda' => true,
         'strict_comparison' => false,
         'strict_param' => false,
+        'string_length_to_empty' => false,
         'string_line_ending' => true,
         'switch_case_semicolon_to_colon' => true,
         'switch_case_space' => true,
@@ -563,6 +571,7 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet
             'elements' => [
                 'arguments',
                 'arrays',
+                'parameters',
             ],
         ],
         'trim_array_spaces' => true,