Merge pull request #670 from PHPCSStandards/feature/various-small-tweaks

CS/Docs: various small tweaks

Author: jrfnl

src/Reports/Code.php

@@ -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'];

src/Standards/Generic/Tests/WhiteSpace/HereNowdocIdentifierSpacingUnitTest.php

@@ -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
  */

tests/Core/Tokenizers/PHP/BackfillFnTokenTest.php

@@ -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);

tests/Core/Tokenizers/Tokenizer/CreateParenthesisNestingMapDNFTypesTest.php

@@ -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');