Skip to content
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.

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

Generic/NestingLevel: improve code coverage #764

Merged
merged 4 commits into from
Dec 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/Standards/Generic/Sniffs/Metrics/NestingLevelSniff.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ public function process(File $phpcsFile, $stackPtr)
{
$tokens = $phpcsFile->getTokens();

// Ignore abstract methods.
if (isset($tokens[$stackPtr]['scope_opener']) === false) {
// Ignore abstract and interface methods. Bail early when live coding.
if (isset($tokens[$stackPtr]['scope_opener'], $tokens[$stackPtr]['scope_closer']) === false) {
return;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ function nestingFive()
function nestingSix()
{
if ($condition) {
echo 'hi';
switch ($condition)
{
} else {
switch ($condition) {
case '1':
if ($condition === '1') {
if ($cond) {
} elseif ($condition === '2') {
do {
foreach ($conds as $cond) {
echo 'hi';
}
}
} while ($cond > 5);
}
break;
}
Expand Down Expand Up @@ -79,24 +79,30 @@ function nestingEleven()
case '1':
if ($condition === '1') {
if ($cond) {
switch ($cond) {
case '1':
if ($cond === '1') {
foreach ($conds as $cond) {
if ($cond === 'hi') {
if ($cond !== 'bye') {
echo 'hi';
}
try {
if ( $cond === '1' ) {
for ( $i = 0; $i < 10; $i ++ ) {
while ($i < 5) {
if ( $cond === 'hi' ) {
match ( $cond ) {
'hi' => 'something',
};
}
}
}
break;
}
}
} catch (Exception $e) {}
}
}
break;
}
}
}

?>
abstract class AbstractClass {
abstract public function sniffShouldIgnoreAbstractMethods();
}

interface MyInterface {
public function sniffShouldIgnoreInterfaceMethods();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?php

// Intentional parse error (missing opening curly bracket).
// This should be the only test in this file.
// Testing that the sniff is *not* triggered.

function sniffShouldBailMissingScopeOpener()
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?php

// Intentional parse error (missing closing curly bracket).
// This should be the only test in this file.
// Testing that the sniff is *not* triggered.

function sniffShouldBailMissingScopeCloser() {
28 changes: 21 additions & 7 deletions src/Standards/Generic/Tests/Metrics/NestingLevelUnitTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,18 @@ final class NestingLevelUnitTest extends AbstractSniffUnitTest
* The key of the array should represent the line number and the value
* should represent the number of errors that should occur on that line.
*
* @param string $testFile The name of the test file to process.
*
* @return array<int, int>
*/
public function getErrorList()
public function getErrorList($testFile='')
{
return [73 => 1];
switch ($testFile) {
case 'NestingLevelUnitTest.1.inc':
return [73 => 1];
default:
return [];
}

}//end getErrorList()

Expand All @@ -41,14 +48,21 @@ public function getErrorList()
* The key of the array should represent the line number and the value
* should represent the number of warnings that should occur on that line.
*
* @param string $testFile The name of the test file to process.
*
* @return array<int, int>
*/
public function getWarningList()
public function getWarningList($testFile='')
{
return [
27 => 1,
46 => 1,
];
switch ($testFile) {
case 'NestingLevelUnitTest.1.inc':
return [
27 => 1,
46 => 1,
];
default:
return [];
}

}//end getWarningList()

Expand Down
Loading