Merge branch 'master' into updatereadme

Author: liviuconcioiu

DeviceDetector.php

@@ -776,7 +776,7 @@ protected function getOsAttribute(string $attr): string
      */
     protected function hasAndroidTableFragment(): bool
     {
-        $regex = 'Android( [\.0-9]+)?; Tablet;|Tablet(?! PC)|.*\-tablet$';
+        $regex = 'Android( [.0-9]+)?; Tablet;|Tablet(?! PC)|.*\-tablet$';
 
         return !!$this->matchUserAgent($regex);
     }
@@ -788,7 +788,7 @@ protected function hasAndroidTableFragment(): bool
      */
     protected function hasAndroidMobileFragment(): bool
     {
-        $regex = 'Android( [\.0-9]+)?; Mobile;|.*\-mobile$';
+        $regex = 'Android( [.0-9]+)?; Mobile;|.*\-mobile$';
 
         return !!$this->matchUserAgent($regex);
     }
@@ -800,7 +800,7 @@ protected function hasAndroidMobileFragment(): bool
      */
     protected function hasAndroidVRFragment(): bool
     {
-        $regex = 'Android( [\.0-9]+)?; Mobile VR;| VR ';
+        $regex = 'Android( [.0-9]+)?; Mobile VR;| VR ';
 
         return !!$this->matchUserAgent($regex);
     }
@@ -959,7 +959,7 @@ protected function parseDevice(): void
          *       a detected browser, but can still be detected. So we check the useragent for Chrome instead.
          */
         if (null === $this->device && 'Android' === $osFamily
-            && $this->matchUserAgent('Chrome/[\.0-9]*')
+            && $this->matchUserAgent('Chrome/[.0-9]*')
         ) {
             if ($this->matchUserAgent('(?:Mobile|eliboM)')) {
                 $this->device = AbstractDeviceParser::DEVICE_TYPE_SMARTPHONE;

Parser/Client/Browser.php

@@ -577,6 +577,7 @@ class Browser extends AbstractClientParser
         'K1' => 'Sidekick',
         'S1' => 'SimpleBrowser',
         '3S' => 'SilverMob US',
+        'ZB' => 'Singlebox',
         'SY' => 'Sizzy',
         'K3' => 'Skye',
         'SK' => 'Skyfire',
@@ -769,7 +770,7 @@ class Browser extends AbstractClientParser
             'M9', 'F9', '0P', '0A', 'JR', 'D3', 'TK', 'BP', '2F',
             '2M', 'K7', '1N', '8A', 'H7', 'X3', 'T4', 'X4', '5O',
             '8C', '3M', '6I', '2P', 'PU', '7I', 'X5', 'AL', '3P',
-            'W2',
+            'W2', 'ZB',
         ],
         'Firefox'            => [
             'FF', 'BI', 'BF', 'BH', 'BN', 'C0', 'CU', 'EI', 'F1',

Parser/Client/Browser/Engine/Version.php

@@ -49,7 +49,7 @@ public function parse(): ?array
         }
 
         if ('Gecko' === $this->engine || 'Clecko' === $this->engine) {
-            $pattern = '~[ ](?:rv[: ]([0-9\.]+)).*(?:g|cl)ecko/[0-9]{8,10}~i';
+            $pattern = '~[ ](?:rv[: ]([0-9.]+)).*(?:g|cl)ecko/[0-9]{8,10}~i';
 
             if (\preg_match($pattern, $this->userAgent, $matches)) {
                 return ['version' => \array_pop($matches)];

Parser/Device/ShellTv.php

@@ -36,7 +36,7 @@ class ShellTv extends AbstractDeviceParser
      */
     public function isShellTv(): bool
     {
-        $regex = '[a-z]+[ _]Shell[ _]\w{6}|tclwebkit(\d+[\.\d]*)';
+        $regex = '[a-z]+[ _]Shell[ _]\w{6}|tclwebkit(\d+[.\d]*)';
         $match = $this->matchUserAgent($regex);
 
         return null !== $match;

Tests/Parser/Client/fixtures/browser.yml

@@ -10321,3 +10321,21 @@
     engine: Blink
     engine_version: 107.0.4280.88
     family: Chrome
+-
+  user_agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Skye/6.4.1 Chrome/96.0.4664.110 Electron/16.0.7 Safari/537.36
+  client:
+    type: browser
+    name: Skye
+    version: 6.4.1
+    engine: Blink
+    engine_version: 96.0.4664.110
+    family: Chrome
+-
+  user_agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Singlebox/38.2.0 Chrome/116.0.5845.190 Electron/26.2.2 Safari/537.36
+  client:
+    type: browser
+    name: Singlebox
+    version: 38.2.0
+    engine: Blink
+    engine_version: 116.0.5845.190
+    family: Chrome

regexes/bots.yml

@@ -981,7 +981,7 @@
     name: ''
     url: 'https://ip-guide.com'
 
-- regex: 'k6/[0-9\.]+'
+- regex: 'k6/[0-9.]+'
   name: 'K6'
   url: 'https://k6.io/'