Merge remote-tracking branch 'origin/master' into next

Author: dereuromark

PhpCollective/Sniffs/Commenting/InlineDocBlockSniff.php

@@ -194,7 +194,7 @@ protected function findErrors(File $phpCsFile, int $contentIndex, bool $isSingle
         $comment = $tokens[$contentIndex]['content'];
 
         // SKip for complex arrays until next major
-        if (str_contains($comment, '<') || str_starts_with($comment, 'array{')) {
+        if (str_contains($comment, '<') || str_starts_with($comment, 'array{') || str_starts_with($comment, 'object{')) {
             return [];
         }
 

PhpCollective/Sniffs/WhiteSpace/MethodSpacingSniff.php

@@ -88,7 +88,23 @@ public function process(File $phpcsFile, $stackPtr): void
             $error = 'There should be no extra newline at the end of a method';
             $fix = $phpcsFile->addFixableError($error, $stackPtr, 'ContentBeforeClose');
             if ($fix === true) {
-                $phpcsFile->fixer->replaceToken($lastContentIndex + 1, '');
+                // Find all whitespace tokens between last content and closing brace
+                $phpcsFile->fixer->beginChangeset();
+                for ($i = $lastContentIndex + 1; $i < $braceEndIndex; $i++) {
+                    if ($tokens[$i]['code'] === T_WHITESPACE) {
+                        if ($tokens[$i]['line'] === $tokens[$lastContentIndex]['line']) {
+                            // Keep whitespace on the same line as last content
+                            continue;
+                        }
+                        if ($tokens[$i]['line'] === $tokens[$braceEndIndex]['line']) {
+                            // Keep indentation before closing brace
+                            continue;
+                        }
+                        // Remove extra blank lines
+                        $phpcsFile->fixer->replaceToken($i, '');
+                    }
+                }
+                $phpcsFile->fixer->endChangeset();
             }
         }
     }

tests/PhpCollective/Sniffs/WhiteSpace/MethodSpacingSniffTest.php

@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * MIT License
+ * For full license information, please view the LICENSE file that was distributed with this source code.
+ */
+
+namespace PhpCollective\Test\PhpCollective\Sniffs\WhiteSpace;
+
+use PhpCollective\Sniffs\WhiteSpace\MethodSpacingSniff;
+use PhpCollective\Test\TestCase;
+
+class MethodSpacingSniffTest extends TestCase
+{
+    /**
+     * @return void
+     */
+    public function testMethodSpacingSniffer(): void
+    {
+        $this->assertSnifferFindsErrors(new MethodSpacingSniff(), 3);
+    }
+
+    /**
+     * @return void
+     */
+    public function testMethodSpacingFixer(): void
+    {
+        $this->assertSnifferCanFixErrors(new MethodSpacingSniff());
+    }
+}

tests/_data/InlineDocBlock/after.php

@@ -28,5 +28,9 @@ public function test()
 
         /** @var string $foo */
         $foo = $_indices['z'];
+
+        /** @var object{user_id: int, home_id: int} $row */
+        $row = new \stdClass();
+        $user_id = $row->user_id;
     }
 }

tests/_data/InlineDocBlock/before.php

@@ -28,5 +28,9 @@ public function test()
 
         /* @var string $foo */
         $foo = $_indices['z'];
+
+        /** @var object{user_id: int, home_id: int} $row */
+        $row = new \stdClass();
+        $user_id = $row->user_id;
     }
 }

tests/_data/MethodSpacing/after.php

@@ -0,0 +1,21 @@
+<?php
+
+class Test
+{
+    public function foo()
+    {
+        return 'bar';
+    }
+
+    public function bar()
+    {
+        return 'baz';
+    }
+
+    public function getMonthDifference($from, $to)
+    {
+        $diff = date_diff($from, $to);
+
+        return (12 * $diff['y']) + $diff['m'];
+    }
+}

tests/_data/MethodSpacing/before.php

@@ -0,0 +1,24 @@
+<?php
+
+class Test
+{
+    public function foo()
+    {
+
+        return 'bar';
+    }
+
+    public function bar()
+    {
+        return 'baz';
+
+    }
+
+    public function getMonthDifference($from, $to)
+    {
+        $diff = date_diff($from, $to);
+
+        return (12 * $diff['y']) + $diff['m'];
+
+    }
+}