matomo-org · Simbiat · Sep 10, 2025 · Sep 10, 2025 · Sep 10, 2025 · Sep 10, 2025
diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php
diff --git a/Tests/DeviceDetectorTest.php b/Tests/DeviceDetectorTest.php
@@ -837,7 +837,7 @@ public function testCheckRegexRestrictionEndCondition(): void
      */
     public function testDuplicateBrands(): void
     {
-        $brands     = \array_map('strtolower', AbstractDeviceParser::$deviceBrands);
+        $brands     = \array_map('strtolower', AbstractDeviceParser::$legacyShortNames + AbstractDeviceParser::$deviceBrands);
         $unique     = \array_unique($brands);
         $duplicates = \array_diff_assoc($brands, $unique);
 

diff --git a/Tests/fixtures/car_browser.yml b/Tests/fixtures/car_browser.yml
@@ -625,8 +625,8 @@
     engine_version: 110.0.0.0
   device:
     type: car browser
-    brand: ROiK
-    model: "10"
+    brand: KAP
+    model: ROiK-10
   os_family: Android
   browser_family: Chrome
 -

diff --git a/Tests/fixtures/desktop.yml b/Tests/fixtures/desktop.yml
@@ -8536,7 +8536,7 @@
     engine_version: 103.0.0.0
   device:
     type: desktop
-    brand: Wanmukang
+    brand: Zhongyu Display
     model: ZC-339
   os_family: Android
   browser_family: Chrome

diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml
@@ -2775,8 +2775,8 @@
     engine_version: "48.0"
   device:
     type: feature phone
-    brand: Digit4G
-    model: Bold
+    brand: Digit
+    model: Digit4G Bold
   os_family: Firefox OS
   browser_family: Firefox
 -
@@ -2793,8 +2793,8 @@
     engine_version: "48.0"
   device:
     type: feature phone
-    brand: Digit4G
-    model: Defender
+    brand: Digit
+    model: Digit4G Defender
   os_family: Firefox OS
   browser_family: Firefox
 -
@@ -2811,8 +2811,8 @@
     engine_version: "48.0"
   device:
     type: feature phone
-    brand: Digit4G
-    model: Elite
+    brand: Digit
+    model: Digit4G Elite
   os_family: Firefox OS
   browser_family: Firefox
 -
@@ -2829,8 +2829,8 @@
     engine_version: "48.0"
   device:
     type: feature phone
-    brand: Digit4G
-    model: Music
+    brand: Digit
+    model: Digit4G Music
   os_family: Firefox OS
   browser_family: Firefox
 -
@@ -2847,8 +2847,8 @@
     engine_version: "48.0"
   device:
     type: feature phone
-    brand: Digit4G
-    model: Power
+    brand: Digit
+    model: Digit4G Power
   os_family: Firefox OS
   browser_family: Firefox
 -
@@ -2865,8 +2865,8 @@
     engine_version: "48.0"
   device:
     type: feature phone
-    brand: Digit4G
-    model: Star
+    brand: Digit
+    model: Digit4G Star
   os_family: Firefox OS
   browser_family: Firefox
 -
@@ -2883,8 +2883,8 @@
     engine_version: "48.0"
   device:
     type: feature phone
-    brand: Digit4G
-    model: Lite
+    brand: Digit
+    model: Digit4G Lite
   os_family: Firefox OS
   browser_family: Firefox
 -
@@ -2901,8 +2901,8 @@
     engine_version: "48.0"
   device:
     type: feature phone
-    brand: Digit4G
-    model: Power Max
+    brand: Digit
+    model: Digit4G Power Max
   os_family: Firefox OS
   browser_family: Firefox
 -
@@ -2919,8 +2919,8 @@
     engine_version: "48.0"
   device:
     type: feature phone
-    brand: Digit4G
-    model: Shine
+    brand: Digit
+    model: Digit4G Shine
   os_family: Firefox OS
   browser_family: Firefox
 -

diff --git a/Tests/fixtures/phablet-1.yml b/Tests/fixtures/phablet-1.yml
@@ -2811,8 +2811,8 @@
     engine_version: 86.0.4240.110
   device:
     type: phablet
-    brand: P-UP
-    model: Mode 1 RR
+    brand: Mode 1
+    model: RR
   os_family: Android
   browser_family: Chrome
 -

diff --git a/Tests/fixtures/phablet.yml b/Tests/fixtures/phablet.yml
@@ -6220,8 +6220,8 @@
     engine_version: 86.0.4240.185
   device:
     type: phablet
-    brand: P-UP
-    model: Mode 1 RS
+    brand: Mode 1
+    model: RS
   os_family: Android
   browser_family: Chrome
 -

diff --git a/Tests/fixtures/smartphone-11.yml b/Tests/fixtures/smartphone-11.yml
@@ -6774,7 +6774,7 @@
     engine_version: 78.0.3904.96
   device:
     type: smartphone
-    brand: RoverPad
+    brand: Rover Computers
     model: ""
   os_family: Android
   browser_family: Chrome

diff --git a/Tests/fixtures/smartphone-12.yml b/Tests/fixtures/smartphone-12.yml
@@ -621,7 +621,7 @@
     engine_version: 43.0.2357.92
   device:
     type: smartphone
-    brand: Star
+    brand: Kingelon
     model: N8800
   os_family: Android
   browser_family: Chrome
@@ -639,7 +639,7 @@
     engine_version: 40.0.2214.109
   device:
     type: smartphone
-    brand: Star
+    brand: Kingelon
     model: N9500
   os_family: Android
   browser_family: Chrome
@@ -657,7 +657,7 @@
     engine_version: "534.30"
   device:
     type: smartphone
-    brand: Star
+    brand: Kingelon
     model: N9600
   os_family: Android
   browser_family: Android Browser
@@ -675,7 +675,7 @@
     engine_version: 34.0.1847.114
   device:
     type: smartphone
-    brand: Star
+    brand: Kingelon
     model: N9700
   os_family: Android
   browser_family: Chrome
@@ -693,7 +693,7 @@
     engine_version: "534.30"
   device:
     type: smartphone
-    brand: Star
+    brand: Kingelon
     model: N9800
   os_family: Android
   browser_family: Android Browser
@@ -711,7 +711,7 @@
     engine_version: "534.30"
   device:
     type: smartphone
-    brand: Star
+    brand: Kingelon
     model: N9977
   os_family: Android
   browser_family: Android Browser
@@ -729,8 +729,9 @@
     engine_version: 30.0.0.0
   device:
     type: smartphone
-    brand: Star
-    model: Note 3
+    brand: Kingelon
+    #Previously "Note 3", probably because this is Samsung Note 3 clone, but officially it's N9000. Similar model was released as "Note 3" under 5Star brand
+    model: N9000
   os_family: Android
   browser_family: Chrome
 -
@@ -10783,8 +10784,8 @@
     engine_version: 104.0.0.0
   device:
     type: smartphone
-    brand: Digit4G
-    model: Play1
+    brand: Digit
+    model: Digit4G Play1
   os_family: Android
   browser_family: Chrome
 -

diff --git a/Tests/fixtures/smartphone-15.yml b/Tests/fixtures/smartphone-15.yml
@@ -9532,8 +9532,9 @@
     engine_version: 103.0.0.0
   device:
     type: smartphone
-    brand: H133
-    model: Betacrux
+    brand: Ceibal
+    #https://ceibal.edu.uy/institucional/articulos/hardware-beta-crux/
+    model: H133 Beta Crux
   os_family: Android
   browser_family: Chrome
 -

diff --git a/Tests/fixtures/smartphone-19.yml b/Tests/fixtures/smartphone-19.yml
@@ -3073,7 +3073,7 @@
     engine_version: 85.0.4183.81
   device:
     type: smartphone
-    brand: Twoe
+    brand: 2E
     model: F534L
   os_family: Android
   browser_family: Chrome
@@ -3091,7 +3091,7 @@
     engine_version: 85.0.4183.81
   device:
     type: smartphone
-    brand: Twoe
+    brand: 2E
     model: F572L
   os_family: Android
   browser_family: Chrome

diff --git a/Tests/fixtures/smartphone-2.yml b/Tests/fixtures/smartphone-2.yml
@@ -9300,7 +9300,7 @@
     engine_version: 87.0.4280.141
   device:
     type: smartphone
-    brand: Spark
+    brand: Spark NZ
     model: Plus 3
   os_family: Android
   browser_family: Chrome

diff --git a/Tests/fixtures/smartphone-21.yml b/Tests/fixtures/smartphone-21.yml
@@ -2765,7 +2765,7 @@
     engine_version: 76.0.3809.89
   device:
     type: smartphone
-    brand: TWZ
+    brand: TWZ Corporation
     model: Y60
   os_family: Android
   browser_family: Chrome
@@ -2783,7 +2783,7 @@
     engine_version: 75.0.3770.143
   device:
     type: smartphone
-    brand: TWZ
+    brand: TWZ Corporation
     model: Y68
   os_family: Android
   browser_family: Chrome
@@ -2801,7 +2801,7 @@
     engine_version: 71.0.3578.99
   device:
     type: smartphone
-    brand: TWZ
+    brand: TWZ Corporation
     model: A49
   os_family: Android
   browser_family: Opera
@@ -2819,7 +2819,7 @@
     engine_version: 73.0.3683.90
   device:
     type: smartphone
-    brand: TWZ
+    brand: TWZ Corporation
     model: A55
   os_family: Android
   browser_family: Chrome
@@ -2837,7 +2837,7 @@
     engine_version: 30.0.0.0
   device:
     type: smartphone
-    brand: TWZ
+    brand: TWZ Corporation
     model: A567
   os_family: Android
   browser_family: Chrome
@@ -2855,7 +2855,7 @@
     engine_version: "534.30"
   device:
     type: smartphone
-    brand: TWZ
+    brand: TWZ Corporation
     model: AA8
   os_family: Android
   browser_family: Android Browser
@@ -2873,7 +2873,7 @@
     engine_version: 30.0.0.0
   device:
     type: smartphone
-    brand: TWZ
+    brand: TWZ Corporation
     model: QQ2
   os_family: Android
   browser_family: Chrome
@@ -2891,7 +2891,7 @@
     engine_version: 30.0.0.0
   device:
     type: smartphone
-    brand: TWZ
+    brand: TWZ Corporation
     model: QQ1
   os_family: Android
   browser_family: Chrome
@@ -2909,7 +2909,7 @@
     engine_version: "534.30"
   device:
     type: smartphone
-    brand: TWZ
+    brand: TWZ Corporation
     model: A95
   os_family: Android
   browser_family: Android Browser
@@ -2927,7 +2927,7 @@
     engine_version: 39.0.0.0
   device:
     type: smartphone
-    brand: TWZ
+    brand: TWZ Corporation
     model: Y52
   os_family: Android
   browser_family: Chrome

diff --git a/Tests/fixtures/smartphone-22.yml b/Tests/fixtures/smartphone-22.yml
@@ -1183,8 +1183,8 @@
     engine_version: ""
   device:
     type: smartphone
-    brand: Hisense
-    model: Smartfren Andromax U2
+    brand: Smartfren
+    model: Andromax U2
   os_family: Android
   browser_family: Opera
 -
@@ -5963,7 +5963,7 @@
     engine_version: 89.0.4389.90
   device:
     type: smartphone
-    brand: Twoe
+    brand: 2E
     model: E500A
   os_family: Android
   browser_family: Chrome

diff --git a/Tests/fixtures/smartphone-23.yml b/Tests/fixtures/smartphone-23.yml
@@ -3541,8 +3541,8 @@
     engine_version: 67.0.3396.87
   device:
     type: smartphone
-    brand: P-UP
-    model: Mode 1 MD-01P
+    brand: Mode 1
+    model: MD-01P
   os_family: Android
   browser_family: Chrome
 -