Merge branch 'develop' into 102_PHPFunctionsAsDiscouraged

Author: diazwatson

Magento2/Sniffs/CodeAnalysis/EmptyBlockSniff.php

@@ -5,6 +5,7 @@
  */
 namespace Magento2\Sniffs\CodeAnalysis;
 
+use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Standards\Generic\Sniffs\CodeAnalysis\EmptyStatementSniff;
 
 /**
@@ -25,4 +26,17 @@ public function register()
             ]
         );
     }
+    /**
+     * @inheritDoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+        if ($tokens[$stackPtr]['code'] === T_FUNCTION &&
+            strpos($phpcsFile->getDeclarationName($stackPtr), 'around') === 0) {
+            return;
+        }
+
+        parent::process($phpcsFile, $stackPtr);
+    }//end process()
 }

Magento2/Tests/CodeAnalysis/EmptyBlockUnitTest.inc

@@ -74,3 +74,5 @@ if (true) {} elseif (false) {}
 function emptyFunction () { /*Empty function block*/ }
 
 function nonEmptyFunction () { return true; }
+
+function aroundEmptyFunction ($foo, $bar) { }