Merge branch 'master' into libraries

matomo-org · Nov 14, 2024 · a48cf5a · a48cf5a
2 parents 5cf4988 + aab8aa0
commit a48cf5a
Show file tree

Hide file tree

Showing 10 changed files with 391 additions and 16 deletions.
diff --git a/Parser/Client/Browser.php b/Parser/Client/Browser.php
@@ -108,7 +108,7 @@ class Browser extends AbstractClientParser
         'AW' => 'Amiga Aweb',
         'PN' => 'APN Browser',
         '6A' => 'Arachne',
-        'RA' => 'Arc',
+        'RA' => 'Arc Search',
         'R5' => 'Armorfly Browser',
         'AI' => 'Arvin',
         'AK' => 'Ask.com',

diff --git a/README.md b/README.md
diff --git a/Tests/Parser/Client/fixtures/browser.yml b/Tests/Parser/Client/fixtures/browser.yml
@@ -7930,7 +7930,7 @@
   user_agent: ArcMobile2/1 CFNetwork/1494.0.5 Darwin/23.4.0
   client:
     type: browser
-    name: Arc
+    name: Arc Search
     version: ""
     engine: WebKit
     engine_version: ""
@@ -9435,7 +9435,7 @@
   user_agent: ArcMobile2/1.3.1; iPhone; iOS 16.1.1; Scale/2.00
   client:
     type: browser
-    name: Arc
+    name: Arc Search
     version: 1.3.1
     engine: WebKit
     engine_version: ""
@@ -10339,3 +10339,25 @@
     engine: Blink
     engine_version: 116.0.5845.190
     family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.6723.60 Mobile Safari/537.36
+  client:
+    type: browser
+    name: Arc Search
+    version: ""
+    engine: Blink
+    engine_version: 130.0.6723.60
+    family: Chrome
+  headers:
+    http-x-requested-with: company.thebrowser.arc
+-
+  user_agent: Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Mobile Safari/537.36
+  client:
+    type: browser
+    name: Chrome Webview
+    version: ""
+    engine: Blink
+    engine_version: 123.0.0.0
+    family: Chrome
+  headers:
+    http-x-requested-with: com.android.webview
diff --git a/Tests/fixtures/clienthints.yml b/Tests/fixtures/clienthints.yml
@@ -3684,3 +3684,178 @@
     model: Galaxy A13
   os_family: Android
   browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Mobile Safari/537.36
+  headers:
+    Sec-CH-UA: '"Not_A Brand";v="8.0.0.0", "Chromium";v="120.0.6099.210", "Google Chrome";v="120.0.6099.210"'
+    Sec-CH-UA-Platform: "Android"
+    Sec-CH-UA-Mobile: "?1"
+    Sec-CH-UA-Full-Version: "120.0.6099.210"
+    Sec-CH-UA-Platform-Version: "11.0.0"
+    Sec-CH-UA-Model: "Model S 4G"
+  os:
+    name: Android
+    version: 11.0.0
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 120.0.6099.210
+    engine: Blink
+    engine_version: 120.0.6099.210
+  device:
+    type: smartphone
+    brand: Sunmax
+    model: Model S 4G
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Mobile Safari/537.36
+  headers:
+    Sec-CH-UA: '"Chromium";v="124.0.6367.113", "Google Chrome";v="124.0.6367.113", "Not-A.Brand";v="99.0.0.0"'
+    Sec-CH-UA-Platform: "Android"
+    Sec-CH-UA-Mobile: "?1"
+    Sec-CH-UA-Full-Version: "124.0.6367.113"
+    Sec-CH-UA-Platform-Version: "11.0.0"
+    Sec-CH-UA-Model: "Model S"
+  os:
+    name: Android
+    version: 11.0.0
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 124.0.6367.113
+    engine: Blink
+    engine_version: 124.0.6367.113
+  device:
+    type: smartphone
+    brand: Sunmax
+    model: Model S
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 12; Model D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.0.0 Mobile Safari/537.36
+  headers:
+    Sec-CH-UA: '" Not A;Brand";v="99.0.0.0", "Chromium";v="102.0.5005.125", "Google Chrome";v="102.0.5005.125"'
+    Sec-CH-UA-Platform: "Android"
+    Sec-CH-UA-Mobile: "?1"
+    Sec-CH-UA-Full-Version: "102.0.5005.125"
+    Sec-CH-UA-Platform-Version: "12.0.0"
+    Sec-CH-UA-Model: "Model D"
+  os:
+    name: Android
+    version: 12.0.0
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 102.0.5005.125
+    engine: Blink
+    engine_version: 102.0.5005.125
+  device:
+    type: smartphone
+    brand: Sunmax
+    model: Model D
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 8.1.0; Model A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Mobile Safari/537.36
+  headers:
+    Sec-CH-UA: '"Chromium";v="104.0.5112.69", " Not A;Brand";v="99.0.0.0", "Google Chrome";v="104.0.5112.69"'
+    Sec-CH-UA-Platform: "Android"
+    Sec-CH-UA-Mobile: "?1"
+    Sec-CH-UA-Full-Version: "104.0.5112.69"
+    Sec-CH-UA-Platform-Version: "8.1.0"
+    Sec-CH-UA-Model: "Model A"
+  os:
+    name: Android
+    version: 8.1.0
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 104.0.5112.69
+    engine: Blink
+    engine_version: 104.0.5112.69
+  device:
+    type: smartphone
+    brand: Sunmax
+    model: Model A
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; Model 6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.85 Mobile Safari/537.36
+  headers:
+    Sec-CH-UA: '"Chromium";v="94", "Google Chrome";v="94", ";Not A Brand";v="99"'
+    Sec-CH-UA-Platform: "Android"
+    Sec-CH-UA-Mobile: "?1"
+    Sec-CH-UA-Full-Version: "94.0.4606.85"
+    Sec-CH-UA-Platform-Version: "11.0.0"
+    Sec-CH-UA-Model: "Model 6"
+  os:
+    name: Android
+    version: 11.0.0
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 94.0.4606.85
+    engine: Blink
+    engine_version: 94.0.4606.85
+  device:
+    type: smartphone
+    brand: Sunmax
+    model: Model 6
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Mobile Safari/537.36
+  headers:
+    Sec-CH-UA: '"Chromium";v="124.0.6367.82", "Google Chrome";v="124.0.6367.82", "Not-A.Brand";v="99.0.0.0"'
+    Sec-CH-UA-Platform: "Android"
+    Sec-CH-UA-Mobile: "?1"
+    Sec-CH-UA-Full-Version: "124.0.6367.82"
+    Sec-CH-UA-Platform-Version: "11.0.0"
+    Sec-CH-UA-Model: "Model_6_pro_4G"
+  os:
+    name: Android
+    version: 11.0.0
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 124.0.6367.82
+    engine: Blink
+    engine_version: 124.0.6367.82
+  device:
+    type: smartphone
+    brand: Sunmax
+    model: Model 6 Pro 4G
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Mobile Safari/537.36
+  headers:
+    Sec-CH-UA: '"Chromium";v="122.0.6261.90", "Not(A:Brand";v="24.0.0.0", "Google Chrome";v="122.0.6261.90"'
+    Sec-CH-UA-Platform: "Android"
+    Sec-CH-UA-Mobile: "?1"
+    Sec-CH-UA-Full-Version: "122.0.6261.90"
+    Sec-CH-UA-Platform-Version: "9.0.0"
+    Sec-CH-UA-Model: "LECT-TAB1011H"
+  os:
+    name: Android
+    version: 9.0.0
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 122.0.6261.90
+    engine: Blink
+    engine_version: 122.0.6261.90
+  device:
+    type: tablet
+    brand: Lectrus
+    model: LECT-TAB1011H
+  os_family: Android
+  browser_family: Chrome
diff --git a/Tests/fixtures/smartphone-18.yml b/Tests/fixtures/smartphone-18.yml
@@ -3669,3 +3669,39 @@
     model: SS5424G
   os_family: Android
   browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 8.1.0; MS571) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: 8.1.0
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 103.0.0.0
+    engine: Blink
+    engine_version: 103.0.0.0
+  device:
+    type: smartphone
+    brand: Maxcom
+    model: MS571
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 9; MS572) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "9"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 108.0.0.0
+    engine: Blink
+    engine_version: 108.0.0.0
+  device:
+    type: smartphone
+    brand: Maxcom
+    model: MS572
+  os_family: Android
+  browser_family: Chrome
diff --git a/Tests/fixtures/tv-4.yml b/Tests/fixtures/tv-4.yml
@@ -4413,3 +4413,111 @@
     model: YNDX-00074
   os_family: Android
   browser_family: Unknown
+-
+  user_agent: 'Mozilla/5.0 (QtEmbedded; U; Linux; C) AppleWebKit/533.3 (KHTML, like Gecko) MAG200 stbapp ver: 6 rev: c8a6f17 Mobile Safari/533.3'
+  os:
+    name: GNU/Linux
+    version: ""
+    platform: ""
+  client:
+    type: browser
+    name: Mobile Safari
+    version: ""
+    engine: WebKit
+    engine_version: "533.3"
+  device:
+    type: tv
+    brand: Infomir
+    model: MAG200
+  os_family: GNU/Linux
+  browser_family: Safari
+-
+  user_agent: 'Mozilla/5.0 (QtEmbedded; U; Linux; C) AppleWebKit/533.3 (KHTML, like Gecko) MAG250 stbapp ver: 2 rev: 250 Safari/533.3'
+  os:
+    name: GNU/Linux
+    version: ""
+    platform: ""
+  client:
+    type: browser
+    name: Safari
+    version: ""
+    engine: WebKit
+    engine_version: "533.3"
+  device:
+    type: tv
+    brand: Infomir
+    model: MAG250
+  os_family: GNU/Linux
+  browser_family: Safari
+-
+  user_agent: 'Mozilla/5.0 (QtEmbedded; U; Linux; C) AppleWebKit/533.3 (KHTML, like Gecko) MAG350 stbapp ver: 4 rev: 2721 Mobile Safari/533.3'
+  os:
+    name: GNU/Linux
+    version: ""
+    platform: ""
+  client:
+    type: browser
+    name: Mobile Safari
+    version: ""
+    engine: WebKit
+    engine_version: "533.3"
+  device:
+    type: tv
+    brand: Infomir
+    model: MAG350
+  os_family: GNU/Linux
+  browser_family: Safari
+-
+  user_agent: Mozilla/5.0 (X11; Linux armv7l) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.108 Odin/74.3729.2.10 Safari/537.36 VK_PATCH/1.0 CE-HTML/1.0 HBBTV/2.0 MSD6886 (Hisense;50A6101EX;V0000.01.00a.N0519)
+  os:
+    name: GNU/Linux
+    version: ""
+    platform: ARM
+  client:
+    type: browser
+    name: Odin
+    version: 74.3729.2.10
+    engine: Blink
+    engine_version: 74.0.3729.108
+  device:
+    type: tv
+    brand: Hisense
+    model: 50A6101EX
+  os_family: GNU/Linux
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (X11; Linux armv7l) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.182 Odin/88.4324.2.10 Safari/537.36 Model/Hisense-MT9602 VIDAA/6.0(EDENWOOD;SmartTV;VS0355UE1;MTK9602/V0000.06.13P.O0810;UHD;VS0355U;)
+  os:
+    name: VIDAA
+    version: "6.0"
+    platform: ARM
+  client:
+    type: browser
+    name: Odin
+    version: 88.4324.2.10
+    engine: Blink
+    engine_version: 88.0.4324.182
+  device:
+    type: tv
+    brand: Edenwood
+    model: Smart TV
+  os_family: GNU/Linux
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (X11; Linux armv7l) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.182 Odin/88.4324.2.10 Safari/537.36 Model/Hisense-MT9602 VIDAA/6.0(SALORA_cx;SmartTV;VS0343FD1;MTK9602/V0000.01.00L.N1206;FHD;VS0343F;)
+  os:
+    name: VIDAA
+    version: "6.0"
+    platform: ARM
+  client:
+    type: browser
+    name: Odin
+    version: 88.4324.2.10
+    engine: Blink
+    engine_version: 88.0.4324.182
+  device:
+    type: tv
+    brand: Salora
+    model: Smart TV
+  os_family: GNU/Linux
+  browser_family: Chrome
diff --git a/regexes/client/browsers.yml b/regexes/client/browsers.yml
@@ -502,9 +502,9 @@
   engine:
     default: 'Blink'
 
-# Arc (https://arc.net/)
+# Arc Search (https://arc.net/ | https://arc.net/search)
 - regex: 'ArcMobile2(?:/(\d+\.[.\d]+);)?'
-  name: 'Arc'
+  name: 'Arc Search'
   version: '$1'
   engine:
     default: 'WebKit'