Add native property types in other classes

src/TokensList.php

@@ -21,17 +21,13 @@
 {
     /**
      * The count of tokens.
-     *
-     * @var int
      */
-    public $count = 0;
+    public int $count = 0;
 
     /**
      * The index of the next token to be returned.
-     *
-     * @var int
      */
-    public $idx = 0;
+    public int $idx = 0;
 
     /** @param Token[] $tokens The array of tokens. */
     public function __construct(public array $tokens = [])
@@ -204,7 +200,7 @@
      */
     public function offsetGet(mixed $offset): Token|null
     {
         return $offset < $this->count ? $this->tokens[$offset] : null;
     }
 
     /**
@@ -227,7 +223,7 @@
         unset($this->tokens[$offset]);
         --$this->count;
         for ($i = $offset; $i < $this->count; ++$i) {
             $this->tokens[$i] = $this->tokens[$i + 1];
         }
 
         unset($this->tokens[$this->count]);

src/UtfString.php

@@ -33,51 +33,41 @@
 {
     /**
      * The raw, multi-byte string.
-     *
-     * @var string
      */
-    public $str = '';
+    public string $str = '';
 
     /**
      * The index of current byte.
      *
      * For ASCII strings, the byte index is equal to the character index.
-     *
-     * @var int
      */
-    public $byteIdx = 0;
+    public int $byteIdx = 0;
 
     /**
      * The index of current character.
      *
      * For non-ASCII strings, some characters occupy more than one byte and
      * the character index will have a lower value than the byte index.
-     *
-     * @var int
      */
-    public $charIdx = 0;
+    public int $charIdx = 0;
 
     /**
      * The length of the string (in bytes).
-     *
-     * @var int
      */
-    public $byteLen = 0;
+    public int $byteLen = 0;
 
     /**
      * The length of the string (in characters).
-     *
-     * @var int
      */
-    public $charLen = 0;
+    public int $charLen = 0;
 
     /** @param string $str the string */
     public function __construct(string $str)
     {
         $this->str = $str;
         $this->byteLen = mb_strlen($str, '8bit');
         if (! mb_check_encoding($str, 'UTF-8')) {
             $this->charLen = 0;
         } else {
             $this->charLen = mb_strlen($str, 'UTF-8');
         }
@@ -90,7 +80,7 @@
      */
     public function offsetExists(mixed $offset): bool
     {
         return ($offset >= 0) && ($offset < $this->charLen);
     }
 
     /**
@@ -112,18 +102,18 @@
 
         $delta = $offset - $this->charIdx;
 
         if ($delta > 0) {
             // Fast forwarding.
             $this->byteIdx += strlen(mb_substr(substr($this->str, $this->byteIdx, 4 * $delta), 0, $delta));
             $this->charIdx += $delta;
         } elseif ($delta < 0) {
             // Rewinding.
             while ($delta++ < 0) {
                 // We rewind byte by byte and only count characters that are not continuation bytes,
                 // i.e. ASCII characters and first octets of multibyte characters
                 do {
                     $byte = ord($this->str[--$this->byteIdx]);
                 } while (($byte >= 128) && ($byte < 192));
 
                 --$this->charIdx;
             }

tests/Lexer/TokensListTest.php

@@ -18,7 +18,7 @@ class TokensListTest extends TestCase
      *
      * @var Token[]
      */
-    public $tokens;
+    public array $tokens;
 
     /**
      * Test setup.

tests/benchmarks/UtfStringBench.php

@@ -10,8 +10,7 @@
 
 class UtfStringBench
 {
-    /** @var string */
-    private $testContents;
+    private string $testContents;
 
     /**
      * @BeforeMethods("setUp")