Fix up tests.

Author: dereuromark

PhpCollective/Sniffs/Commenting/DocBlockReturnVoidSniff.php

@@ -20,6 +20,8 @@ class DocBlockReturnVoidSniff extends AbstractSniff
 {
     use CommentingTrait;
 
+    public bool $strict = false;
+
     /**
      * @var array<string>
      */
@@ -75,15 +77,15 @@ public function process(File $phpcsFile, $stackPtr): void
 
         // If interface we will at least report it
         if (empty($tokens[$stackPtr]['scope_opener']) || empty($tokens[$stackPtr]['scope_closer'])) {
-            if (!$docBlockReturnIndex && !$hasInheritDoc && !$hasReturnType) {
+            if (!$docBlockReturnIndex && !$hasInheritDoc && (!$hasReturnType || $this->strict)) {
                 $phpcsFile->addError('Method does not have a return statement in doc block: ' . $tokens[$nextIndex]['content'], $nextIndex, 'ReturnMissingInInterface');
             }
 
             return;
         }
 
         // If inheritDoc is present assume the parent contains it
-        if (!$docBlockReturnIndex && ($hasInheritDoc || $this->hasReturnType($phpcsFile, $stackPtr))) {
+        if (!$docBlockReturnIndex && ($hasInheritDoc || $hasReturnType && !$this->strict)) {
             return;
         }
 

tests/PhpCollective/Sniffs/Commenting/DocBlockReturnVoidSniffTest.php

@@ -17,14 +17,18 @@ class DocBlockReturnVoidSniffTest extends TestCase
      */
     public function testDocBlockReturnVoidSniffer(): void
     {
-        $this->assertSnifferFindsFixableErrors(new DocBlockReturnVoidSniff(), 3, 3);
+        $sniff = new DocBlockReturnVoidSniff();
+        $sniff->strict = true;
+        $this->assertSnifferFindsFixableErrors($sniff, 3, 3);
     }
 
     /**
      * @return void
      */
     public function testDocBlockReturnVoidFixer(): void
     {
-        $this->assertSnifferCanFixErrors(new DocBlockReturnVoidSniff(), 3);
+        $sniff = new DocBlockReturnVoidSniff();
+        $sniff->strict = true;
+        $this->assertSnifferCanFixErrors($sniff, 3);
     }
 }