fix compatibility error on php 7.4

Author: inhere

README.md

@@ -43,7 +43,7 @@ $rendered = Highlighter::create()->highlight(file_get_contents(__FILE__));
 \Toolkit\Cli\Cli::write($rendered);
 ```
 
-![colors](./example/cli-php-file-highlight.jpg)
+![colors](./example/cli-php-file-highlight.png)
 
 ## Console color
 

composer.json

@@ -19,6 +19,9 @@
   "require": {
     "php": ">7.1.0"
   },
+  "require-dev": {
+    "phpunit/phpunit": "^7.5"
+  },
   "autoload": {
     "psr-4": {
       "Toolkit\\Cli\\": "src/"
@@ -29,6 +32,9 @@
       "Toolkit\\CliTest\\": "src/"
     }
   },
+  "scripts": {
+    "test": "./vendor/bin/phpunit"
+  },
   "suggest": {
     "inhere/php-validate": "Very lightweight data validate tool",
     "inhere/console": "a lightweight php console application library."

example/cli-php-file-highlight.png

@@ -164,6 +164,7 @@ class Color
 
         // option
         'bold'           => '1',
+        'italic'         => '3',
         'underscore'     => '4',
         'reverse'        => '7',
     ];

src/Color.php

@@ -132,7 +132,7 @@ public static function parseArgv(array $params, array $config = []): array
             next($params);
 
             // is options
-            if ($p{0} === '-') {
+            if ($p[0] === '-') {
                 $value  = true;
                 $option = substr($p, 1);
                 $isLong = false;
@@ -148,7 +148,7 @@ public static function parseArgv(array $params, array $config = []): array
                     }
 
                     // short-opt: value specified inline (-<opt>=<value>)
-                } elseif (isset($option{1}) && $option{1} === '=') {
+                } elseif (isset($option[1]) && $option[1] === '=') {
                     [$option, $value] = explode('=', $option, 2);
                 }
 
@@ -310,7 +310,7 @@ public static function nextIsValue($val): bool
         }
 
         // it isn't option or named argument
-        return $val{0} !== '-' && false === strpos($val, '=');
+        return $val[0] !== '-' && false === strpos($val, '=');
     }
 
     /**

src/Flags.php

@@ -57,11 +57,14 @@
  */
 class Highlighter
 {
-    public const TOKEN_DEFAULT = 'token_default';
-    public const TOKEN_COMMENT = 'token_comment';
-    public const TOKEN_STRING  = 'token_string';
-    public const TOKEN_HTML    = 'token_html';
-    public const TOKEN_KEYWORD = 'token_keyword';
+    public const TOKEN_DEFAULT  = 'token_default';
+    public const TOKEN_COMMENT  = 'token_comment';
+    public const TOKEN_STRING   = 'token_string';
+    public const TOKEN_HTML     = 'token_html';
+
+    public const TOKEN_KEYWORD  = 'token_keyword';
+    public const TOKEN_CONSTANT = 'token_constant';
+    public const TOKEN_VARIABLE = 'token_variable';
 
     public const ACTUAL_LINE_MARK = 'actual_line_mark';
     public const LINE_NUMBER      = 'line_number';
@@ -74,11 +77,13 @@ class Highlighter
 
     /** @var array */
     private $defaultTheme = [
-        self::TOKEN_STRING     => 'red',
-        self::TOKEN_COMMENT    => 'yellow',
-        self::TOKEN_KEYWORD    => 'info',
+        self::TOKEN_STRING     => 'green',
+        self::TOKEN_COMMENT    => 'italic',
+        self::TOKEN_KEYWORD    => 'yellow',
         self::TOKEN_DEFAULT    => 'normal',
+        self::TOKEN_CONSTANT   => 'red',
         self::TOKEN_HTML       => 'cyan',
+        self::TOKEN_VARIABLE   => 'cyan',
         self::ACTUAL_LINE_MARK => 'red',
         self::LINE_NUMBER      => 'darkGray',
     ];
@@ -227,10 +232,9 @@ private function tokenize(string $source): array
                     case T_OPEN_TAG_WITH_ECHO:
                     case T_CLOSE_TAG:
                     case T_STRING:
-                    case T_VARIABLE:
                         // Constants
-                    case T_DIR:
-                    case T_FILE:
+                    // case T_DIR:
+                    // case T_FILE:
                     case T_METHOD_C:
                     case T_DNUMBER:
                     case T_LNUMBER:
@@ -241,6 +245,14 @@ private function tokenize(string $source): array
                         //case T_TRAIT_C:
                         $newType = self::TOKEN_DEFAULT;
                         break;
+                    // Constants
+                    case T_DIR:
+                    case T_FILE:
+                        $newType = self::TOKEN_CONSTANT;
+                        break;
+                    case T_VARIABLE:
+                        $newType = self::TOKEN_VARIABLE;
+                        break;
                     default:
                         // Compatibility with PHP 5.3
                         if (defined('T_TRAIT_C') && $token[0] === T_TRAIT_C) {