Squiz/NonExecutableCode: flag redundant return statements in closures too

A return statement which doesn't return a value at the end of a function body would be flagged as "not required" for named functions, but not so for anonymous functions.

Fixed now. Includes tests.

Author: jrfnl

CHANGELOG.md

@@ -90,6 +90,8 @@ The file documents changes to the PHP_CodeSniffer project.
     - Thanks to Dan Wallis (@fredden) for the patch
 - Squiz.PHP.InnerFunctions sniff no longer reports on OO methods for OO structures declared within a function or closure
     - Thanks to @Daimona for the patch
+- Squiz.PHP.NonExecutableCode will now also flag redundant return statements just before a closure close brace
+    - Thanks to Juliette Reinders Folmer (@jrfnl) for the patch
 - Runtime performance improvement for PHPCS CLI users. The improvement should be most noticeable for users on Windows.
     - Thanks to Juliette Reinders Folmer (@jrfnl) for the patch
 - The -e (explain) command will now list sniffs in natural order

src/Standards/Squiz/Sniffs/PHP/NonExecutableCodeSniff.php

@@ -122,7 +122,9 @@ public function process(File $phpcsFile, $stackPtr)
                     // then this return statement doesn't return anything
                     // and is not required anyway.
                     $owner = $tokens[$next]['scope_condition'];
-                    if ($tokens[$owner]['code'] === T_FUNCTION) {
+                    if ($tokens[$owner]['code'] === T_FUNCTION
+                        || $tokens[$owner]['code'] === T_CLOSURE
+                    ) {
                         $warning = 'Empty return statement not required here';
                         $phpcsFile->addWarning($warning, $stackPtr, 'ReturnNotRequired');
                         return;

src/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.1.inc

@@ -413,5 +413,11 @@ function returnNotRequiredIgnoreCommentsB()
     /*comment*/
 }
 
+$closure = function ()
+{
+    echo 'foo';
+    return; // This return should be flagged as not required.
+};
+
 // Intentional syntax error.
 return array_map(

src/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.php

@@ -84,6 +84,7 @@ public function getWarningList($testFile='')
                 396 => 1,
                 406 => 1,
                 412 => 1,
+                419 => 1,
             ];
 
         case 'NonExecutableCodeUnitTest.2.inc':