Updated Drupal to 8.6. This goes with the following updates because it's possible...

[yaffs-website] / vendor / jakub-onderka / php-console-highlighter / src / Highlighter.php

diff --git a/vendor/jakub-onderka/php-console-highlighter/src/JakubOnderka/PhpConsoleHighlighter/Highlighter.php b/vendor/jakub-onderka/php-console-highlighter/src/Highlighter.php
similarity index 94%
rename from vendor/jakub-onderka/php-console-highlighter/src/JakubOnderka/PhpConsoleHighlighter/Highlighter.php
rename to vendor/jakub-onderka/php-console-highlighter/src/Highlighter.php
index b908e9318913bc65ca37aff37a03de6cb190d46f..47ce30d2c04c98ada209c83b70aa3c41046a2925 100644 (file)
--- a/vendor/jakub-onderka/php-console-highlighter/src/JakubOnderka/PhpConsoleHighlighter/Highlighter.php
+++ b/vendor/jakub-onderka/php-console-highlighter/src/Highlighter.php
@@ -31,6 +31,7 @@ class Highlighter
 
     /**
      * @param ConsoleColor $color
+     * @throws \JakubOnderka\PhpConsoleColor\InvalidStyleException
      */
     public function __construct(ConsoleColor $color)
     {
@@ -118,20 +119,6 @@ class Highlighter
         foreach ($tokens as $token) {
             if (is_array($token)) {
                 switch ($token[0]) {
-                    case T_INLINE_HTML:
-                        $newType = self::TOKEN_HTML;
-                        break;
-
-                    case T_COMMENT:
-                    case T_DOC_COMMENT:
-                        $newType = self::TOKEN_COMMENT;
-                        break;
-
-                    case T_ENCAPSED_AND_WHITESPACE:
-                    case T_CONSTANT_ENCAPSED_STRING:
-                        $newType = self::TOKEN_STRING;
-                        break;
-
                     case T_WHITESPACE:
                         break;
 
@@ -151,17 +138,26 @@ class Highlighter
                     case T_LINE:
                     case T_CLASS_C:
                     case T_FUNC_C:
-                    //case T_TRAIT_C:
+                    case T_TRAIT_C:
                         $newType = self::TOKEN_DEFAULT;
                         break;
 
+                    case T_COMMENT:
+                    case T_DOC_COMMENT:
+                        $newType = self::TOKEN_COMMENT;
+                        break;
+
+                    case T_ENCAPSED_AND_WHITESPACE:
+                    case T_CONSTANT_ENCAPSED_STRING:
+                        $newType = self::TOKEN_STRING;
+                        break;
+
+                    case T_INLINE_HTML:
+                        $newType = self::TOKEN_HTML;
+                        break;
+
                     default:
-                        // Compatibility with PHP 5.3
-                        if (defined('T_TRAIT_C') && $token[0] === T_TRAIT_C) {
-                            $newType = self::TOKEN_DEFAULT;
-                        } else {
-                            $newType = self::TOKEN_KEYWORD;
-                        }
+                        $newType = self::TOKEN_KEYWORD;
                 }
             } else {
                 $newType = $token === '"' ? self::TOKEN_STRING : self::TOKEN_KEYWORD;
@@ -171,7 +167,7 @@ class Highlighter
                 $currentType = $newType;
             }
 
-            if ($currentType != $newType) {
+            if ($currentType !== $newType) {
                 $output[] = array($currentType, $buffer);
                 $buffer = '';
                 $currentType = $newType;