Merge branch '8.5' into 9.6

Author: sebastianbergmann

.php-cs-fixer.dist.php

@@ -109,9 +109,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,
@@ -158,8 +159,8 @@
         '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,
@@ -184,6 +185,7 @@
         'no_unset_cast' => true,
         'no_unset_on_property' => true,
         'no_unused_imports' => true,
+        'no_useless_concat_operator' => true,
         'no_useless_else' => true,
         'no_useless_return' => true,
         'no_useless_sprintf' => true,
@@ -222,9 +224,9 @@
         ],
         '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' => [
@@ -248,7 +250,6 @@
         'phpdoc_no_package' => true,
         'phpdoc_no_useless_inheritdoc' => true,
         'phpdoc_order' => true,
-        'phpdoc_param_order' => true,
         'phpdoc_order_by_value' => [
             'annotations' => [
                 'covers',
@@ -257,6 +258,7 @@
                 'uses',
             ],
         ],
+        'phpdoc_param_order' => true,
         'phpdoc_return_self_reference' => true,
         'phpdoc_scalar' => true,
         'phpdoc_separation' => true,
@@ -286,6 +288,7 @@
         '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,

src/Framework/MockObject/Builder/InvocationStubber.php

@@ -20,46 +20,46 @@ interface InvocationStubber
     public function will(Stub $stub): Identity;
 
     /** @return self */
-    public function willReturn($value, ...$nextValues)/*: self */;
+    public function willReturn($value, ...$nextValues)/* : self */;
 
     /**
      * @param mixed $reference
      *
      * @return self
      */
-    public function willReturnReference(&$reference)/*: self */;
+    public function willReturnReference(&$reference)/* : self */;
 
     /**
      * @param array<int, array<int, mixed>> $valueMap
      *
      * @return self
      */
-    public function willReturnMap(array $valueMap)/*: self */;
+    public function willReturnMap(array $valueMap)/* : self */;
 
     /**
      * @param int $argumentIndex
      *
      * @return self
      */
-    public function willReturnArgument($argumentIndex)/*: self */;
+    public function willReturnArgument($argumentIndex)/* : self */;
 
     /**
      * @param callable $callback
      *
      * @return self
      */
-    public function willReturnCallback($callback)/*: self */;
+    public function willReturnCallback($callback)/* : self */;
 
     /** @return self */
-    public function willReturnSelf()/*: self */;
+    public function willReturnSelf()/* : self */;
 
     /**
      * @param mixed $values
      *
      * @return self
      */
-    public function willReturnOnConsecutiveCalls(...$values)/*: self */;
+    public function willReturnOnConsecutiveCalls(...$values)/* : self */;
 
     /** @return self */
-    public function willThrowException(Throwable $exception)/*: self */;
+    public function willThrowException(Throwable $exception)/* : self */;
 }

src/Util/Annotation/DocBlock.php

@@ -494,9 +494,9 @@ private function getDataFromTestWithAnnotation(string $docComment): ?array
 
     private function cleanUpMultiLineAnnotation(string $docComment): string
     {
-        //removing initial '   * ' for docComment
+        // removing initial '   * ' for docComment
         $docComment = str_replace("\r\n", "\n", $docComment);
-        $docComment = preg_replace('/' . '\n' . '\s*' . '\*' . '\s?' . '/', "\n", $docComment);
+        $docComment = preg_replace('/\n\s*\*\s?/', "\n", $docComment);
         $docComment = (string) substr($docComment, 0, -1);
 
         return rtrim($docComment, "\n");

tests/end-to-end/regression/1337/Issue1337Test.php

@@ -24,7 +24,7 @@ public function dataProvider()
         return [
             'c:\\' => [true],
             // The following is commented out because it no longer works in PHP >= 8.1
-            //0.9    => [true],
+            // 0.9    => [true],
         ];
     }
 }

tests/end-to-end/regression/2137/Issue2137Test.php

@@ -24,7 +24,7 @@ public function testBrandService($provided, $expected): void
     public function provideBrandService()
     {
         return [
-            //[true, true]
+            // [true, true]
             new stdClass, // not valid
         ];
     }

tests/end-to-end/regression/498/Issue498Test.php

@@ -37,7 +37,7 @@ public function shouldBeFalse($testData): void
 
     public function shouldBeTrueDataProvider()
     {
-        //throw new Exception("Can't create the data");
+        // throw new Exception("Can't create the data");
         return [
             [true],
             [false],

tests/unit/Framework/AssertTest.php

@@ -2287,7 +2287,7 @@ protected function notEqualValues(): array
                 new DateTime('2013-03-29T05:13:35-0500'),
             ],
             // Exception
-            //array(new Exception('Exception 1'), new Exception('Exception 2')),
+            // array(new Exception('Exception 1'), new Exception('Exception 2')),
             // different types
             [new SampleClass(4, 8, 15), false],
             [false, new SampleClass(4, 8, 15)],
@@ -2372,7 +2372,7 @@ protected function equalValues(): array
                 new DateTime('2013-03-29T04:13:35-0600'),
             ],
             // Exception
-            //array(new Exception('Exception 1'), new Exception('Exception 1')),
+            // array(new Exception('Exception 1'), new Exception('Exception 1')),
             // mixed types
             [0, '0'],
             ['0', 0],