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,4 +38,4 @@ 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

example.php

@@ -1,4 +1,5 @@
 <?php
+
 $loader = require_once __DIR__ . '/vendor/autoload.php';
 
 $consoleColor = new PHP_Parallel_Lint\PhpConsoleColor\ConsoleColor();

src/ConsoleColor.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace PHP_Parallel_Lint\PhpConsoleColor;
 
 class ConsoleColor
@@ -99,7 +100,7 @@ public function apply($style, $text)
         foreach ($style as $s) {
             if (isset($this->themes[$s])) {
                 $sequences = array_merge($sequences, $this->themeSequence($s));
-            } else if ($this->isValidStyle($s)) {
+            } elseif ($this->isValidStyle($s)) {
                 $sequences[] = $this->styleSequence($s);
             } else {
                 throw new InvalidStyleException($s);
@@ -203,13 +204,15 @@ public function removeTheme($name)
     public function isSupported()
     {
         if (DIRECTORY_SEPARATOR === '\\') {
+            // phpcs:ignore Generic.PHP.NoSilencedErrors,PHPCompatibility.FunctionUse.NewFunctions.sapi_windows_vt100_supportFound
             if (function_exists('sapi_windows_vt100_support') && @sapi_windows_vt100_support(STDOUT)) {
                 return true;
             } elseif (getenv('ANSICON') !== false || getenv('ConEmuANSI') === 'ON') {
                 return true;
             }
             return false;
         } else {
+            // phpcs:ignore Generic.PHP.NoSilencedErrors
             return function_exists('posix_isatty') && @posix_isatty(STDOUT);
         }
     }
@@ -222,6 +225,7 @@ public function isSupported()
     public function are256ColorsSupported()
     {
         if (DIRECTORY_SEPARATOR === '\\') {
+            // phpcs:ignore Generic.PHP.NoSilencedErrors,PHPCompatibility.FunctionUse.NewFunctions.sapi_windows_vt100_supportFound
             return function_exists('sapi_windows_vt100_support') && @sapi_windows_vt100_support(STDOUT);
         } else {
             return strpos(getenv('TERM'), '256color') !== false;

src/InvalidStyleException.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace PHP_Parallel_Lint\PhpConsoleColor;
 
 class InvalidStyleException extends \Exception
@@ -7,4 +8,4 @@ public function __construct($styleName)
     {
         parent::__construct("Invalid style $styleName.");
     }
-}
+}

tests/ConsoleColorTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace PHP_Parallel_Lint\PhpConsoleColor\Test;
 
 use PHP_Parallel_Lint\PhpConsoleColor\ConsoleColor;
@@ -309,4 +310,3 @@ public function exceptionHelper($exception, $msg = null)
         }
     }
 }
-

tests/Fixtures/ConsoleColorWithForceSupport.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace PHP_Parallel_Lint\PhpConsoleColor\Test\Fixtures;
 
 use PHP_Parallel_Lint\PhpConsoleColor\ConsoleColor;