Merge remote-tracking branch 'upstream/master' into pr_device_410

matomo-org · Oct 11, 2023 · 52a230c · 52a230c
2 parents 54a2cab + 3105753
commit 52a230c
Show file tree

Hide file tree

Showing 12 changed files with 1,012 additions and 56 deletions.
diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php
@@ -94,6 +94,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         '88'  => '8848',
         '10M' => '10moons',
         '41'  => 'A1',
+        'AK1' => 'A&K',
         '00'  => 'Accent',
         'ACC' => 'Accesstyle',
         'AE'  => 'Ace',
@@ -204,6 +205,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'BO'  => 'BangOlufsen',
         'BN'  => 'Barnes & Noble',
         'BAR' => 'BARTEC',
+        'BAS' => 'BASE',
         'BB'  => 'BBK',
         '0B'  => 'BB Mobile',
         'B6'  => 'BDF',
@@ -340,6 +342,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'CW'  => 'Cowon',
         '75'  => 'Covia',
         'QG'  => 'COYOTE',
+        'CKK' => 'CKK Mobile',
         'YW'  => 'ClearPHONE',
         '33'  => 'Clementoni',
         'CR'  => 'CreNova',
@@ -927,6 +930,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         '3X'  => 'Mastertech',
         'MAS' => 'Master-G',
         '50'  => 'Matrix',
+        'MAT' => 'Matco Tools',
         '7M'  => 'Maxcom',
         '7M1' => 'Maxfone',
         'ZM'  => 'Maximus',
@@ -1390,6 +1394,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         '68'  => 'Soho Style',
         'SOB' => 'SobieTech',
         'PK'  => 'Spark',
+        'SPX' => 'Sparx',
         'FS'  => 'SPC',
         '6S'  => 'Spectrum',
         '43'  => 'Spectralink',

diff --git a/README.md b/README.md
diff --git a/Tests/fixtures/bots.yml b/Tests/fixtures/bots.yml
@@ -584,10 +584,46 @@
   bot:
     name: CloudFlare Always Online
     category: Site Monitor
-    url: http://www.cloudflare.com/always-online
+    url: https://www.cloudflare.com/always-online
     producer:
       name: CloudFlare
-      url: http://www.cloudflare.com
+      url: https://www.cloudflare.com/
+-
+  user_agent: Cloudflare-SSLDetector
+  bot:
+    name: Cloudflare SSL Detector
+    category: Site Monitor
+    url: https://developers.cloudflare.com/fundamentals/reference/cloudflare-site-crawling/
+    producer:
+      name: CloudFlare
+      url: https://www.cloudflare.com/
+-
+  user_agent: Cloudflare Custom Hostname Verification
+  bot:
+    name: Cloudflare Custom Hostname Verification
+    category: Service Agent
+    url: https://developers.cloudflare.com/fundamentals/reference/cloudflare-site-crawling/
+    producer:
+      name: CloudFlare
+      url: https://www.cloudflare.com/
+-
+  user_agent: 'Mozilla/5.0 (compatible; Cloudflare-Traffic-Manager/1.0; +https://www.cloudflare.com/traffic-manager/; pool-id: <POOLID>)'
+  bot:
+    name: Cloudflare Traffic Manager
+    category: Site Monitor
+    url: https://developers.cloudflare.com/fundamentals/reference/cloudflare-site-crawling/
+    producer:
+      name: CloudFlare
+      url: https://www.cloudflare.com/
+-
+  user_agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.107 Safari/537.36 (compatible; +https://developers.cloudflare.com/security-center/)
+  bot:
+    name: Cloudflare Security Insights
+    category: Site Monitor
+    url: https://developers.cloudflare.com/fundamentals/reference/cloudflare-site-crawling/
+    producer:
+      name: CloudFlare
+      url: https://www.cloudflare.com/
 -
   user_agent: collectd/5.5.1
   bot:
@@ -3926,7 +3962,16 @@
     url: https://www.cloudflare.com/
     producer:
       name: Cloudflare
-      url: https://www.cloudflare.com
+      url: https://www.cloudflare.com/
+-
+  user_agent: Cloudflare-diagnostics
+  bot:
+    name: Cloudflare Diagnostics
+    category: Site Monitor
+    url: https://www.cloudflare.com/
+    producer:
+      name: Cloudflare
+      url: https://www.cloudflare.com/
 -
   user_agent: Mozilla/5.0 (iPhone; CPU iPhone OS 12_0 like Mac OS X) adbeat.com/policy AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/69.0.3497.105 Mobile/15E148 Safari/605.1
   bot:
@@ -5565,7 +5610,7 @@
     url: https://developers.cloudflare.com/health-checks/
     producer:
       name: CloudFlare
-      url: http://www.cloudflare.com
+      url: https://www.cloudflare.com/
 -
   user_agent: Mozilla/5.0 (Morningscore/1.0)
   bot:
@@ -5777,3 +5822,9 @@
     producer:
       name: webwiki GmbH
       url: https://www.webwiki.com/
+-
+  user_agent: phpMyAdmin
+  bot:
+    name: phpMyAdmin
+    category: Service Agent
+    url: https://www.phpmyadmin.net/
diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml
@@ -1687,3 +1687,36 @@
     model: X4
   os_family: Real-time OS
   browser_family: Unknown
+-
+  user_agent: G4040_MAUI WAP Browser
+  os: [ ]
+  client:
+    type: browser
+    name: MAUI WAP Browser
+    version: ""
+    engine: ""
+    engine_version: ""
+  device:
+    type: feature phone
+    brand: 'A&K'
+    model: G4040
+  os_family: Unknown
+  browser_family: Unknown
+-
+  user_agent: KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0
+  os:
+    name: Java ME
+    version: ""
+    platform: ""
+  client:
+    type: browser
+    name: Openwave Mobile Browser
+    version: 6.2.0.7.3.129
+    engine: ""
+    engine_version: ""
+  device:
+    type: feature phone
+    brand: KDDI
+    model: CA32
+  os_family: Real-time OS
+  browser_family: Unknown
diff --git a/Tests/fixtures/phablet-1.yml b/Tests/fixtures/phablet-1.yml
@@ -903,8 +903,8 @@
     platform: ""
   client:
     type: browser
-    name: Chrome Webview
-    version: 92.0.4515.131
+    name: Hi Browser
+    version: 2.6.4.1
     engine: Blink
     engine_version: 92.0.4515.131
   device:
@@ -921,8 +921,8 @@
     platform: ""
   client:
     type: browser
-    name: Chrome Webview
-    version: 92.0.4515.131
+    name: Hi Browser
+    version: 2.6.3.1
     engine: Blink
     engine_version: 92.0.4515.131
   device:
@@ -1679,6 +1679,24 @@
     model: Galaxy Z Flip 5
   os_family: Android
   browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; Android 12; en; TECNO Mobile LG6n Build/SP1A.210812.016) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.5060.129 HiBrowser/v2.9.3.4 UWS/ Mobile Safari/537.36
+  os:
+    name: Android
+    version: "12"
+    platform: ""
+  client:
+    type: browser
+    name: Hi Browser
+    version: 2.9.3.4
+    engine: Blink
+    engine_version: 103.0.5060.129
+  device:
+    type: phablet
+    brand: Tecno Mobile
+    model: Pova Neo 2
+  os_family: Android
+  browser_family: Chrome
 -
   user_agent: Mozilla/5.0 (iPhone; CPU iPhone OS 16_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/20G75 Instagram 296.0.0.18.107 (iPhone14,8; iOS 16_6; en_US; en; scale=3.00; 1284x2778; 505423516)
   os: