diff --git a/src/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.inc b/src/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.inc index e831e257d8..8c8daf1f49 100644 --- a/src/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.inc +++ b/src/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.inc @@ -37,3 +37,54 @@ function foo() } + +// Nested functions - okay. +function hasNestedOkay() { + function nestedFunction() { + echo 'hello'; + } + +} + +$cl = function() { + function nestedFunction() { + echo 'hello'; + } + +}; + +mycallback( + 'name', + function() { + echo 'hello'; + } + +); + +// Nested functions - not okay. +function hasNestedNotOkay() { + function nestedFunction() {} + +} + +$cl = function() { + function nestedFunction() { + echo 'hello'; } + +}; + +mycallback('name', function() { + echo 'hello'; + + + + } + +); + +mycallback('name', function() { + // Comment + + } + +); diff --git a/src/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.inc.fixed b/src/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.inc.fixed index c567dbb2d2..1166366f48 100644 --- a/src/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.inc.fixed +++ b/src/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.inc.fixed @@ -43,3 +43,52 @@ function foo() }//end for } + +// Nested functions - okay. +function hasNestedOkay() { + function nestedFunction() { + echo 'hello'; + } + +} + +$cl = function() { + function nestedFunction() { + echo 'hello'; + } + +}; + +mycallback( + 'name', + function() { + echo 'hello'; + } + +); + +// Nested functions - not okay. +function hasNestedNotOkay() { + function nestedFunction() { +} + +} + +$cl = function() { + function nestedFunction() { + echo 'hello'; +} + +}; + +mycallback('name', function() { + echo 'hello'; + } + +); + +mycallback('name', function() { + // Comment + } + +); diff --git a/src/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.php index cb5cf061dc..7361cf499d 100644 --- a/src/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.php +++ b/src/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.php @@ -41,6 +41,10 @@ public function getErrorList($testFile='') 29 => 1, 31 => 1, 39 => 1, + 66 => 1, + 72 => 1, + 81 => 1, + 88 => 1, ]; case 'FunctionClosingBraceSpaceUnitTest.js':