CS: various minor fixes

Fix up the issues which will be flagged by PHP-Code-Style 2.0 and explicitly ignore a couple of (non-)issues.

Includes no longer allowing warnings in the GH Actions build.

Author: jrfnl

.github/workflows/cs.yml

@@ -38,7 +38,7 @@ jobs:
         run: vendor/bin/phpcs --report-full --report-checkstyle=./checkstyle.xml
 
       - name: Show PHPCS results in PR
-        run: cs2pr ./checkstyle.xml --graceful-warnings
+        run: cs2pr ./checkstyle.xml
 
       - name: Make sure no vardumps remain
         run: composer vardumpcheck

examples/snippet.php

@@ -1,4 +1,5 @@
 <?php
+
 use PHP_Parallel_Lint\PhpConsoleColor\ConsoleColor;
 use PHP_Parallel_Lint\PhpConsoleHighlighter\Highlighter;
 
@@ -7,4 +8,4 @@
 $highlighter = new Highlighter(new ConsoleColor());
 
 $fileContent = file_get_contents(__FILE__);
-echo $highlighter->getCodeSnippet($fileContent, 3);
+echo $highlighter->getCodeSnippet($fileContent, 3);

examples/whole_file.php

@@ -1,4 +1,5 @@
 <?php
+
 use PHP_Parallel_Lint\PhpConsoleColor\ConsoleColor;
 use PHP_Parallel_Lint\PhpConsoleHighlighter\Highlighter;
 
@@ -7,4 +8,4 @@
 $highlighter = new Highlighter(new ConsoleColor());
 
 $fileContent = file_get_contents(__FILE__);
-echo $highlighter->getWholeFile($fileContent);
+echo $highlighter->getWholeFile($fileContent);

examples/whole_file_line_numbers.php

@@ -1,4 +1,5 @@
 <?php
+
 use PHP_Parallel_Lint\PhpConsoleColor\ConsoleColor;
 use PHP_Parallel_Lint\PhpConsoleHighlighter\Highlighter;
 
@@ -7,4 +8,4 @@
 $highlighter = new Highlighter(new ConsoleColor());
 
 $fileContent = file_get_contents(__FILE__);
-echo $highlighter->getWholeFileWithLineNumbers($fileContent);
+echo $highlighter->getWholeFileWithLineNumbers($fileContent);

src/Highlighter.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace PHP_Parallel_Lint\PhpConsoleHighlighter;
 
 use PHP_Parallel_Lint\PhpConsoleColor\ConsoleColor;
@@ -157,7 +158,6 @@ private function getTokenType($arrayToken)
             case T_CLOSE_TAG:
             case T_STRING:
             case T_VARIABLE:
-
             // Constants
             case T_DIR:
             case T_FILE:
@@ -183,6 +183,8 @@ private function getTokenType($arrayToken)
                 return self::TOKEN_HTML;
         }
 
+        // phpcs:disable PHPCompatibility.Constants.NewConstants -- The new token constants are only used when defined.
+
         // Handle PHP >= 8.0 namespaced name tokens.
         // https://www.php.net/manual/en/migration80.incompatible.php#migration80.incompatible.tokenizer
         if (defined('T_NAME_QUALIFIED') && $arrayToken[0] === T_NAME_QUALIFIED) {
@@ -195,6 +197,8 @@ private function getTokenType($arrayToken)
             return self::TOKEN_DEFAULT;
         }
 
+        // phpcs:enable
+
         return self::TOKEN_KEYWORD;
     }
 

tests/HighlighterTest.php

@@ -1,8 +1,8 @@
 <?php
+
 namespace PHP_Parallel_Lint\PhpConsoleHighlighter\Test;
 
 use PHP_Parallel_Lint\PhpConsoleHighlighter\Highlighter;
-
 use PHPUnit\Framework\TestCase;
 
 class HighlighterTest extends TestCase
@@ -267,17 +267,15 @@ public function testHashComment()
     public function testEmpty()
     {
         $this->compare(
-            ''
-            ,
+            '',
             ''
         );
     }
 
     public function testWhitespace()
     {
         $this->compare(
-            ' '
-            ,
+            ' ',
             '<token_html> </token_html>'
         );
     }