Merge branch '5.0'

sebastianbergmann · Dec 24, 2023 · a816621 · a816621
2 parents 22fb6a7 + d6189fd
commit a816621
Show file tree

Hide file tree

Showing 22 changed files with 98 additions and 72 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -25,6 +25,10 @@
         'backtick_to_shell_exec' => true,
         'binary_operator_spaces' => [
             'operators' => [
+                '*=' => 'align_single_space_minimal',
+                '+=' => 'align_single_space_minimal',
+                '-=' => 'align_single_space_minimal',
+                '/=' => 'align_single_space_minimal',
                 '=' => 'align_single_space_minimal',
                 '=>' => 'align_single_space_minimal',
             ],
@@ -57,6 +61,14 @@
                 'yield_from',
             ],
         ],
+        'blank_lines_before_namespace' => [
+            'max_line_breaks' => 1,
+            'min_line_breaks' => 0,
+        ],
+        'braces_position' => [
+            'anonymous_classes_opening_brace' => 'next_line_unless_newline_at_signature_end',
+            'anonymous_functions_opening_brace' => 'next_line_unless_newline_at_signature_end',
+        ],
         'cast_spaces' => true,
         'class_attributes_separation' => [
             'elements' => [
@@ -70,15 +82,11 @@
         'combine_consecutive_issets' => true,
         'combine_consecutive_unsets' => true,
         'combine_nested_dirname' => true,
-        'compact_nullable_typehint' => true,
+        'compact_nullable_type_declaration' => true,
         'concat_space' => ['spacing' => 'one'],
         'constant_case' => true,
         'control_structure_braces' => true,
         'control_structure_continuation_position' => true,
-        'curly_braces_position' => [
-            'anonymous_functions_opening_brace' => 'next_line_unless_newline_at_signature_end',
-            'anonymous_classes_opening_brace' => 'next_line_unless_newline_at_signature_end',
-        ],
         'declare_equal_normalize' => ['space' => 'none'],
         'declare_parentheses' => true,
         'declare_strict_types' => true,
@@ -94,7 +102,6 @@
         'fully_qualified_strict_types' => true,
         'function_declaration' => true,
         'function_to_constant' => true,
-        'function_typehint_space' => true,
         'get_class_to_class_keyword' => true,
         'global_namespace_import' => [
             'import_classes' => true,
@@ -106,9 +113,10 @@
         'implode_call' => true,
         'include' => true,
         'increment_style' => [
-            'style' => PhpCsFixer\Fixer\Operator\IncrementStyleFixer::STYLE_POST,
+            'style' => 'post',
         ],
         'indentation_type' => true,
+        'integer_literal_case' => true,
         'is_null' => true,
         'lambda_not_used_import' => true,
         'line_ending' => true,
@@ -122,6 +130,8 @@
         'method_argument_space' => [
             'on_multiline' => 'ensure_fully_multiline',
         ],
+        'method_chaining_indentation' => true,
+        'modernize_strpos' => true,
         'modernize_types_casting' => true,
         'multiline_comment_opening_closing' => true,
         'multiline_whitespace_before_semicolons' => true,
@@ -132,18 +142,17 @@
                 '@internal',
             ],
         ],
-        'native_function_type_declaration_casing' => true,
-        'new_with_braces' => [
-            'named_class' => false,
+        'native_type_declaration_casing' => true,
+        'new_with_parentheses' => [
             'anonymous_class' => false,
+            'named_class' => false,
         ],
         'no_alias_functions' => true,
         'no_alias_language_construct_call' => true,
         'no_alternative_syntax' => true,
         'no_binary_string' => true,
         'no_blank_lines_after_class_opening' => true,
         'no_blank_lines_after_phpdoc' => true,
-        'no_blank_lines_before_namespace' => true,
         'no_break_comment' => true,
         'no_closing_tag' => true,
         'no_empty_comment' => true,
@@ -154,15 +163,15 @@
         'no_leading_import_slash' => true,
         'no_leading_namespace_whitespace' => true,
         'no_mixed_echo_print' => ['use' => 'print'],
-        'no_multiple_statements_per_line' => true,
         'no_multiline_whitespace_around_double_arrow' => true,
+        'no_multiple_statements_per_line' => true,
         'no_null_property_initialization' => true,
         'no_php4_constructor' => true,
         'no_short_bool_cast' => true,
         'no_singleline_whitespace_before_semicolons' => true,
+        'no_space_around_double_colon' => true,
         'no_spaces_after_function_name' => true,
         'no_spaces_around_offset' => true,
-        'no_spaces_inside_parenthesis' => true,
         'no_superfluous_elseif' => true,
         'no_superfluous_phpdoc_tags' => [
             'allow_mixed' => true,
@@ -171,22 +180,25 @@
         'no_trailing_whitespace' => true,
         'no_trailing_whitespace_in_comment' => true,
         'no_trailing_whitespace_in_string' => true,
+        'no_unneeded_braces' => true,
         'no_unneeded_control_parentheses' => true,
-        'no_unneeded_curly_braces' => true,
         'no_unneeded_final_method' => true,
         'no_unneeded_import_alias' => true,
         'no_unreachable_default_argument_value' => true,
         'no_unset_cast' => true,
         'no_unset_on_property' => true,
         'no_unused_imports' => true,
+        'no_useless_concat_operator' => true,
         'no_useless_else' => true,
+        'no_useless_nullsafe_operator' => true,
         'no_useless_return' => true,
         'no_useless_sprintf' => true,
         'no_whitespace_before_comma_in_array' => true,
         'no_whitespace_in_blank_line' => true,
         'non_printable_character' => true,
         'normalize_index_brace' => true,
         'object_operator_without_whitespace' => true,
+        'octal_notation' => true,
         'operator_linebreak' => [
             'only_booleans' => true,
             'position' => 'end',
@@ -217,16 +229,17 @@
         ],
         'ordered_imports' => [
             'imports_order' => [
-                PhpCsFixer\Fixer\Import\OrderedImportsFixer::IMPORT_TYPE_CONST,
-                PhpCsFixer\Fixer\Import\OrderedImportsFixer::IMPORT_TYPE_FUNCTION,
-                PhpCsFixer\Fixer\Import\OrderedImportsFixer::IMPORT_TYPE_CLASS,
+                'const',
+                'function',
+                'class',
             ]
         ],
         'ordered_interfaces' => [
             'direction' => 'ascend',
             'order' => 'alpha',
         ],
         'ordered_traits' => true,
+        'ordered_types' => true,
         'php_unit_set_up_tear_down_visibility' => true,
         'php_unit_test_case_static_method_calls' => [
             'call_type' => 'this',
@@ -250,14 +263,15 @@
                 'uses',
             ],
         ],
+        'phpdoc_param_order' => true,
         'phpdoc_return_self_reference' => true,
         'phpdoc_scalar' => true,
         'phpdoc_separation' => true,
         'phpdoc_single_line_var_spacing' => true,
         'phpdoc_summary' => true,
         'phpdoc_tag_casing' => true,
         'phpdoc_tag_type' => true,
-        'phpdoc_to_comment' => true,
+        'phpdoc_to_comment' => false,
         'phpdoc_trim' => true,
         'phpdoc_trim_consecutive_blank_line_separation' => true,
         'phpdoc_types' => ['groups' => ['simple', 'meta']],
@@ -279,15 +293,20 @@
         'single_class_element_per_statement' => true,
         'single_import_per_statement' => true,
         'single_line_after_imports' => true,
+        'single_line_comment_spacing' => true,
         'single_quote' => true,
         'single_space_around_construct' => true,
         'single_trait_insert_per_statement' => true,
         'space_after_semicolon' => true,
+        'spaces_inside_parentheses' => [
+            'space' => 'none',
+        ],
         'standardize_increment' => true,
         'standardize_not_equals' => true,
         'statement_indentation' => true,
         'static_lambda' => true,
         'strict_param' => true,
+        'string_length_to_empty'=> true,
         'string_line_ending' => true,
         'switch_case_semicolon_to_colon' => true,
         'switch_case_space' => true,
@@ -297,13 +316,18 @@
         'ternary_to_null_coalescing' => true,
         'trailing_comma_in_multiline' => [
             'elements' => [
-                'arrays'
+                'arguments',
+                'arrays',
+                'match',
             ]
         ],
         'trim_array_spaces' => true,
-        'types_spaces' => [
-            'space' => 'none',
+        'type_declaration_spaces' => [
+            'elements' => [
+                'function',
+            ],
         ],
+        'types_spaces' => true,
         'unary_operator_spaces' => true,
         'visibility_required' => [
             'elements' => [
@@ -316,4 +340,6 @@
         'whitespace_after_comma_in_array' => true,
     ]);
 
+$config->setCacheFile(__DIR__ . '/.php-cs-fixer.cache/' . sha1(@trim((string) @shell_exec('git rev-parse --abbrev-ref HEAD'))));
+
 return $config;
diff --git a/src/ArrayComparator.php b/src/ArrayComparator.php
@@ -56,7 +56,7 @@ public function assertEquals(mixed $expected, mixed $actual, float $delta = 0.0,
                 $expectedAsString .= sprintf(
                     "    %s => %s\n",
                     $exporter->export($key),
-                    $exporter->shortenedExport($value)
+                    $exporter->shortenedExport($value),
                 );
 
                 $equal = false;
@@ -71,25 +71,25 @@ public function assertEquals(mixed $expected, mixed $actual, float $delta = 0.0,
                 $expectedAsString .= sprintf(
                     "    %s => %s\n",
                     $exporter->export($key),
-                    $exporter->shortenedExport($value)
+                    $exporter->shortenedExport($value),
                 );
 
                 $actualAsString .= sprintf(
                     "    %s => %s\n",
                     $exporter->export($key),
-                    $exporter->shortenedExport($actual[$key])
+                    $exporter->shortenedExport($actual[$key]),
                 );
             } catch (ComparisonFailure $e) {
                 $expectedAsString .= sprintf(
                     "    %s => %s\n",
                     $exporter->export($key),
-                    $e->getExpectedAsString() ? $this->indent($e->getExpectedAsString()) : $exporter->shortenedExport($e->getExpected())
+                    $e->getExpectedAsString() ? $this->indent($e->getExpectedAsString()) : $exporter->shortenedExport($e->getExpected()),
                 );
 
                 $actualAsString .= sprintf(
                     "    %s => %s\n",
                     $exporter->export($key),
-                    $e->getActualAsString() ? $this->indent($e->getActualAsString()) : $exporter->shortenedExport($e->getActual())
+                    $e->getActualAsString() ? $this->indent($e->getActualAsString()) : $exporter->shortenedExport($e->getActual()),
                 );
 
                 $equal = false;
@@ -100,7 +100,7 @@ public function assertEquals(mixed $expected, mixed $actual, float $delta = 0.0,
             $actualAsString .= sprintf(
                 "    %s => %s\n",
                 $exporter->export($key),
-                $exporter->shortenedExport($value)
+                $exporter->shortenedExport($value),
             );
 
             $equal = false;
@@ -115,7 +115,7 @@ public function assertEquals(mixed $expected, mixed $actual, float $delta = 0.0,
                 $actual,
                 $expectedAsString,
                 $actualAsString,
-                'Failed asserting that two arrays are equal.'
+                'Failed asserting that two arrays are equal.',
             );
         }
     }

diff --git a/src/DOMNodeComparator.php b/src/DOMNodeComparator.php
@@ -42,7 +42,7 @@ public function assertEquals(mixed $expected, mixed $actual, float $delta = 0.0,
                 $actual,
                 $expectedAsString,
                 $actualAsString,
-                sprintf("Failed asserting that two DOM %s are equal.\n", $type)
+                sprintf("Failed asserting that two DOM %s are equal.\n", $type),
             );
         }
     }

diff --git a/src/DateTimeComparator.php b/src/DateTimeComparator.php
@@ -54,7 +54,7 @@ public function assertEquals(mixed $expected, mixed $actual, float $delta = 0.0,
                 $actual,
                 $this->dateTimeToString($expected),
                 $this->dateTimeToString($actual),
-                'Failed asserting that two DateTime objects are equal.'
+                'Failed asserting that two DateTime objects are equal.',
             );
         }
     }

diff --git a/src/NumericComparator.php b/src/NumericComparator.php
@@ -49,8 +49,8 @@ public function assertEquals(mixed $expected, mixed $actual, float $delta = 0.0,
                 sprintf(
                     'Failed asserting that %s matches expected %s.',
                     $exporter->export($actual),
-                    $exporter->export($expected)
-                )
+                    $exporter->export($expected),
+                ),
             );
         }
     }

diff --git a/src/ObjectComparator.php b/src/ObjectComparator.php
@@ -42,8 +42,8 @@ public function assertEquals(mixed $expected, mixed $actual, float $delta = 0.0,
                 sprintf(
                     '%s is not instance of expected class "%s".',
                     $exporter->export($actual),
-                    $expected::class
-                )
+                    $expected::class,
+                ),
             );
         }
 
@@ -66,7 +66,7 @@ public function assertEquals(mixed $expected, mixed $actual, float $delta = 0.0,
                     $delta,
                     $canonicalize,
                     $ignoreCase,
-                    $processed
+                    $processed,
                 );
             } catch (ComparisonFailure $e) {
                 throw new ComparisonFailure(
@@ -75,7 +75,7 @@ public function assertEquals(mixed $expected, mixed $actual, float $delta = 0.0,
                     // replace "Array" with "MyClass object"
                     substr_replace($e->getExpectedAsString(), $expected::class . ' Object', 0, 5),
                     substr_replace($e->getActualAsString(), $actual::class . ' Object', 0, 5),
-                    'Failed asserting that two objects are equal.'
+                    'Failed asserting that two objects are equal.',
                 );
             }
         }

diff --git a/src/ResourceComparator.php b/src/ResourceComparator.php
@@ -35,7 +35,7 @@ public function assertEquals(mixed $expected, mixed $actual, float $delta = 0.0,
                 $expected,
                 $actual,
                 $exporter->export($expected),
-                $exporter->export($actual)
+                $exporter->export($actual),
             );
         }
     }

diff --git a/src/ScalarComparator.php b/src/ScalarComparator.php
@@ -59,7 +59,7 @@ public function assertEquals(mixed $expected, mixed $actual, float $delta = 0.0,
                 $actual,
                 $exporter->export($expected),
                 $exporter->export($actual),
-                'Failed asserting that two strings are equal.'
+                'Failed asserting that two strings are equal.',
             );
         }
 
@@ -73,8 +73,8 @@ public function assertEquals(mixed $expected, mixed $actual, float $delta = 0.0,
                 sprintf(
                     'Failed asserting that %s matches expected %s.',
                     $exporter->export($actual),
-                    $exporter->export($expected)
-                )
+                    $exporter->export($expected),
+                ),
             );
         }
     }

diff --git a/src/SplObjectStorageComparator.php b/src/SplObjectStorageComparator.php
@@ -37,7 +37,7 @@ public function assertEquals(mixed $expected, mixed $actual, float $delta = 0.0,
                     $actual,
                     $exporter->export($expected),
                     $exporter->export($actual),
-                    'Failed asserting that two objects are equal.'
+                    'Failed asserting that two objects are equal.',
                 );
             }
         }
@@ -49,7 +49,7 @@ public function assertEquals(mixed $expected, mixed $actual, float $delta = 0.0,
                     $actual,
                     $exporter->export($expected),
                     $exporter->export($actual),
-                    'Failed asserting that two objects are equal.'
+                    'Failed asserting that two objects are equal.',
                 );
             }
         }

diff --git a/src/TypeComparator.php b/src/TypeComparator.php
@@ -35,8 +35,8 @@ public function assertEquals(mixed $expected, mixed $actual, float $delta = 0.0,
                 sprintf(
                     '%s does not match expected type "%s".',
                     (new Exporter)->shortenedExport($actual),
-                    gettype($expected)
-                )
+                    gettype($expected),
+                ),
             );
         }
     }