Put - at end of character class in regex

This avoids the need to escape the dash in character classes.
matomo-org · Jan 4, 2024 · 6f6ac3e · 6f6ac3e
1 parent 8f72201
commit 6f6ac3e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Parser/AbstractParser.php b/Parser/AbstractParser.php
@@ -312,7 +312,7 @@ protected function matchUserAgent(string $regex): ?array
         $matches = [];
 
         // only match if useragent begins with given regex or there is no letter before it
-        $regex = '/(?:^|[^A-Z0-9\-_]|[^A-Z0-9\-]_|sprd-|MZ-)(?:' . \str_replace('/', '\/', $regex) . ')/i';
+        $regex = '/(?:^|[^A-Z0-9_-]|[^A-Z0-9-]_|sprd-|MZ-)(?:' . \str_replace('/', '\/', $regex) . ')/i';
 
         try {
             if (\preg_match($regex, $this->userAgent, $matches)) {

diff --git a/regexes/bots.yml b/regexes/bots.yml
@@ -3533,5 +3533,5 @@
     url: 'https://www.bbc.com/'
 
 # Generic detections
-- regex: '[a-z0-9\-_]*(?:(?<!cu|power[ _]|m[ _])bot(?![ _]TAB|[ _]?5[0-9]|[ _]Senior|[ _]Junior)|crawler|crawl|checker|archiver|transcoder|spider|^firefox$|^chrome$)(?:[^a-z]|$)'
+- regex: '[a-z0-9_-]*(?:(?<!cu|power[ _]|m[ _])bot(?![ _]TAB|[ _]?5[0-9]|[ _]Senior|[ _]Junior)|crawler|crawl|checker|archiver|transcoder|spider|^firefox$|^chrome$)(?:[^a-z]|$)'
   name: 'Generic Bot'