Skip to content

#95 : Empty FUNCTION statement detected should be allowed for around plugins #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 9, 2019
Merged

#95 : Empty FUNCTION statement detected should be allowed for around plugins #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d6fc34b
Ignore warning for empty around plugin
konarshankar07 Aug 8, 2019
d2bd683
Minor tweaks
konarshankar07 Aug 8, 2019
f9dc5f9
Feedback changes
konarshankar07 Aug 9, 2019
917fe53
Fixed static build tests
konarshankar07 Aug 9, 2019
8ef3eeb
Feedback changes
konarshankar07 Aug 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions Magento2/Sniffs/CodeAnalysis/EmptyBlockSniff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*/
namespace Magento2\Sniffs\CodeAnalysis;

use PHP_CodeSniffer\Files\File;
use PHP_CodeSniffer\Standards\Generic\Sniffs\CodeAnalysis\EmptyStatementSniff;

/**
Expand All @@ -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()
}
2 changes: 2 additions & 0 deletions Magento2/Tests/CodeAnalysis/EmptyBlockUnitTest.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,5 @@ if (true) {} elseif (false) {}
function emptyFunction () { /*Empty function block*/ }

function nonEmptyFunction () { return true; }

function aroundEmptyFunction ($foo, $bar) { }