Merge branch 'master' into devices

matomo-org · Feb 15, 2024 · c4b4b32 · c4b4b32
2 parents 3e8292c + ce1cb4d
commit c4b4b32
Show file tree

Hide file tree

Showing 13 changed files with 870 additions and 52 deletions.
diff --git a/DeviceDetector.php b/DeviceDetector.php
@@ -1053,7 +1053,7 @@ protected function parseDevice(): void
          */
         if (\in_array($clientName, [
             'Kylo', 'Espial TV Browser', 'LUJO TV Browser', 'LogicUI TV Browser', 'Open TV Browser', 'Seraphic Sraf',
-            'Opera Devices', 'Crow Browser', 'Vewd Browser', 'TiviMate',
+            'Opera Devices', 'Crow Browser', 'Vewd Browser', 'TiviMate', 'Quick Search TV',
         ])
         ) {
             $this->device = AbstractDeviceParser::DEVICE_TYPE_TV;

diff --git a/Parser/Client/Browser.php b/Parser/Client/Browser.php
@@ -260,6 +260,7 @@ class Browser extends AbstractClientParser
         'GP' => 'Google Earth Pro',
         'GO' => 'GOG Galaxy',
         'GR' => 'GoBrowser',
+        'G2' => 'GO Browser',
         'HB' => 'Harman Browser',
         'HS' => 'HasBrowser',
         'HA' => 'Hawk Turbo Browser',
@@ -269,6 +270,7 @@ class Browser extends AbstractClientParser
         'HI' => 'Hi Browser',
         'HO' => 'hola! Browser',
         'H4' => 'Holla Web Browser',
+        'H5' => 'HotBrowser',
         'HJ' => 'HotJava',
         'HT' => 'HTC Browser',
         'HU' => 'Huawei Browser Mobile',
@@ -442,13 +444,15 @@ class Browser extends AbstractClientParser
         'PI' => 'PrivacyWall',
         'P4' => 'Privacy Explorer Fast Safe',
         'P3' => 'Private Internet Browser',
+        'P5' => 'Proxy Browser',
         'P2' => 'Pi Browser',
         'P0' => 'PronHub Browser',
         'PC' => 'PSI Secure Browser',
         'RW' => 'Reqwireless WebViewer',
         'PS' => 'Microsoft Edge',
         'QA' => 'Qazweb',
         'Q3' => 'Qmamu',
+        'Q4' => 'Quick Search TV',
         'Q2' => 'QQ Browser Lite',
         'Q1' => 'QQ Browser Mini',
         'QQ' => 'QQ Browser',
@@ -485,6 +489,7 @@ class Browser extends AbstractClientParser
         'S1' => 'SimpleBrowser',
         '3S' => 'SilverMob US',
         'SY' => 'Sizzy',
+        'K3' => 'Skye',
         'SK' => 'Skyfire',
         'SS' => 'Seraphic Sraf',
         'KK' => 'SiteKiosk',
@@ -548,6 +553,7 @@ class Browser extends AbstractClientParser
         'UE' => 'Ume Browser',
         'V0' => 'vBrowser',
         'VA' => 'Vast Browser',
+        'V3' => 'VD Browser',
         'VE' => 'Venus Browser',
         'WD' => 'Vewd Browser',
         'N0' => 'Nova Video Downloader Pro',
@@ -635,7 +641,8 @@ class Browser extends AbstractClientParser
             'O6', 'P7', 'LJ', 'LC', 'O7', 'N2', 'A8', 'P8', 'RB',
             '1W', 'EV', 'I9', 'V4', 'H4', '1T', 'M5', '0S', '0C',
             'ZR', 'D6', 'F6', 'RC', 'WD', 'P3', 'FT', 'A9', 'X2',
-            'N3', 'GD', 'O9', 'Q3', 'F7', 'K2',
+            'N3', 'GD', 'O9', 'Q3', 'F7', 'K2', 'P5', 'H5', 'V3',
+            'K3', 'Q4', 'G2',
         ],
         'Firefox'            => [
             'AX', 'BI', 'BF', 'BH', 'BN', 'C0', 'CU', 'EI', 'F1',
@@ -676,7 +683,8 @@ class Browser extends AbstractClientParser
         'B9', 'T0', 'I8', 'O6', 'P7', 'O8', '4B', 'A8', 'P8',
         '1W', 'EV', 'Z0', 'I9', 'V4', 'H4', 'M5', '0S', '0C',
         'ZR', 'D6', 'F6', 'P3', 'FT', 'A9', 'X2', 'NI', 'FG',
-        'TH', 'N3', 'GD', 'O9', 'Q3', 'F7', 'K2', 'N4',
+        'TH', 'N3', 'GD', 'O9', 'Q3', 'F7', 'K2', 'N4', 'P5',
+        'H5', 'V3', 'G2',
     ];
 
     /**

diff --git a/Tests/Parser/Client/fixtures/browser.yml b/Tests/Parser/Client/fixtures/browser.yml
@@ -7972,9 +7972,9 @@
     type: browser
     name: SecureX
     version: ""
-    engine: WebKit
+    engine: Blink
     engine_version: ""
-    family: Android Browser
+    family: Chrome
   headers:
     http-x-requested-with: com.securex.browser
 -
@@ -8187,3 +8187,150 @@
     engine: WebKit
     engine_version: ""
     family:
+-
+  user_agent: 'Dalvik/2.1.0 (Linux; U; Android 13; SM-A245M Build/TP1A.220624.014) AppleWebKit [PB/171] (KHTML, like Gecko) Chrome/108.0.0.0 Mobile Safari/537.36'
+  client:
+    type: browser
+    name: Proxy Browser
+    version: ""
+    engine: Blink
+    engine_version: 108.0.0.0
+    family: Chrome
+  headers:
+    http-x-requested-with: proxy.browser.unblock.sites.proxybrowser.unblocksites
+-
+  user_agent: 'Dalvik/2.1.0 (Linux; U; Android 13; V2206 Build/TP1A.220624.014) AppleWebKit [PB/107]'
+  client:
+    type: browser
+    name: Proxy Browser
+    version: ""
+    engine: Blink
+    engine_version: ""
+    family: Chrome
+-
+  user_agent: 'Dalvik/2.1.0 (Linux; U; Android 13; CMA-LX3 Build/HONORCMA-L43CQ) AppleWebKit [HS/36]'
+  client:
+    type: browser
+    name: HotBrowser
+    version: ""
+    engine: Blink
+    engine_version: ""
+    family: Chrome
+-
+  user_agent: 'Dalvik/2.1.0 (Linux; U; Android 13; SM-A042M Build/TP1A.220624.014) AppleWebKit [HS/28]'
+  client:
+    type: browser
+    name: HotBrowser
+    version: ""
+    engine: Blink
+    engine_version: ""
+    family: Chrome
+  headers:
+    http-x-requested-with: com.hotsurf.browser
+-
+  user_agent: 'Dalvik/2.1.0 (Linux; U; Android 10; ZTE 8010 Build/QP1A.190711.020) AppleWebKit [HB/29]'
+  client:
+    type: browser
+    name: SecureX
+    version: ""
+    engine: Blink
+    engine_version: ""
+    family: Chrome
+-
+  user_agent: 'Dalvik/2.1.0 (Linux; U; Android 12; TECNO BF6 Build/SP1A.210812.001) AppleWebKit [PB/81] (KHTML, like Gecko) Chrome/108.0.0.0 Mobile Safari/537.36'
+  client:
+    type: browser
+    name: SecureX
+    version: ""
+    engine: Blink
+    engine_version: 108.0.0.0
+    family: Chrome
+-
+  user_agent: 'Dalvik/2.1.0 (Linux; U; Android 10; Infinix X680B Build/QP1A.190711.020) AppleWebKit [PB/66] (KHTML, like Gecko) Chrome/108.0.0.0 Mobile Safari/537.36'
+  client:
+    type: browser
+    name: SecureX
+    version: ""
+    engine: Blink
+    engine_version: 108.0.0.0
+    family: Chrome
+-
+  user_agent: 'Dalvik/2.1.0 (Linux; U; Android 13; moto g 5G (2022) Build/T1SA33.73-40) AppleWebKit [VD/240]'
+  client:
+    type: browser
+    name: VD Browser
+    version: ""
+    engine: Blink
+    engine_version: ""
+    family: Chrome
+  headers:
+    http-x-requested-with: vpn.video.downloader
+-
+  user_agent: Dalvik/2.1.0 (Linux; U; Android 12; 21061110AG Build/SP1A.210812.016) VD/218
+  client:
+    type: browser
+    name: VD Browser
+    version: ""
+    engine: Blink
+    engine_version: ""
+    family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 10; M2006C3MG Build/QP1A.190711.020; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/105.0.5195.79 Mobile Safari/537.36
+  client:
+    type: browser
+    name: Via
+    version: ""
+    engine: Blink
+    engine_version: 105.0.5195.79
+    family: Chrome
+  headers:
+    http-x-requested-with: mark.via.gg
+-
+  user_agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Skye/6.6.4 Chrome/95.0.4638.54 Safari/537.36
+  client:
+    type: browser
+    name: Skye
+    version: 6.6.4
+    engine: Blink
+    engine_version: 95.0.4638.54
+    family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 9; 43U800BR Build/PTT1.190222.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/75.0.3770.143 Safari/537.36 Quick Search TV/21.09.23
+  client:
+    type: browser
+    name: Quick Search TV
+    version: 21.09.23
+    engine: Blink
+    engine_version: 75.0.3770.143
+    family: Chrome
+-
+  user_agent: Mozilla/5.0 (X11; Linux x86_64; MBX4K Maverick Build/QT; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/108.0.5359.128 Safari/537.36 Quick Search TV/Wild Moon Edition 120.13
+  client:
+    type: browser
+    name: Quick Search TV
+    version: "120.13"
+    engine: Blink
+    engine_version: 108.0.5359.128
+    family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.5845.172 Mobile Safari/537.36
+  client:
+    type: browser
+    name: Quick Search TV
+    version: ""
+    engine: Blink
+    engine_version: 116.0.5845.172
+    family: Chrome
+  headers:
+    http-x-requested-with: com.aospstudio.tvsearch
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 12; es-us; 220733SG Build/SP1A.210812.016) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/61.0.3163.128 Mobile Safari/537.36 Lite Browser/4.7
+  client:
+    type: browser
+    name: GO Browser
+    version: ""
+    engine: Blink
+    engine_version: 61.0.3163.128
+    family: Chrome
+  headers:
+    http-x-requested-with: com.go.browser