Remove some redundant regex escapes

Author: theodorejb

composer.json

@@ -23,9 +23,9 @@
         "php": ">=8.2"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.73",
+        "friendsofphp/php-cs-fixer": "^3.74",
         "jbboehr/handlebars-spec": "dev-master",
-        "phpstan/phpstan": "^2.1.10",
+        "phpstan/phpstan": "^2.1.11",
         "phpunit/phpunit": "^11.5"
     },
     "autoload": {

composer.lock

@@ -109,10 +109,10 @@ protected static function getExpression(string $v, Context $context, int|string
             $ret[] = $levels;
         }
 
-        if (preg_match('/\\]/', $v)) {
+        if (str_contains($v, ']')) {
             preg_match_all(Token::VARNAME_SEARCH, $v, $matchedAll);
         } else {
-            preg_match_all('/([^\\.\\/]+)/', $v, $matchedAll);
+            preg_match_all('/([^.\\/]+)/', $v, $matchedAll);
         }
 
         if ($v !== '.') {
@@ -239,7 +239,7 @@ protected static function advancedVariable(array $vars, Context $context, string
                 continue;
             }
 
-            if (preg_match('/^((\\[([^\\]]+)\\])|([^=^["\']+))=(.+)$/', $var, $m)) {
+            if (preg_match('/^((\\[([^\\]]+)\\])|([^=^\\["\']+))=(.+)$/', $var, $m)) {
                 $idx = $m[3] ? $m[3] : $m[4];
                 $var = $m[5];
                 // handle foo=(...)
@@ -251,13 +251,13 @@ protected static function advancedVariable(array $vars, Context $context, string
 
             if (!preg_match("/^(\"|\\\\')(.*)(\"|\\\\')$/", $var)) {
                 // foo]  Rule 1: no starting [ or [ not start from head
-                if (preg_match('/^[^\\[\\.]+[\\]\\[]/', $var)
+                if (preg_match('/^[^\\[.]+[\\[\\]]/', $var)
                     // [bar  Rule 2: no ending ] or ] not in the end
-                    || preg_match('/[\\[\\]][^\\]\\.]+$/', $var)
+                    || preg_match('/[\\[\\]][^].]+$/', $var)
                     // ]bar. Rule 3: middle ] not before .
-                    || preg_match('/\\][^\\]\\[\\.]+\\./', $var)
+                    || preg_match('/][^\\[.\\]]+\\./', $var)
                     // .foo[ Rule 4: middle [ not after .
-                    || preg_match('/\\.[^\\]\\[\\.]+\\[/', preg_replace('/^(..\\/)+/', '', preg_replace('/\\[[^\\]]+\\]/', '[XXX]', $var)))
+                    || preg_match('/\\.[^\\[.\\]]+\\[/', preg_replace('/^(..\\/)+/', '', preg_replace('/\\[[^\\]]+\\]/', '[XXX]', $var)))
                 ) {
                     $context->error[] = "Wrong variable naming as '$var' in $token !";
                 } else {
@@ -337,7 +337,7 @@ protected static function detectQuote(string $string): ?array
     protected static function analyze(string $token, Context $context): array
     {
         // Do not break quoted strings. Also, allow escaped quotes inside them.
-        $count = preg_match_all('/(\s*)([^"\s]*"(\\\\\\\\.|[^"])*"|[^\'\s]*\'(\\\\\\\\.|[^\'])*\'|\\S+)/', $token, $matches);
+        $count = preg_match_all('/(\s*)([^"\s]*"(\\\\\\\\.|[^"])*"|[^\'\s]*\'(\\\\\\\\.|[^\'])*\'|\S+)/', $token, $matches);
         // Parse arguments and deal with "..." or [...] or (...) or \'...\' or |...|
         if ($count > 0) {
             $vars = [];

src/Parser.php

@@ -182,11 +182,12 @@ public function testSpecs($spec)
             if (!isset($func['php'])) {
                 $this->markTestIncomplete("Skip [{$spec['file']}#{$spec['description']}]#{$spec['no']} , no PHP helper code provided for this case.");
             }
-            $hname = preg_replace('/\\.|\\//', '_', "custom_helper_{$spec['no']}_{$tested}_$name");
+            $hname = preg_replace('/[.\\/]/', '_', "custom_helper_{$spec['no']}_{$tested}_$name");
             $helpers[$name] = $hname;
             $helper = patch_safestring(
                 preg_replace('/function/', "function $hname", $func['php'], 1),
             );
+            $helper = str_replace('new \Handlebars\SafeString', 'new \DevTheorem\Handlebars\SafeString', $helper);
             $helper = str_replace('$options[\'data\']', '$options->data', $helper);
             $helper = str_replace('$options[\'hash\']', '$options->hash', $helper);
             $helper = str_replace('$arguments[count($arguments)-1][\'name\'];', '$arguments[count($arguments)-1]->name;', $helper);