Fix level 5 type errors

Author: theodorejb

phpstan.neon

@@ -1,5 +1,5 @@
 parameters:
-	level: 4
+	level: 5
 	paths:
 		- src
 		- tests

src/Encoder.php

@@ -24,7 +24,7 @@ public static function enc(array|string|int|bool|null $var): string
      *
      * @return string The htmlencoded value of the specified variable
      */
-    public static function encq(array|string|int|bool|null $var)
+    public static function encq(array|string|int|bool|null $var): string
     {
         return str_replace(['=', '`', '''], ['=', '`', '''], self::enc($var));
     }

src/Expression.php

@@ -61,8 +61,8 @@ public static function analyze(array $var): array
      * Get normalized handlebars expression for a variable.
      *
      * @param int $levels trace N levels top parent scope
-     * @param bool $spvar is the path start with @ or not
-     * @param array<string|int> $var variable parsed path
+     * @param bool $spvar whether the path starts with @
+     * @param array<string|null> $var variable parsed path
      *
      * @return string normalized expression for debug display
      */

src/Parser.php

@@ -217,7 +217,7 @@ public static function isSubExp(array $var): bool
     /**
      * Analyze parsed token for advanced variables.
      *
-     * @param array<bool|int|array> $vars parsed token
+     * @param list<string> $vars parsed token
      * @param string $token original token
      *
      * @return array<bool|int|array> Return parsed result
@@ -368,7 +368,7 @@ protected static function analyze(string $token, Context $context): array
                         $stack += strlen($m[2]);
                     }
                     // end an argument when token ends with expected character (ignoring whitespace + first instance)
-                    if (substr($t, -1, 1) === $expect && !preg_match('/^\s+' . preg_quote($expect) . '$/', $prev)) {
+                    if (substr($t, -1, 1) === $expect && !preg_match('/^\s+' . preg_quote($expect, '/') . '$/', $prev)) {
                         if ($stack > 0 && !$quotes) {
                             preg_match('/(\\)+)$/', $t, $matchedq);
                             $stack -= isset($matchedq[0]) ? strlen($matchedq[0]) : 1;

src/Runtime.php

@@ -80,9 +80,9 @@ public static function encq($var): string
      * @param array<array|string|int>|string|int|bool|null $v value to be output
      * @param int $ex 1 to return untouched value, default is 0
      *
-     * @return array<array|string|int>|string|int|null The raw value of the specified variable
+     * @return array<array|string|int>|string The raw value of the specified variable
      */
-    public static function raw($v, int $ex = 0)
+    public static function raw(array|string|int|bool|null $v, int $ex = 0): string|array
     {
         if ($ex) {
             return $v;
@@ -100,11 +100,11 @@ public static function raw($v, int $ex = 0)
             if (count(array_diff_key($v, array_keys(array_keys($v)))) > 0) {
                 return '[object Object]';
             } else {
-                $ret = [];
+                $ret = '';
                 foreach ($v as $vv) {
-                    $ret[] = static::raw($vv);
+                    $ret .= static::raw($vv) . ',';
                 }
-                return join(',', $ret);
+                return substr($ret, 0, -1);
             }
         }
 

tests/TokenTest.php

@@ -9,8 +9,8 @@ class TokenTest extends TestCase
 {
     public function testToString(): void
     {
-        $this->assertSame('c', Token::toString([0, 'a', 'b', 'c', 'd', 'e']));
-        $this->assertSame('cd', Token::toString([0, 'a', 'b', 'c', 'd', 'e', 'f']));
-        $this->assertSame('qd', Token::toString([0, 'a', 'b', 'c', 'd', 'e', 'f'], [3 => 'q']));
+        $this->assertSame('c', Token::toString(['0', 'a', 'b', 'c', 'd', 'e']));
+        $this->assertSame('cd', Token::toString(['0', 'a', 'b', 'c', 'd', 'e', 'f']));
+        $this->assertSame('qd', Token::toString(['0', 'a', 'b', 'c', 'd', 'e', 'f'], [3 => 'q']));
     }
 }