php 8.1 support

Author: Ghostff

README.md

@@ -35,4 +35,3 @@ echo '<pre>', (new Highlight)
 ```
 
 ![alt tag](https://github.com/Ghostff/php_prettify/blob/master/images/dark.png)   
-![alt tag](https://github.com/Ghostff/php_prettify/blob/master/images/light.png)

code.txt

@@ -1,18 +1,18 @@
 <?php
 declare(strict_types=1);
 
-namespace Text;
-use PhpPrettify as Php;
+namespace DateTime as Date;
 
 #[AttrCommas('foo'), AttrCommas(2342)]
-class Text extends Namespace\TextProcess implements Php
+class Text extends Namespace\TextProcess implements RandomInterface
 {
     /**
      * An array of the types that have been resolved.
      *
      * @var array
      */
     protected $resolved = array();
+    protected readonly DateTime $date;
 
     public function isShared(#[Attr('foo')] string $abstract, int &$counter): bool
     {
@@ -28,7 +28,7 @@ class Text extends Namespace\TextProcess implements Php
             $shared = false;
         }
 
-        #smart function type dictation
+        #function type dictation
         self::hash(hash('sha1', 'foobar'), $this->hash());
         return (isset($this->instances[$abstract]) || $shared === true);
     }

composer.json

@@ -15,6 +15,6 @@
         }
     ],
     "require": {
-        "php": ">=5.4"
+        "php": ">=8.0"
     }
 }

images/dark.png

@@ -6,8 +6,8 @@
     (new ghostff\Highlight\Highlight())
         ->setTheme('bittr')                       // Sets code highlight theme.
         ->setStyle('body {margin:0;padding:0}')     // Append css to default to style.
-        ->setHighlight(22, ['style' => 'color:red'])    // Add html attributes to selected line(tr).
-        ->showLineNumber(1, false)                      // Show line number starting from line 1 and prevent selection of line number.
+//        ->setHighlight(22, ['style' => 'color:red'])    // Add html attributes to selected line(tr).
+//        ->showLineNumber(1, false)                      // Show line number starting from line 1 and prevent selection of line number.
         ->render('code.txt', true),
 '</pre>';
 

index.php

@@ -28,7 +28,6 @@ class Highlight
     private string $constant           = 'color:#8C4D03';
     private string $tag_close          = 'color:#F00000';
     private string $operators          = 'color:#0000FF';
-    private string $semi_colon         = 'color:#000000';
     private string $parenthesis        = 'color:#038C8C';
     private string $return_type        = 'color:#E3093F';
     private string $php_function       = 'color:#6367A7';
@@ -60,15 +59,14 @@ class Highlight
         (i(f|mplements|n(clude(_once)?|st(anceof|eadof)|terface)|sset))|
         (n(amespace|ew))|
         (p(r(i(nt|vate)|otected)|ublic))|
-        (re(quire(_once)?|turn))|
+        (re(quire(_once)?|turn|adonly))|
         (s(tatic|witch))|
         (t(hrow|r(ait|y)))|
         (u(nset(?!\s*\))|se))|
         (__halt_compiler|break|list|(x)?or|var|while|match))\b/';
     private string $operators_ptrn          = '/((?<! (style|class))\=|\.|\!|\+|\%|-(?!\w+:)|(?<!https|http)[^a-z+]:|\@|\||\?|&gt;|&lt;|&amp;)/';
-    private string $semi_colon_ptrn         = '/(?<![&lt|&gt|&amp]);/';
     private string $parenthesis_ptrn        = '/\(|\)/';
-    private string $return_type_ptrn        = '/(?<=\<\/span\>\:|\:\<\/span\>)\s*(?:\<span.*?\>\:<span>)*(string|bool|array|float|int|callable|void)/';
+    private string $return_type_ptrn        = '/(?<=\<\/span\>\:|\:\<\/span\>)\s*(?:\<span.*?\>\:<span>)*(string|bool|array|float|int|callable|void|never)/';
     private string $curly_braces_ptrn       = '/[\{\}]/';
     private string $parameter_type_ptrn     = '/(?<!\w)(string|bool|array|float|int|callable)\s*(?=\<span.*?class="(variable|operators)"\>[\$|&amp;])/';
     private string $square_bracket_ptrn     = '/\[|\]/';
@@ -125,12 +123,11 @@ private function format(string $code, ?string $file_name, bool $cache): string
 
         while ($token !== false)
         {
-            $value = rtrim($token, PHP_EOL);
-            if ($value == '') {
-                $value = '  ';
+            $line = rtrim($token, PHP_EOL);
+            if ($line == '') {
+                $line = '  ';
             }
 
-            $line = preg_replace($this->semi_colon_ptrn, "<span style=\"{$this->semi_colon}\" class=\"semi_colon\">\$0</span>", $value);
             $gui_line_number = $this->show_line_number ? "<td" . ($this->line_selectable ? '' : ' unselectable="on"') . ">{$start_number}</td><td>" : '<td>';
 
             if (isset($this->highlight[$start_number]))