Low-effort optimizations

Author: theodorejb

src/Handlebars.php

@@ -66,8 +66,14 @@ public static function createFrame(array $data): array
      */
     public static function escapeExpression(string $string): string
     {
-        $search = ['&', '<', '>', '"', "'", '`', '='];
-        $replace = ['&amp;', '&lt;', '&gt;', '&quot;', '&#x27;', '&#x60;', '&#x3D;'];
-        return str_replace($search, $replace, $string);
+        return strtr($string, [
+            '&' => '&amp;',
+            '<' => '&lt;',
+            '>' => '&gt;',
+            '"' => '&quot;',
+            "'" => '&#x27;',
+            '`' => '&#x60;',
+            '=' => '&#x3D;',
+        ]);
     }
 }

src/Runtime.php

@@ -188,8 +188,9 @@ public static function createContext(mixed $context, array $options, array $comp
         }
 
         $data = $options['data'] ?? [];
+        $extraHelpers = $options['helpers'] ?? [];
         return new RuntimeContext(
-            helpers: array_replace(Runtime::defaultHelpers(), $options['helpers'] ?? []),
+            helpers: $extraHelpers ? array_replace(Runtime::defaultHelpers(), $extraHelpers) : Runtime::defaultHelpers(),
             partials: array_replace($compiledPartials, $options['partials'] ?? []),
             data: ['root' => $data['root'] ?? $context],
             frame: $data,
@@ -251,8 +252,8 @@ public static function ifvar(mixed $v, bool $zero = false): bool
             && $v !== false
             && ($zero || ($v !== 0 && $v !== 0.0))
             && $v !== ''
-            && (!$v instanceof \Stringable || (string) $v !== '')
-            && (!is_array($v) || $v);
+            && (!is_array($v) || $v)
+            && (!$v instanceof \Stringable || (string) $v !== '');
     }
 
     /**