Skip to content

CS/Docs: various small tweaks #670

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

Merged
merged 2 commits into from
Nov 12, 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
2 changes: 1 addition & 1 deletion src/Reports/Code.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public function generateFileReport($report, File $phpcsFile, $showSources=false,
return false;
}

// How many lines to show about and below the error line.
// How many lines to show above and below the error line.
$surroundingLines = 2;

$file = $report['filename'];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;

/**
* Unit test class for the LanguageConstructSpacing sniff.
* Unit test class for the HereNowdocIdentifierSpacing sniff.
*
* @covers \PHP_CodeSniffer\Standards\Generic\Sniffs\WhiteSpace\HereNowdocIdentifierSpacingSniff
*/
Expand Down
2 changes: 0 additions & 2 deletions tests/Core/Tokenizers/PHP/BackfillFnTokenTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -405,8 +405,6 @@ public function testNamespaceOperatorInTypes()
*/
public function testKeywordReturnTypes($testMarker)
{
$tokens = $this->phpcsFile->getTokens();

$token = $this->getTargetToken($testMarker, T_FN);
$this->backfillHelper($token);
$this->scopePositionTestHelper($token, 11, 14);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,6 @@ public function testDNFTypeParentheses($testMarker)
$this->assertArrayHasKey('parenthesis_closer', $closer, 'Parenthesis closer is not set');
$this->assertSame($closePtr, $closer['parenthesis_closer'], 'Parenthesis closer is not the expected token');

$intersectionCount = 0;
for ($i = ($openPtr + 1); $i < $closePtr; $i++) {
$this->assertArrayHasKey('nested_parenthesis', $tokens[$i], "Nested parenthesis key not set on token $i ({$tokens[$i]['type']})");
$this->assertArrayHasKey($openPtr, $tokens[$i]['nested_parenthesis'], 'Nested parenthesis is missing target parentheses set');
Expand Down