Relax check for missing return type w/ null doc bloc

Author: gmazzap

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Not released
 - Fix false positive in `ReturnTypeDeclarationSniff` with nullable types.
+- Relax check for missing return type when `{aType}|null` doc bloc is present.
 - Add `is` to the list of allowed short names.
 
 ## 0.10.0

Inpsyde/Sniffs/CodeQuality/ReturnTypeDeclarationSniff.php

@@ -73,7 +73,6 @@ public function process(File $file, $position)
             $hasNoReturnType,
             $nonVoidReturnCount,
             $voidReturnCount,
-            $nullReturnCount,
             $file,
             $position
         );
@@ -85,7 +84,6 @@ public function process(File $file, $position)
      * @param bool $hasNoReturnType
      * @param int $nonVoidReturnCount
      * @param int $voidReturnCount
-     * @param int $nullReturnCount
      * @param File $file
      * @param int $position
      */
@@ -95,7 +93,6 @@ private function maybeErrors(
         bool $hasNoReturnType,
         int $nonVoidReturnCount,
         int $voidReturnCount,
-        int $nullReturnCount,
         File $file,
         int $position
     ) {
@@ -126,10 +123,7 @@ private function maybeErrors(
             return;
         }
 
-        if ($nullReturnCount
-            && $nonVoidReturnCount
-            && ($nullReturnCount === $voidReturnCount)
-            && !$this->areNullableReturnTypesSupported()
+        if (!$this->areNullableReturnTypesSupported()
             && $this->hasReturnNullDocBloc($file, $position)
         ) {
             return;

tests/fixtures/return-type-declaration.php

@@ -252,7 +252,7 @@ public function iMaybeReturnNull()
     /**
      * @return \ArrayAccess|null
      */
-    public function iShouldReturnNullButReturnVoid() // @phpcsWarningCodeOnThisLine NoReturnType
+    public function iShouldReturnNullButReturnVoid()
     {
         if (rand(1, 4) === 3) {
             return null;
@@ -268,7 +268,7 @@ public function iShouldReturnNullButReturnVoid() // @phpcsWarningCodeOnThisLine
     /**
      * @return \ArrayAccess|null
      */
-    public function iShouldReturnNull() // @phpcsWarningCodeOnThisLine NoReturnType
+    public function iShouldReturnNull()
     {
         return new \ArrayObject();
     }