From dbff2dca80bb97d31df1893b356c028504a8fba3 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Wed, 10 Sep 2025 18:24:43 +0300 Subject: [PATCH 01/77] =?UTF-8?q?Zuum=20to=20Zuum=20M=C3=A9xico?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/clienthints.yml | 2 +- Tests/fixtures/smartphone-12.yml | 4 ++-- Tests/fixtures/smartphone-15.yml | 4 ++-- Tests/fixtures/smartphone-16.yml | 24 ++++++++++++------------ Tests/fixtures/smartphone-19.yml | 2 +- Tests/fixtures/smartphone-2.yml | 2 +- Tests/fixtures/smartphone-20.yml | 2 +- Tests/fixtures/smartphone-21.yml | 12 ++++++------ Tests/fixtures/smartphone-22.yml | 4 ++-- Tests/fixtures/smartphone-25.yml | 4 ++-- Tests/fixtures/smartphone-26.yml | 4 ++-- Tests/fixtures/smartphone-27.yml | 6 +++--- Tests/fixtures/smartphone-28.yml | 12 ++++++------ Tests/fixtures/smartphone-3.yml | 4 ++-- Tests/fixtures/smartphone-30.yml | 6 +++--- Tests/fixtures/smartphone-31.yml | 2 +- Tests/fixtures/smartphone-32.yml | 2 +- Tests/fixtures/smartphone-37.yml | 2 +- Tests/fixtures/smartphone-38.yml | 2 +- Tests/fixtures/smartphone-40.yml | 4 ++-- Tests/fixtures/smartphone-41.yml | 4 ++-- Tests/fixtures/smartphone-42.yml | 12 ++++++------ Tests/fixtures/tablet-12.yml | 2 +- regexes/device/mobiles.yml | 3 ++- 25 files changed, 64 insertions(+), 63 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index c1434f1c9a..39135de047 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -2167,7 +2167,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'ZOO' => 'ZoomSmart', 'ZO1' => 'Zoom', 'ZT' => 'ZTE', - 'ZU' => 'Zuum', + 'ZU' => 'Zuum México', 'ZY' => 'Zync', 'ZR' => 'Zyrex', 'ZQ' => 'ZYQ', diff --git a/Tests/fixtures/clienthints.yml b/Tests/fixtures/clienthints.yml index 35bf7cb457..dd2340a51d 100644 --- a/Tests/fixtures/clienthints.yml +++ b/Tests/fixtures/clienthints.yml @@ -3426,7 +3426,7 @@ engine_version: 124.0.6367.113 device: type: smartphone - brand: Zuum + brand: Zuum México model: Sens M1 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-12.yml b/Tests/fixtures/smartphone-12.yml index ddf562a2f3..e665f04870 100644 --- a/Tests/fixtures/smartphone-12.yml +++ b/Tests/fixtures/smartphone-12.yml @@ -9415,7 +9415,7 @@ engine_version: 107.0.0.0 device: type: smartphone - brand: Zuum + brand: Zuum México model: Aura Z os_family: Android browser_family: Chrome @@ -10063,7 +10063,7 @@ engine_version: 108.0.0.0 device: type: smartphone - brand: Zuum + brand: Zuum México model: Aura Plus J.Lo os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-15.yml b/Tests/fixtures/smartphone-15.yml index d335d615cb..f06680852d 100644 --- a/Tests/fixtures/smartphone-15.yml +++ b/Tests/fixtures/smartphone-15.yml @@ -9496,7 +9496,7 @@ engine_version: 103.0.0.0 device: type: smartphone - brand: Zuum + brand: Zuum México model: Aura Pro os_family: Android browser_family: Chrome @@ -9514,7 +9514,7 @@ engine_version: 105.0.0.0 device: type: smartphone - brand: Zuum + brand: Zuum México model: Aura Pro J.Lo os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-16.yml b/Tests/fixtures/smartphone-16.yml index d038e3ba99..241fa74258 100644 --- a/Tests/fixtures/smartphone-16.yml +++ b/Tests/fixtures/smartphone-16.yml @@ -9197,7 +9197,7 @@ engine_version: "" device: type: smartphone - brand: Zuum + brand: Zuum México model: E60 os_family: Android browser_family: Android Browser @@ -9215,7 +9215,7 @@ engine_version: 30.0.0.0 device: type: smartphone - brand: Zuum + brand: Zuum México model: E40 os_family: Android browser_family: Chrome @@ -9233,7 +9233,7 @@ engine_version: "" device: type: smartphone - brand: Zuum + brand: Zuum México model: M50 os_family: Android browser_family: Android Browser @@ -9251,7 +9251,7 @@ engine_version: "" device: type: smartphone - brand: Zuum + brand: Zuum México model: Stellar Z os_family: Android browser_family: Android Browser @@ -9269,7 +9269,7 @@ engine_version: "" device: type: smartphone - brand: Zuum + brand: Zuum México model: Stedi os_family: Android browser_family: Android Browser @@ -9287,7 +9287,7 @@ engine_version: 84.0.4147.125 device: type: smartphone - brand: Zuum + brand: Zuum México model: Magno os_family: Android browser_family: Chrome @@ -9305,7 +9305,7 @@ engine_version: 83.0.4103.83 device: type: smartphone - brand: Zuum + brand: Zuum México model: Magno Plus os_family: Android browser_family: Chrome @@ -9323,7 +9323,7 @@ engine_version: 81.0.4044.138 device: type: smartphone - brand: Zuum + brand: Zuum México model: Magno C os_family: Android browser_family: Chrome @@ -9341,7 +9341,7 @@ engine_version: 81.0.4044.138 device: type: smartphone - brand: Zuum + brand: Zuum México model: Covet os_family: Android browser_family: Chrome @@ -9359,7 +9359,7 @@ engine_version: 85.0.4183.101 device: type: smartphone - brand: Zuum + brand: Zuum México model: Covet Z os_family: Android browser_family: Chrome @@ -9377,7 +9377,7 @@ engine_version: 87.0.4280.66 device: type: smartphone - brand: Zuum + brand: Zuum México model: Covet Pro Lite os_family: Android browser_family: Chrome @@ -9395,7 +9395,7 @@ engine_version: 85.0.4183.101 device: type: smartphone - brand: Zuum + brand: Zuum México model: Covet Pro os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-19.yml b/Tests/fixtures/smartphone-19.yml index 2c7c3d8e3c..a3023da034 100644 --- a/Tests/fixtures/smartphone-19.yml +++ b/Tests/fixtures/smartphone-19.yml @@ -2497,7 +2497,7 @@ engine_version: 83.0.4103.83 device: type: smartphone - brand: Zuum + brand: Zuum México model: Gravity Z os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-2.yml b/Tests/fixtures/smartphone-2.yml index 13b2a3f57f..4b3526b2c3 100644 --- a/Tests/fixtures/smartphone-2.yml +++ b/Tests/fixtures/smartphone-2.yml @@ -9552,7 +9552,7 @@ engine_version: 88.0.4324.93 device: type: smartphone - brand: Zuum + brand: Zuum México model: Akus Z os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-20.yml b/Tests/fixtures/smartphone-20.yml index c0cfacfa0c..8dacf66da1 100644 --- a/Tests/fixtures/smartphone-20.yml +++ b/Tests/fixtures/smartphone-20.yml @@ -1039,7 +1039,7 @@ engine_version: 81.0.4044.138 device: type: smartphone - brand: Zuum + brand: Zuum México model: Aura X os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-21.yml b/Tests/fixtures/smartphone-21.yml index 02b2b91941..2a8fbcef3c 100644 --- a/Tests/fixtures/smartphone-21.yml +++ b/Tests/fixtures/smartphone-21.yml @@ -6417,7 +6417,7 @@ engine_version: 81.0.4044.138 device: type: smartphone - brand: Zuum + brand: Zuum México model: Stellar Pro os_family: Android browser_family: Chrome @@ -6435,7 +6435,7 @@ engine_version: 83.0.4103.106 device: type: smartphone - brand: Zuum + brand: Zuum México model: Stellar os_family: Android browser_family: Chrome @@ -6453,7 +6453,7 @@ engine_version: 85.0.4183.127 device: type: smartphone - brand: Zuum + brand: Zuum México model: Stellar Plus os_family: Android browser_family: Chrome @@ -6471,7 +6471,7 @@ engine_version: 85.0.4183.101 device: type: smartphone - brand: Zuum + brand: Zuum México model: Stellar Mini os_family: Android browser_family: Chrome @@ -6489,7 +6489,7 @@ engine_version: 85.0.4183.81 device: type: smartphone - brand: Zuum + brand: Zuum México model: Stellar M1 os_family: Android browser_family: Chrome @@ -6507,7 +6507,7 @@ engine_version: 80.0.3987.99 device: type: smartphone - brand: Zuum + brand: Zuum México model: Stellar P1 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-22.yml b/Tests/fixtures/smartphone-22.yml index 6cec870b2a..044f66835d 100644 --- a/Tests/fixtures/smartphone-22.yml +++ b/Tests/fixtures/smartphone-22.yml @@ -2945,7 +2945,7 @@ engine_version: 83.0.4103.96 device: type: smartphone - brand: Zuum + brand: Zuum México model: Roni os_family: Android browser_family: Chrome @@ -9849,7 +9849,7 @@ engine_version: 80.0.3987.132 device: type: smartphone - brand: Zuum + brand: Zuum México model: Uniq os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-25.yml b/Tests/fixtures/smartphone-25.yml index 777874a6a0..c483935b0b 100644 --- a/Tests/fixtures/smartphone-25.yml +++ b/Tests/fixtures/smartphone-25.yml @@ -6783,7 +6783,7 @@ engine_version: 55.0.2883.91 device: type: smartphone - brand: Zuum + brand: Zuum México model: BLAZE os_family: Android browser_family: Chrome @@ -6801,7 +6801,7 @@ engine_version: 37.0.0.0 device: type: smartphone - brand: Zuum + brand: Zuum México model: ZEN I os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-26.yml b/Tests/fixtures/smartphone-26.yml index 6193712a24..b9b7a37c5f 100644 --- a/Tests/fixtures/smartphone-26.yml +++ b/Tests/fixtures/smartphone-26.yml @@ -7881,7 +7881,7 @@ engine_version: 93.0.4577.62 device: type: smartphone - brand: Zuum + brand: Zuum México model: Magno C1 os_family: Android browser_family: Chrome @@ -9391,7 +9391,7 @@ engine_version: 93.0.4577.62 device: type: smartphone - brand: Zuum + brand: Zuum México model: Rocket II os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-27.yml b/Tests/fixtures/smartphone-27.yml index c40fa06201..e94b9784c7 100644 --- a/Tests/fixtures/smartphone-27.yml +++ b/Tests/fixtures/smartphone-27.yml @@ -4831,7 +4831,7 @@ engine_version: 94.0.4606.71 device: type: smartphone - brand: Zuum + brand: Zuum México model: Gravity M os_family: Android browser_family: Chrome @@ -9023,7 +9023,7 @@ engine_version: 94.0.4606.71 device: type: smartphone - brand: Zuum + brand: Zuum México model: Covet Mini os_family: Android browser_family: Chrome @@ -9113,7 +9113,7 @@ engine_version: 94.0.4606.71 device: type: smartphone - brand: Zuum + brand: Zuum México model: Stellar M2 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-28.yml b/Tests/fixtures/smartphone-28.yml index 50e47fe1d3..dccdc65918 100644 --- a/Tests/fixtures/smartphone-28.yml +++ b/Tests/fixtures/smartphone-28.yml @@ -103,7 +103,7 @@ engine_version: 94.0.4606.85 device: type: smartphone - brand: Zuum + brand: Zuum México model: Magno S os_family: Android browser_family: Chrome @@ -3521,7 +3521,7 @@ engine_version: 77.0.3865.92 device: type: smartphone - brand: Zuum + brand: Zuum México model: Stellar P3 os_family: Android browser_family: Chrome @@ -4417,7 +4417,7 @@ version: 346.0.0.29.119 device: type: smartphone - brand: Zuum + brand: Zuum México model: Rocket III os_family: Android browser_family: Unknown @@ -5101,7 +5101,7 @@ engine_version: 91.0.4472.120 device: type: smartphone - brand: Zuum + brand: Zuum México model: Stellar Max os_family: Android browser_family: Chrome @@ -5947,7 +5947,7 @@ engine_version: 73.0.3683.90 device: type: smartphone - brand: Zuum + brand: Zuum México model: Limit os_family: Android browser_family: Chrome @@ -5965,7 +5965,7 @@ engine_version: 94.0.4606.61 device: type: smartphone - brand: Zuum + brand: Zuum México model: Onix os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-3.yml b/Tests/fixtures/smartphone-3.yml index 916fb8f457..6a760858c6 100644 --- a/Tests/fixtures/smartphone-3.yml +++ b/Tests/fixtures/smartphone-3.yml @@ -11050,7 +11050,7 @@ engine_version: 94.0.4606.61 device: type: smartphone - brand: Zuum + brand: Zuum México model: Akus Pro os_family: Android browser_family: Chrome @@ -11068,7 +11068,7 @@ engine_version: 96.0.4664.45 device: type: smartphone - brand: Zuum + brand: Zuum México model: Akus Z1 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-30.yml b/Tests/fixtures/smartphone-30.yml index 2f55184262..0ae37133e3 100644 --- a/Tests/fixtures/smartphone-30.yml +++ b/Tests/fixtures/smartphone-30.yml @@ -567,7 +567,7 @@ engine_version: 98.0.4758.101 device: type: smartphone - brand: Zuum + brand: Zuum México model: Stellar P4 os_family: Android browser_family: Chrome @@ -1413,7 +1413,7 @@ engine_version: 81.0.4044.117 device: type: smartphone - brand: Zuum + brand: Zuum México model: Gravity Life os_family: Android browser_family: Chrome @@ -1503,7 +1503,7 @@ engine_version: 83.0.4103.83 device: type: smartphone - brand: Zuum + brand: Zuum México model: Ultra Z os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-31.yml b/Tests/fixtures/smartphone-31.yml index 007554f046..06cd9a8c66 100644 --- a/Tests/fixtures/smartphone-31.yml +++ b/Tests/fixtures/smartphone-31.yml @@ -1813,7 +1813,7 @@ engine_version: 102.0.5005.78 device: type: smartphone - brand: Zuum + brand: Zuum México model: Akus P1 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-32.yml b/Tests/fixtures/smartphone-32.yml index 15da8cf163..86d9803fc6 100644 --- a/Tests/fixtures/smartphone-32.yml +++ b/Tests/fixtures/smartphone-32.yml @@ -823,7 +823,7 @@ engine_version: 83.0.4103.106 device: type: smartphone - brand: Zuum + brand: Zuum México model: Grant os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-37.yml b/Tests/fixtures/smartphone-37.yml index e22cd04873..611f1dbc14 100644 --- a/Tests/fixtures/smartphone-37.yml +++ b/Tests/fixtures/smartphone-37.yml @@ -7179,7 +7179,7 @@ engine_version: 105.0.0.0 device: type: smartphone - brand: Zuum + brand: Zuum México model: Magno C2 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-38.yml b/Tests/fixtures/smartphone-38.yml index 6ea0326b42..1087edfb09 100644 --- a/Tests/fixtures/smartphone-38.yml +++ b/Tests/fixtures/smartphone-38.yml @@ -4267,7 +4267,7 @@ engine_version: 94.0.4606.85 device: type: smartphone - brand: Zuum + brand: Zuum México model: Covet X os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-40.yml b/Tests/fixtures/smartphone-40.yml index 42bf05eea1..35b5256a15 100644 --- a/Tests/fixtures/smartphone-40.yml +++ b/Tests/fixtures/smartphone-40.yml @@ -373,7 +373,7 @@ engine_version: 76.0.3809.111 device: type: smartphone - brand: Zuum + brand: Zuum México model: Stellar P7 os_family: Android browser_family: Chrome @@ -391,7 +391,7 @@ engine_version: 76.0.3809.111 device: type: smartphone - brand: Zuum + brand: Zuum México model: Stellar P6 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-41.yml b/Tests/fixtures/smartphone-41.yml index dc3033a23c..6172ab9a10 100644 --- a/Tests/fixtures/smartphone-41.yml +++ b/Tests/fixtures/smartphone-41.yml @@ -8116,7 +8116,7 @@ engine_version: 135.0.7049.100 device: type: smartphone - brand: Zuum + brand: Zuum México model: Magno P3 os_family: Android browser_family: Chrome @@ -8134,7 +8134,7 @@ engine_version: 135.0.7049.100 device: type: smartphone - brand: Zuum + brand: Zuum México model: Magno P1 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-42.yml b/Tests/fixtures/smartphone-42.yml index 1264810210..470a9c2933 100644 --- a/Tests/fixtures/smartphone-42.yml +++ b/Tests/fixtures/smartphone-42.yml @@ -2777,7 +2777,7 @@ engine_version: 137.0.7151.61 device: type: smartphone - brand: Zuum + brand: Zuum México model: Magno Pro os_family: Android browser_family: Opera @@ -2795,7 +2795,7 @@ engine_version: 137.0.7151.61 device: type: smartphone - brand: Zuum + brand: Zuum México model: Magno C Plus os_family: Android browser_family: Chrome @@ -4611,7 +4611,7 @@ engine_version: 138.0.0.0 device: type: smartphone - brand: Zuum + brand: Zuum México model: Aura Prime os_family: Android browser_family: Chrome @@ -4629,7 +4629,7 @@ engine_version: 138.0.0.0 device: type: smartphone - brand: Zuum + brand: Zuum México model: Aura M1 os_family: Android browser_family: Chrome @@ -4647,7 +4647,7 @@ engine_version: 138.0.0.0 device: type: smartphone - brand: Zuum + brand: Zuum México model: Aura Z1 os_family: Android browser_family: Chrome @@ -4809,7 +4809,7 @@ engine_version: 86.0.4240.198 device: type: smartphone - brand: Zuum + brand: Zuum México model: Sens G os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-12.yml b/Tests/fixtures/tablet-12.yml index 12ed02d153..a2e9a52cb6 100644 --- a/Tests/fixtures/tablet-12.yml +++ b/Tests/fixtures/tablet-12.yml @@ -3973,7 +3973,7 @@ engine_version: 124.0.0.0 device: type: tablet - brand: Zuum + brand: Zuum México model: Novus Tab os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 76a1ec4426..de82ffc361 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -31877,7 +31877,8 @@ Onix: device: 'smartphone' model: '$1' -Zuum: +#Zuum México (https://www.zuum.mx/nosotros/), "México" is added to avoid potential confusion with a bunch of other hardware vendors +Zuum México: regex: 'Zuum[ _-]|Android 6.+ UNIQ(?: Build|[);])|(?:ROCKET III?|Akus (?:PRO|[ZP]1?)|AURA_Z|COVET|MAGNO(?:-S| P[13])?|ONIX(?: S)?|STEDI|STELLAR(?:[ _](?:Z|PRO|[MP]1|M2))?|GRAVITY [ZM]|AURA (?:PRIME|PLUS JLO|PRO JLO|PRO|[ZM]1|X)|COVET_PRO_LITE|RONI|Android.*; (?:GRANT|LIMIT)|Gravity Life|SENS (?:M1|G)|ULTRA Z|NOVUS TAB)(?:[);/ ]|$)' device: 'smartphone' models: From cbf420646f6a32a97e9b6ef40683b236415af32e Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Wed, 10 Sep 2025 18:28:53 +0300 Subject: [PATCH 02/77] ZIK to ZIK Computers --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/tablet-7.yml | 2 +- regexes/device/mobiles.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 39135de047..450fe36257 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -2157,7 +2157,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'ZIF' => 'ZIFFLER', 'ZIO' => 'ZIOVO', 'ZX' => 'Ziox', - 'ZIK' => 'ZIK', + 'ZIK' => 'ZIK Computers', 'ZKI' => 'Z-Kai', 'ZIG' => 'Zigo', 'ZIN' => 'Zinox', diff --git a/Tests/fixtures/tablet-7.yml b/Tests/fixtures/tablet-7.yml index 81ac5886b8..1db618d221 100644 --- a/Tests/fixtures/tablet-7.yml +++ b/Tests/fixtures/tablet-7.yml @@ -6291,7 +6291,7 @@ engine_version: 87.0.4280.86 device: type: tablet - brand: ZIK + brand: ZIK Computers model: W1027 os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index de82ffc361..233d5e6ad2 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -40536,8 +40536,8 @@ Famous: device: 'tablet' model: 'Tab 10' -# ZIK (zik.kz) -ZIK: +# ZIK Computers (related to zik.kz, but based on retail pages (for example https://kaspi.kz/shop/p/zik-computers-w-1027-10-1-djuim-2-gb-16-gb-chernyi-100763965/) used "Computers" for consumer products) +ZIK Computers: regex: 'ZIK[_ ](W1027)(?:[);/ ]|$)' device: 'tablet' model: '$1' From 9e1b525a922a16beb4a973121c83dc34021af0c6 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Wed, 10 Sep 2025 18:40:23 +0300 Subject: [PATCH 03/77] Zebra to Zebra Technologies --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/car_browser.yml | 2 +- Tests/fixtures/peripheral.yml | 8 ++++---- Tests/fixtures/smartphone-15.yml | 4 ++-- Tests/fixtures/smartphone-18.yml | 2 +- Tests/fixtures/smartphone-19.yml | 16 ++++++++-------- Tests/fixtures/smartphone-25.yml | 2 +- Tests/fixtures/smartphone-28.yml | 6 +++--- Tests/fixtures/smartphone-31.yml | 4 ++-- Tests/fixtures/smartphone-33.yml | 2 +- Tests/fixtures/smartphone-39.yml | 2 +- regexes/device/mobiles.yml | 4 ++-- 12 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 450fe36257..e09f6ecb2a 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -2144,7 +2144,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'ZAL' => 'ZALA', 'ZZB' => 'ZZB', 'ZEA' => 'Zealot', - 'PZ' => 'Zebra', + 'PZ' => 'Zebra Technologies', 'ZE1' => 'Zeblaze', 'ZE' => 'Zeemi', 'WZ' => 'Zeeker', diff --git a/Tests/fixtures/car_browser.yml b/Tests/fixtures/car_browser.yml index 41921622a8..29e6fe8e62 100644 --- a/Tests/fixtures/car_browser.yml +++ b/Tests/fixtures/car_browser.yml @@ -643,7 +643,7 @@ engine_version: 108.0.0.0 device: type: car browser - brand: Zebra + brand: Zebra Technologies model: VC8300 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/peripheral.yml b/Tests/fixtures/peripheral.yml index 9953d2d0b2..0375b9885c 100644 --- a/Tests/fixtures/peripheral.yml +++ b/Tests/fixtures/peripheral.yml @@ -890,7 +890,7 @@ engine_version: 106.0.0.0 device: type: peripheral - brand: Zebra + brand: Zebra Technologies model: MC2700 os_family: Android browser_family: Chrome @@ -980,7 +980,7 @@ engine_version: 96.0.4664.92 device: type: peripheral - brand: Zebra + brand: Zebra Technologies model: MC2200 os_family: Android browser_family: Chrome @@ -998,7 +998,7 @@ engine_version: 102.0.5005.78 device: type: peripheral - brand: Zebra + brand: Zebra Technologies model: MC93 os_family: Android browser_family: Chrome @@ -1034,7 +1034,7 @@ engine_version: 110.0.0.0 device: type: peripheral - brand: Zebra + brand: Zebra Technologies model: PS20J os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-15.yml b/Tests/fixtures/smartphone-15.yml index f06680852d..b85e58e43c 100644 --- a/Tests/fixtures/smartphone-15.yml +++ b/Tests/fixtures/smartphone-15.yml @@ -9910,7 +9910,7 @@ engine_version: 104.0.0.0 device: type: smartphone - brand: Zebra + brand: Zebra Technologies model: TC15 os_family: Android browser_family: Chrome @@ -9928,7 +9928,7 @@ engine_version: 83.0.4103.106 device: type: smartphone - brand: Zebra + brand: Zebra Technologies model: TC77 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-18.yml b/Tests/fixtures/smartphone-18.yml index d7af5073c7..76c146682f 100644 --- a/Tests/fixtures/smartphone-18.yml +++ b/Tests/fixtures/smartphone-18.yml @@ -3431,7 +3431,7 @@ engine_version: 104.0.0.0 device: type: smartphone - brand: Zebra + brand: Zebra Technologies model: EC55 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-19.yml b/Tests/fixtures/smartphone-19.yml index a3023da034..cd2bcd4426 100644 --- a/Tests/fixtures/smartphone-19.yml +++ b/Tests/fixtures/smartphone-19.yml @@ -3505,7 +3505,7 @@ engine_version: 62.0.3202.84 device: type: smartphone - brand: Zebra + brand: Zebra Technologies model: TC51 os_family: Android browser_family: Chrome @@ -3523,7 +3523,7 @@ engine_version: 80.0.3987.87 device: type: smartphone - brand: Zebra + brand: Zebra Technologies model: TC56 os_family: Android browser_family: Chrome @@ -3541,7 +3541,7 @@ engine_version: 76.0.3809.132 device: type: smartphone - brand: Zebra + brand: Zebra Technologies model: TC20 os_family: Android browser_family: Chrome @@ -3559,7 +3559,7 @@ engine_version: 74.0.3729.157 device: type: smartphone - brand: Zebra + brand: Zebra Technologies model: TC75 os_family: Android browser_family: Chrome @@ -3577,7 +3577,7 @@ engine_version: 55.0.2883.91 device: type: smartphone - brand: Zebra + brand: Zebra Technologies model: TC700H os_family: Android browser_family: Chrome @@ -3595,7 +3595,7 @@ engine_version: 80.0.3987.132 device: type: smartphone - brand: Zebra + brand: Zebra Technologies model: TC25 os_family: Android browser_family: Chrome @@ -3613,7 +3613,7 @@ engine_version: 75.0.3770.101 device: type: smartphone - brand: Zebra + brand: Zebra Technologies model: TC70x os_family: Android browser_family: Chrome @@ -3631,7 +3631,7 @@ engine_version: 75.0.3770.143 device: type: smartphone - brand: Zebra + brand: Zebra Technologies model: TC75x os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-25.yml b/Tests/fixtures/smartphone-25.yml index c483935b0b..ef268c0314 100644 --- a/Tests/fixtures/smartphone-25.yml +++ b/Tests/fixtures/smartphone-25.yml @@ -9015,7 +9015,7 @@ engine_version: 95.0.4638.74 device: type: smartphone - brand: Zebra + brand: Zebra Technologies model: TC21 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-28.yml b/Tests/fixtures/smartphone-28.yml index dccdc65918..abcda34c7b 100644 --- a/Tests/fixtures/smartphone-28.yml +++ b/Tests/fixtures/smartphone-28.yml @@ -463,7 +463,7 @@ engine_version: 95.0.4638.74 device: type: smartphone - brand: Zebra + brand: Zebra Technologies model: TC26 os_family: Android browser_family: Chrome @@ -2479,7 +2479,7 @@ engine_version: 70.0.3538.110 device: type: smartphone - brand: Zebra + brand: Zebra Technologies model: TC52 os_family: Android browser_family: Chrome @@ -2495,7 +2495,7 @@ version: 305.1.0.40.120 device: type: smartphone - brand: Zebra + brand: Zebra Technologies model: TC57 os_family: Android browser_family: Unknown diff --git a/Tests/fixtures/smartphone-31.yml b/Tests/fixtures/smartphone-31.yml index 06cd9a8c66..18a4509cb9 100644 --- a/Tests/fixtures/smartphone-31.yml +++ b/Tests/fixtures/smartphone-31.yml @@ -3449,7 +3449,7 @@ engine_version: 103.0.0.0 device: type: smartphone - brand: Zebra + brand: Zebra Technologies model: MC33 os_family: Android browser_family: Chrome @@ -9219,7 +9219,7 @@ engine_version: 103.0.0.0 device: type: smartphone - brand: Zebra + brand: Zebra Technologies model: EC30 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-33.yml b/Tests/fixtures/smartphone-33.yml index 48a976b440..58e4db6955 100644 --- a/Tests/fixtures/smartphone-33.yml +++ b/Tests/fixtures/smartphone-33.yml @@ -1921,7 +1921,7 @@ engine_version: 63.0.3239.111 device: type: smartphone - brand: Zebra + brand: Zebra Technologies model: TC55 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-39.yml b/Tests/fixtures/smartphone-39.yml index 79fbe5781b..4fc15b82b3 100644 --- a/Tests/fixtures/smartphone-39.yml +++ b/Tests/fixtures/smartphone-39.yml @@ -7467,7 +7467,7 @@ engine_version: 126.0.0.0 device: type: smartphone - brand: Zebra + brand: Zebra Technologies model: TC27 os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 233d5e6ad2..855391336d 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -36312,8 +36312,8 @@ Winmax: device: 'feature phone' model: '$1' -# Zebra (zebra.com) -Zebra: +# Zebra Technologies (zebra.com) +Zebra Technologies: regex: ' (MC2[27]00|TC15|TC2[01567]|TC5[12567]|TC7[05]x|TC7[57]|TC700H|ET51|MC33|MC93|EC30|EC55|PS20J|VC8300)(?:[);/ ]|$)' device: 'smartphone' models: From 99bc347ffcecb1ac1f8fb0186cc586692fcc2ccf Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Wed, 10 Sep 2025 19:28:23 +0300 Subject: [PATCH 04/77] Vityaz to Vityas --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/tv-2.yml | 4 ++-- Tests/fixtures/tv-3.yml | 4 ++-- Tests/fixtures/tv-4.yml | 6 +++--- Tests/fixtures/tv-5.yml | 6 +++--- regexes/device/mobiles.yml | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index e09f6ecb2a..38f80d8c27 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1991,7 +1991,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'VID' => 'VIDA', 'VZ' => 'Vizio', 'VIZ' => 'Vizmo', - 'VIT' => 'Vityaz', + 'VIT' => 'Vityas', 'VTM' => 'Vitumi', '9V' => 'Vision Touch', 'VIS' => 'Vision Technology', diff --git a/Tests/fixtures/tv-2.yml b/Tests/fixtures/tv-2.yml index db271c78de..fc31b6f1a1 100644 --- a/Tests/fixtures/tv-2.yml +++ b/Tests/fixtures/tv-2.yml @@ -1595,7 +1595,7 @@ engine_version: 83.0.4103.120 device: type: tv - brand: Vityaz + brand: Vityas model: 24LH1207 os_family: Android browser_family: Unknown @@ -5121,7 +5121,7 @@ engine_version: 102.0.5005.167 device: type: tv - brand: Vityaz + brand: Vityas model: 43LU1204 os_family: Android browser_family: Unknown diff --git a/Tests/fixtures/tv-3.yml b/Tests/fixtures/tv-3.yml index 1123cb5156..167a5f181e 100644 --- a/Tests/fixtures/tv-3.yml +++ b/Tests/fixtures/tv-3.yml @@ -4823,7 +4823,7 @@ engine_version: 102.0.5005.167 device: type: tv - brand: Vityaz + brand: Vityas model: 50LU1204 os_family: Android browser_family: Unknown @@ -6029,7 +6029,7 @@ engine_version: 98.0.4758.87 device: type: tv - brand: Vityaz + brand: Vityas model: 43LF1204 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tv-4.yml b/Tests/fixtures/tv-4.yml index 1a1707bad0..8ab320f9f4 100644 --- a/Tests/fixtures/tv-4.yml +++ b/Tests/fixtures/tv-4.yml @@ -1053,7 +1053,7 @@ engine_version: 66.0.3359.158 device: type: tv - brand: Vityaz + brand: Vityas model: 43LF1212 os_family: Android browser_family: Unknown @@ -5372,7 +5372,7 @@ engine_version: 104.0.5112.102 device: type: tv - brand: Vityaz + brand: Vityas model: 32LH1212 os_family: Android browser_family: Chrome @@ -9080,7 +9080,7 @@ engine_version: 113.0.5672.163 device: type: tv - brand: Vityaz + brand: Vityas model: 43LU1222 os_family: Android browser_family: Unknown diff --git a/Tests/fixtures/tv-5.yml b/Tests/fixtures/tv-5.yml index be32c176ff..5081c4f4a1 100644 --- a/Tests/fixtures/tv-5.yml +++ b/Tests/fixtures/tv-5.yml @@ -193,7 +193,7 @@ engine_version: 113.0.5672.163 device: type: tv - brand: Vityaz + brand: Vityas model: 32LH1221 os_family: Android browser_family: Unknown @@ -2289,7 +2289,7 @@ engine_version: 113.0.5672.163 device: type: tv - brand: Vityaz + brand: Vityas model: 50LU1222 os_family: Android browser_family: Chrome @@ -2361,7 +2361,7 @@ engine_version: 113.0.5672.163 device: type: tv - brand: Vityaz + brand: Vityas model: 55LU1222 os_family: Android browser_family: Unknown diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 855391336d..90e9f0058b 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -42581,8 +42581,8 @@ ANXONIT: device: 'tablet' model: '$1' -# Vityaz or vityas (www.vityaz.com) -Vityaz: +# Vityaz or Vityas (www.vityaz.com) +Vityas: regex: '(24LH1207|(?:43|5[05])LU1222|43L[FU]1204|50LU1204|43LF1212|32LH1212|32LH1221)(?:-V)?(?:[);/ ]|$)' device: 'tv' model: '$1' From 0cf2fc8a57ba508aa14f9ef5ec93281450a0a095 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Wed, 10 Sep 2025 19:32:51 +0300 Subject: [PATCH 05/77] Versus to Versus Mobility --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/tablet-9.yml | 2 +- regexes/device/mobiles.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 38f80d8c27..90bc3c832a 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1958,7 +1958,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'VET' => 'VETAS', 'VL' => 'Verykool', 'QV' => 'Verssed', - 'VER' => 'Versus', + 'VER' => 'Versus Mobility', 'V8' => 'Vesta', 'VEK' => 'Vekta', 'VT' => 'Vestel', diff --git a/Tests/fixtures/tablet-9.yml b/Tests/fixtures/tablet-9.yml index 7097d37e37..88eed6842f 100644 --- a/Tests/fixtures/tablet-9.yml +++ b/Tests/fixtures/tablet-9.yml @@ -4747,7 +4747,7 @@ engine_version: 78.0.3904.108 device: type: tablet - brand: Versus + brand: Versus Mobility model: V-Pad Pop os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 90e9f0058b..9b0c48e18d 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -42477,8 +42477,8 @@ FFF SmartLife: device: 'tablet' model: 'TAB-10A4' -# Versus -Versus: +# Versus Mobility (https://www.facebook.com/VersusMobilityTunisie/) +Versus Mobility: regex: '(V-Pad Pop)(?:[);/ ]|$)' device: 'tablet' model: '$1' From 6be2407809608cdf0c51d381e7fd7df02d4e359a Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Wed, 10 Sep 2025 19:46:02 +0300 Subject: [PATCH 06/77] TTK-TV to TTK --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/tv-1.yml | 2 +- regexes/device/mobiles.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 90bc3c832a..e48c58998e 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1878,7 +1878,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'THT' => 'Tsinghua Tongfang', '5C' => 'TTEC', 'TTF' => 'TTfone', - 'TTK' => 'TTK-TV', + 'TTK' => 'TTK', 'TU' => 'Tunisie Telecom', '1T' => 'Turbo', 'TR' => 'Turbo-X', diff --git a/Tests/fixtures/tv-1.yml b/Tests/fixtures/tv-1.yml index 90717d4adc..598ab3ffc5 100644 --- a/Tests/fixtures/tv-1.yml +++ b/Tests/fixtures/tv-1.yml @@ -6742,7 +6742,7 @@ engine_version: 95.0.4638.74 device: type: tv - brand: TTK-TV + brand: TTK model: SB-214 os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 9b0c48e18d..61005cf7fe 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -40513,8 +40513,8 @@ YUMKEM: - regex: 'U320' model: 'U320' -# TTK-TV (wwwttk.ru) -TTK-TV: +# TTK (wwwttk.ru) +TTK: regex: 'TTK Box 214' device: 'tv' model: 'SB-214' From 00e39526127e7c10e93dd26e35e1d0a87022adc6 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Wed, 10 Sep 2025 20:00:52 +0300 Subject: [PATCH 07/77] Syrox to Syrox Technologies --- Tests/fixtures/tablet.yml | 8 ++++---- regexes/device/mobiles.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Tests/fixtures/tablet.yml b/Tests/fixtures/tablet.yml index a572d6cfff..f4143c4fa2 100644 --- a/Tests/fixtures/tablet.yml +++ b/Tests/fixtures/tablet.yml @@ -3235,7 +3235,7 @@ engine_version: 74.0.3729.157 device: type: tablet - brand: Syrox + brand: Syrox Technologies model: SYX-T101 os_family: Android browser_family: Chrome @@ -3253,7 +3253,7 @@ engine_version: 74.0.3729.157 device: type: tablet - brand: Syrox + brand: Syrox Technologies model: SYX-T102 os_family: Android browser_family: Chrome @@ -3271,7 +3271,7 @@ engine_version: 30.0.0.0 device: type: tablet - brand: Syrox + brand: Syrox Technologies model: SYX-T700 os_family: Android browser_family: Chrome @@ -3289,7 +3289,7 @@ engine_version: 71.0.3578.99 device: type: tablet - brand: Syrox + brand: Syrox Technologies model: SYX-T704 os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 61005cf7fe..931122ca98 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -26446,8 +26446,8 @@ HERO: - regex: 'SP-001(?:[);/ ]|$)' model: 'SP-001' -# Syrox -Syrox: +# Syrox Technologies +Syrox Technologies: regex: '(SYX-(?:T70[04]|T10[12]))(?:[);/ ]|$)' device: 'tablet' model: '$1' From 5231a6790cb922578199b3826ac362cb955388c4 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Wed, 10 Sep 2025 20:04:49 +0300 Subject: [PATCH 08/77] Suzuki to Suzuki Corporation --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/tablet-5.yml | 6 +++--- regexes/device/mobiles.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index e48c58998e..43e1cd83cb 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1759,7 +1759,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'STV' => 'SuperTV', 'S5' => 'Supra', 'SUP' => 'Supraim', - 'ZS' => 'Suzuki', + 'ZS' => 'Suzuki Corporation', '2J' => 'Sunmi', 'SUN' => 'Sunmax', '0W' => 'Swipe', diff --git a/Tests/fixtures/tablet-5.yml b/Tests/fixtures/tablet-5.yml index 513f1da56e..d7c9e8e395 100644 --- a/Tests/fixtures/tablet-5.yml +++ b/Tests/fixtures/tablet-5.yml @@ -3019,7 +3019,7 @@ engine_version: 79.0.3945.93 device: type: tablet - brand: Suzuki + brand: Suzuki Corporation model: SumoPad 8100 os_family: Android browser_family: Chrome @@ -3037,7 +3037,7 @@ engine_version: 76.0.3809.132 device: type: tablet - brand: Suzuki + brand: Suzuki Corporation model: ECOPad 7 os_family: Android browser_family: Chrome @@ -3055,7 +3055,7 @@ engine_version: 80.0.3987.132 device: type: tablet - brand: Suzuki + brand: Suzuki Corporation model: SumoPad 10 os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 931122ca98..e97092f896 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -37566,8 +37566,8 @@ SuperTab: - regex: 'K7 Kids' model: 'K7 Kids' -# Suzuki (suzukitech.com) -Suzuki: +# Suzuki Corporation (suzukitech.com) +Suzuki Corporation: regex: 'SUZUKI[ _]|(?:ECOPAD7|SUMOPad10)(?:[);/ ]|$)' device: 'tablet' models: From b8aba0833d83d8ff5fa6f7047c6f25150401c8f6 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Wed, 10 Sep 2025 20:06:58 +0300 Subject: [PATCH 09/77] =?UTF-8?q?Takara=20to=20Takara=20Multim=C3=A9dia?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/tablet-11.yml | 2 +- Tests/fixtures/tablet-4.yml | 2 +- regexes/device/mobiles.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 43e1cd83cb..b3fd814387 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1775,7 +1775,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'TM' => 'T-Mobile', 'T96' => 'T96', 'TAD' => 'TADAAM', - 'TK' => 'Takara', + 'TK' => 'Takara Multimédia', '73' => 'Tambo', '9N' => 'Tanix', 'U5' => 'Taiga System', diff --git a/Tests/fixtures/tablet-11.yml b/Tests/fixtures/tablet-11.yml index 2fafcdf24e..7fd326b9a9 100644 --- a/Tests/fixtures/tablet-11.yml +++ b/Tests/fixtures/tablet-11.yml @@ -157,7 +157,7 @@ engine_version: 96.0.4664.92 device: type: tablet - brand: Takara + brand: Takara Multimédia model: MID169 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-4.yml b/Tests/fixtures/tablet-4.yml index 2209a4d06d..b93bac65ee 100644 --- a/Tests/fixtures/tablet-4.yml +++ b/Tests/fixtures/tablet-4.yml @@ -6725,7 +6725,7 @@ engine_version: 77.0.3865.92 device: type: tablet - brand: Takara + brand: Takara Multimédia model: MID211H os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index e97092f896..40bca4234c 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -34335,7 +34335,7 @@ TADAAM: model: 'TV Box' # Takara Multimédia (https://www.takara.fr/) -Takara: +Takara Multimédia: regex: '(MID169|MID211H)(?:[);/ ]|$)' device: 'tablet' model: '$1' From ecf581e6c0b3c140089982fa84f541ac35804904 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Wed, 10 Sep 2025 20:48:25 +0300 Subject: [PATCH 10/77] Smart to Smart Axiata --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/smartphone-26.yml | 2 +- Tests/fixtures/smartphone-30.yml | 2 +- Tests/fixtures/smartphone-34.yml | 2 +- Tests/fixtures/smartphone-36.yml | 2 +- regexes/device/mobiles.yml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index b3fd814387..1cc7c619b8 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1681,7 +1681,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'SR' => 'Smart Electronic', 'SMA' => 'Smart Kassel', 'STE' => 'Smart Tech', - '49' => 'Smart', + '49' => 'Smart Axiata', '47' => 'SmartBook', '3B' => 'Smartab', '80' => 'SMARTEC', diff --git a/Tests/fixtures/smartphone-26.yml b/Tests/fixtures/smartphone-26.yml index b9b7a37c5f..fa0506fa6c 100644 --- a/Tests/fixtures/smartphone-26.yml +++ b/Tests/fixtures/smartphone-26.yml @@ -4321,7 +4321,7 @@ engine_version: 84.0.4147.89 device: type: smartphone - brand: Smart + brand: Smart Axiata model: Coral 4 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-30.yml b/Tests/fixtures/smartphone-30.yml index 0ae37133e3..898c37ed27 100644 --- a/Tests/fixtures/smartphone-30.yml +++ b/Tests/fixtures/smartphone-30.yml @@ -7479,7 +7479,7 @@ engine_version: 96.0.4664.45 device: type: smartphone - brand: Smart + brand: Smart Axiata model: Slide Lite os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-34.yml b/Tests/fixtures/smartphone-34.yml index 10111ef9aa..e9e0c9b0d4 100644 --- a/Tests/fixtures/smartphone-34.yml +++ b/Tests/fixtures/smartphone-34.yml @@ -6861,7 +6861,7 @@ engine_version: 84.0.4147.105 device: type: smartphone - brand: Smart + brand: Smart Axiata model: Notrino os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-36.yml b/Tests/fixtures/smartphone-36.yml index 06805dda9b..172404c785 100644 --- a/Tests/fixtures/smartphone-36.yml +++ b/Tests/fixtures/smartphone-36.yml @@ -265,7 +265,7 @@ engine_version: 83.0.4103.106 device: type: smartphone - brand: Smart + brand: Smart Axiata model: Prime II os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 40bca4234c..bf5278c86d 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -28795,8 +28795,8 @@ Wink: device: 'tablet' model: '$1' -# Smart (smartgsmphone.com) -Smart: +# Smart Axiata or Smart Mobile (https://en.wikipedia.org/wiki/Smart_Axiata) +Smart Axiata: regex: '(?:Coral 4|Slide Lite|Notrino|Smart PRIME II)(?:[);/ ]|$)' device: 'smartphone' models: From d194491bd46785ee0ac5b55d02cba9e7923c9d98 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Wed, 10 Sep 2025 20:57:33 +0300 Subject: [PATCH 11/77] Sansui to Sansui Electric --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/smartphone-20.yml | 20 ++++++++++---------- Tests/fixtures/smartphone-34.yml | 2 +- regexes/device/mobiles.yml | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 1cc7c619b8..bee34f7c85 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1616,7 +1616,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'SAB' => 'Sambox', 'SNA' => 'SNAMI', 'S0' => 'Sanei', - '12' => 'Sansui', + '12' => 'Sansui Electric', 'SAK' => 'Sankey', 'SQ' => 'Santin', 'SY' => 'Sanyo', diff --git a/Tests/fixtures/smartphone-20.yml b/Tests/fixtures/smartphone-20.yml index 8dacf66da1..c1fbfab29a 100644 --- a/Tests/fixtures/smartphone-20.yml +++ b/Tests/fixtures/smartphone-20.yml @@ -2035,7 +2035,7 @@ engine_version: 80.0.3987.149 device: type: smartphone - brand: Sansui + brand: Sansui Electric model: Switch os_family: Android browser_family: Chrome @@ -2053,7 +2053,7 @@ engine_version: 75.0.3770.101 device: type: smartphone - brand: Sansui + brand: Sansui Electric model: Play os_family: Android browser_family: Chrome @@ -2071,7 +2071,7 @@ engine_version: 79.0.3945.136 device: type: smartphone - brand: Sansui + brand: Sansui Electric model: Fun os_family: Android browser_family: Chrome @@ -2089,7 +2089,7 @@ engine_version: "533.1" device: type: smartphone - brand: Sansui + brand: Sansui Electric model: SA41 os_family: Android browser_family: Android Browser @@ -2107,7 +2107,7 @@ engine_version: "534.30" device: type: smartphone - brand: Sansui + brand: Sansui Electric model: U46 os_family: Android browser_family: Unknown @@ -2125,7 +2125,7 @@ engine_version: 30.0.0.0 device: type: smartphone - brand: Sansui + brand: Sansui Electric model: U30 os_family: Android browser_family: Chrome @@ -2143,7 +2143,7 @@ engine_version: "528.5" device: type: smartphone - brand: Sansui + brand: Sansui Electric model: SA40 os_family: Android browser_family: Unknown @@ -2161,7 +2161,7 @@ engine_version: 84.0.4147.125 device: type: smartphone - brand: Sansui + brand: Sansui Electric model: Nova os_family: Android browser_family: Chrome @@ -2179,7 +2179,7 @@ engine_version: 30.0.0.0 device: type: smartphone - brand: Sansui + brand: Sansui Electric model: U45 os_family: Android browser_family: Chrome @@ -2197,7 +2197,7 @@ engine_version: 30.0.0.0 device: type: smartphone - brand: Sansui + brand: Sansui Electric model: U32 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-34.yml b/Tests/fixtures/smartphone-34.yml index e9e0c9b0d4..3cafe5b561 100644 --- a/Tests/fixtures/smartphone-34.yml +++ b/Tests/fixtures/smartphone-34.yml @@ -6035,7 +6035,7 @@ engine_version: 80.0.3987.87 device: type: smartphone - brand: Sansui + brand: Sansui Electric model: Horizon 2 os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index bf5278c86d..c1d44c14f9 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -36576,8 +36576,8 @@ Koolnee: device: 'smartphone' model: '$1' -# Sansui (sansui-global.com) -Sansui: +# Sansui Electric (sansui-global.com) +Sansui Electric: regex: 'Sansui[_ ]|(?:S505024)(?:[);/ ]|$)' device: 'smartphone' models: From 7de86cfcbcccf1e3949098baca5c2435e2cc9d26 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Thu, 11 Sep 2025 19:41:49 +0300 Subject: [PATCH 12/77] Vue Micro to VUE --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/tablet-8.yml | 2 +- regexes/device/mobiles.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index bee34f7c85..f872dec67d 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -2031,7 +2031,7 @@ abstract class AbstractDeviceParser extends AbstractParser '3V' => 'VVETIME', 'ZC' => 'VUCATIMES', 'VO2' => 'VOLKANO', - 'VUE' => 'Vue Micro', + 'VUE' => 'VUE', 'WAK' => 'Walker', 'WA' => 'Walton', 'WAF' => 'WAF', diff --git a/Tests/fixtures/tablet-8.yml b/Tests/fixtures/tablet-8.yml index 0a93c898aa..a036c389cc 100644 --- a/Tests/fixtures/tablet-8.yml +++ b/Tests/fixtures/tablet-8.yml @@ -2693,7 +2693,7 @@ engine_version: 75.0.3770.89 device: type: tablet - brand: Vue Micro + brand: VUE model: 81V os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index c1d44c14f9..9b8683c8c7 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -40891,8 +40891,8 @@ BlueSky: device: 'smartphone' model: 'BSS$1' -# Vue Micro -Vue Micro: +# VUE ("Vue Micro" in previous versions, but looks like it's been sold as "VUE" in multiple places, for example https://www.laptopsdirect.co.uk/grade-a1-vue-8gb-7-inch-android-tablet-with-keyboard-case-black-a1-vuev7kb/version.asp and https://www.ebay.co.uk/itm/394119922503) +VUE: regex: ' (81V)(?:[);/ ]|$)' device: 'tablet' model: '$1' From ae79cd0c5a2cd673f7abe341e57fca919fd6f68d Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Thu, 11 Sep 2025 19:47:04 +0300 Subject: [PATCH 13/77] VALTECH to Valtech Mobility --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/tablet-9.yml | 2 +- regexes/device/mobiles.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index f872dec67d..c58280a9be 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1939,7 +1939,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'VC' => 'Vankyo', 'VAL' => 'VALEM', 'VA2' => 'VALE', - 'VAT' => 'VALTECH', + 'VAT' => 'Valtech Mobility', 'VAN' => 'VANGUARD', 'VAW' => 'VANWIN', 'VB' => 'VC', diff --git a/Tests/fixtures/tablet-9.yml b/Tests/fixtures/tablet-9.yml index 88eed6842f..b55061d240 100644 --- a/Tests/fixtures/tablet-9.yml +++ b/Tests/fixtures/tablet-9.yml @@ -1555,7 +1555,7 @@ engine_version: 78.0.3904.108 device: type: tablet - brand: VALTECH + brand: Valtech Mobility model: TAB-7Q804VAL os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 9b8683c8c7..321c47d105 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -42070,8 +42070,8 @@ LPX-G: - regex: 'LPX-G Box Max' model: 'Box Max' -# VALTECH -VALTECH: +# Valtech Mobility (most likely, since can't find details on the tablet itself, but https://valtech-mobility.de/en/about-us/ deal with automotive things) +Valtech Mobility: regex: 'TAB7Q804VAL' device: 'tablet' model: 'TAB-7Q804VAL' From 5ce380a8c99c73eef171778d49c92418db0d55cb Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Thu, 11 Sep 2025 20:13:24 +0300 Subject: [PATCH 14/77] Schneider to Schneider Consumer --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/desktop.yml | 2 +- Tests/fixtures/tv-2.yml | 2 +- regexes/device/mobiles.yml | 4 ++-- regexes/device/notebooks.yml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index c58280a9be..4d926a5708 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1624,7 +1624,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'S9' => 'Savio', 'Y4' => 'TCL SCBC', 'SCH' => 'SCHAUB LORENZ', - 'CZ' => 'Schneider', + 'CZ' => 'Schneider Consumer', 'SHO' => 'SCHONTECH', 'SCO' => 'Scosmos', 'SC1' => 'Scoole', diff --git a/Tests/fixtures/desktop.yml b/Tests/fixtures/desktop.yml index 40a0f3b710..bd24d51460 100644 --- a/Tests/fixtures/desktop.yml +++ b/Tests/fixtures/desktop.yml @@ -4588,7 +4588,7 @@ version: 140.0.0.232.179 device: type: desktop - brand: Schneider + brand: Schneider Consumer model: Notebook 14" Cherry Trail os_family: Windows browser_family: Unknown diff --git a/Tests/fixtures/tv-2.yml b/Tests/fixtures/tv-2.yml index fc31b6f1a1..543b1b2803 100644 --- a/Tests/fixtures/tv-2.yml +++ b/Tests/fixtures/tv-2.yml @@ -7465,7 +7465,7 @@ engine_version: 84.0.4147.140 device: type: tv - brand: Schneider + brand: Schneider Consumer model: "" os_family: GNU/Linux browser_family: Opera diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 321c47d105..afa154d439 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -10823,8 +10823,8 @@ Maxwell: device: 'tv' model: '' -# Schneider -Schneider: +# Schneider Consumer (https://www.schneiderconsumer.com/en/our-brand/, "Consumer" is mostly to avoid confusion with Schneider Electric) +Schneider Consumer: regex: 'SCHNEIDER[;,]' device: 'tv' model: '' diff --git a/regexes/device/notebooks.yml b/regexes/device/notebooks.yml index 05e1991727..6a4fdd11da 100644 --- a/regexes/device/notebooks.yml +++ b/regexes/device/notebooks.yml @@ -107,7 +107,7 @@ Lenovo: - regex: 'FBMD/80VR;' model: 'Legion Y720' -Schneider: +Schneider Consumer: regex: 'FBMD/SCL141CTP;' device: 'desktop' model: 'Notebook 14" Cherry Trail' From a2f764b047dd0988806d7565da4d5189d4e42acd Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Thu, 11 Sep 2025 20:16:14 +0300 Subject: [PATCH 15/77] RIM to Research In Motion --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/mediaplayer.yml | 2 +- Tests/fixtures/smartphone-1.yml | 20 ++--- Tests/fixtures/smartphone-11.yml | 100 ++++++++++++------------- Tests/fixtures/smartphone-24.yml | 2 +- Tests/fixtures/smartphone-27.yml | 6 +- Tests/fixtures/smartphone-39.yml | 4 +- Tests/fixtures/smartphone-41.yml | 2 +- Tests/fixtures/tablet-4.yml | 2 +- regexes/device/mobiles.yml | 4 +- 10 files changed, 72 insertions(+), 72 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 4d926a5708..0c883288ca 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1562,7 +1562,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'RHI' => 'Rhino', 'RIC' => 'Ricoh', 'RI' => 'Rikomagic', - 'RM' => 'RIM', + 'RM' => 'Research In Motion', 'RN' => 'Rinno', 'RNB' => 'Ringing Bells', 'RX' => 'Ritmix', diff --git a/Tests/fixtures/mediaplayer.yml b/Tests/fixtures/mediaplayer.yml index e6b8605408..e144a6d2b0 100644 --- a/Tests/fixtures/mediaplayer.yml +++ b/Tests/fixtures/mediaplayer.yml @@ -120,7 +120,7 @@ version: "1.34" device: type: smartphone - brand: RIM + brand: Research In Motion model: BlackBerry os_family: BlackBerry browser_family: Unknown diff --git a/Tests/fixtures/smartphone-1.yml b/Tests/fixtures/smartphone-1.yml index 0b87c18699..8d4edd0d1b 100644 --- a/Tests/fixtures/smartphone-1.yml +++ b/Tests/fixtures/smartphone-1.yml @@ -9364,7 +9364,7 @@ engine_version: "" device: type: smartphone - brand: RIM + brand: Research In Motion model: Curve 9320 os_family: BlackBerry browser_family: Unknown @@ -9382,7 +9382,7 @@ engine_version: "" device: type: smartphone - brand: RIM + brand: Research In Motion model: Curve 8520 os_family: BlackBerry browser_family: Unknown @@ -9400,7 +9400,7 @@ engine_version: "" device: type: smartphone - brand: RIM + brand: Research In Motion model: Curve 8530 os_family: BlackBerry browser_family: Unknown @@ -9418,7 +9418,7 @@ engine_version: "" device: type: smartphone - brand: RIM + brand: Research In Motion model: Bold 9000 os_family: BlackBerry browser_family: Unknown @@ -9436,7 +9436,7 @@ engine_version: "" device: type: smartphone - brand: RIM + brand: Research In Motion model: Curve 9220 os_family: BlackBerry browser_family: Unknown @@ -9454,7 +9454,7 @@ engine_version: "" device: type: smartphone - brand: RIM + brand: Research In Motion model: Curve 9360 os_family: BlackBerry browser_family: Unknown @@ -9472,7 +9472,7 @@ engine_version: "" device: type: smartphone - brand: RIM + brand: Research In Motion model: Tour 9630 os_family: BlackBerry browser_family: Unknown @@ -9490,7 +9490,7 @@ engine_version: "" device: type: smartphone - brand: RIM + brand: Research In Motion model: "9720" os_family: BlackBerry browser_family: Unknown @@ -9508,7 +9508,7 @@ engine_version: "" device: type: smartphone - brand: RIM + brand: Research In Motion model: Torch 9800 os_family: BlackBerry browser_family: Unknown @@ -9526,7 +9526,7 @@ engine_version: "" device: type: smartphone - brand: RIM + brand: Research In Motion model: Torch 9860 os_family: BlackBerry browser_family: Unknown diff --git a/Tests/fixtures/smartphone-11.yml b/Tests/fixtures/smartphone-11.yml index d090e5e7e8..618112b015 100644 --- a/Tests/fixtures/smartphone-11.yml +++ b/Tests/fixtures/smartphone-11.yml @@ -8014,7 +8014,7 @@ engine_version: 64.0.3282.137 device: type: smartphone - brand: RIM + brand: Research In Motion model: Aurora os_family: Android browser_family: Chrome @@ -8030,7 +8030,7 @@ version: "1.34" device: type: smartphone - brand: RIM + brand: Research In Motion model: BlackBerry os_family: BlackBerry browser_family: Unknown @@ -8048,7 +8048,7 @@ engine_version: "" device: type: smartphone - brand: RIM + brand: Research In Motion model: Curve 3G 9300 os_family: BlackBerry browser_family: Unknown @@ -8066,7 +8066,7 @@ engine_version: 2.8.119 device: type: smartphone - brand: RIM + brand: Research In Motion model: BlackBerry os_family: BlackBerry browser_family: Opera @@ -8084,7 +8084,7 @@ engine_version: "" device: type: smartphone - brand: RIM + brand: Research In Motion model: BlackBerry 3 os_family: BlackBerry browser_family: Unknown @@ -8102,7 +8102,7 @@ engine_version: "" device: type: smartphone - brand: RIM + brand: Research In Motion model: BlackBerry 7520 os_family: BlackBerry browser_family: Unknown @@ -8120,7 +8120,7 @@ engine_version: "" device: type: smartphone - brand: RIM + brand: Research In Motion model: BlackBerry 8520 os_family: BlackBerry browser_family: BlackBerry Browser @@ -8138,7 +8138,7 @@ engine_version: "534.11" device: type: smartphone - brand: RIM + brand: Research In Motion model: BlackBerry 9220 os_family: BlackBerry browser_family: BlackBerry Browser @@ -8156,7 +8156,7 @@ engine_version: "534.8" device: type: smartphone - brand: RIM + brand: Research In Motion model: BlackBerry 9800 os_family: BlackBerry browser_family: BlackBerry Browser @@ -8174,7 +8174,7 @@ engine_version: "534.11" device: type: smartphone - brand: RIM + brand: Research In Motion model: BlackBerry 9930 os_family: BlackBerry browser_family: BlackBerry Browser @@ -8192,7 +8192,7 @@ engine_version: "" device: type: smartphone - brand: RIM + brand: Research In Motion model: BlackBerry DTEK50 os_family: Android browser_family: Android Browser @@ -8210,7 +8210,7 @@ engine_version: 55.0.2883.91 device: type: smartphone - brand: RIM + brand: Research In Motion model: BlackBerry DTEK50 os_family: Android browser_family: Chrome @@ -8228,7 +8228,7 @@ engine_version: 51.0.2704.81 device: type: smartphone - brand: RIM + brand: Research In Motion model: BlackBerry DTEK60 os_family: Android browser_family: Chrome @@ -8246,7 +8246,7 @@ engine_version: 58.0.3029.83 device: type: smartphone - brand: RIM + brand: Research In Motion model: BlackBerry DTEK60 os_family: Android browser_family: Chrome @@ -8264,7 +8264,7 @@ engine_version: "537.10" device: type: smartphone - brand: RIM + brand: Research In Motion model: BlackBerry Kbd os_family: BlackBerry browser_family: BlackBerry Browser @@ -8282,7 +8282,7 @@ engine_version: 46.0.2490.76 device: type: smartphone - brand: RIM + brand: Research In Motion model: BlackBerry Priv os_family: Android browser_family: Chrome @@ -8300,7 +8300,7 @@ engine_version: 55.0.2883.91 device: type: smartphone - brand: RIM + brand: Research In Motion model: BlackBerry Priv os_family: Android browser_family: Chrome @@ -8318,7 +8318,7 @@ engine_version: 55.0.2883.91 device: type: smartphone - brand: RIM + brand: Research In Motion model: BlackBerry Priv os_family: Android browser_family: Chrome @@ -8336,7 +8336,7 @@ engine_version: 56.0.2924.87 device: type: smartphone - brand: RIM + brand: Research In Motion model: BlackBerry Priv os_family: Android browser_family: Chrome @@ -8354,7 +8354,7 @@ engine_version: 65.0.3325.109 device: type: smartphone - brand: RIM + brand: Research In Motion model: BlackBerry Priv os_family: Android browser_family: Chrome @@ -8372,7 +8372,7 @@ engine_version: "537.10" device: type: smartphone - brand: RIM + brand: Research In Motion model: BlackBerry Touch os_family: BlackBerry browser_family: BlackBerry Browser @@ -8390,7 +8390,7 @@ engine_version: 69.0.3497 device: type: smartphone - brand: RIM + brand: Research In Motion model: Evolve os_family: Android browser_family: Chrome @@ -8408,7 +8408,7 @@ engine_version: 69.0.3497 device: type: smartphone - brand: RIM + brand: Research In Motion model: Evolve X os_family: Android browser_family: Chrome @@ -8426,7 +8426,7 @@ engine_version: 67.0.3396.87 device: type: smartphone - brand: RIM + brand: Research In Motion model: KEY2 os_family: Android browser_family: Chrome @@ -8444,7 +8444,7 @@ engine_version: 67.0.3396.87 device: type: smartphone - brand: RIM + brand: Research In Motion model: KEY2 os_family: Android browser_family: Chrome @@ -8462,7 +8462,7 @@ engine_version: 68.0.3440.91 device: type: smartphone - brand: RIM + brand: Research In Motion model: KEY2 os_family: Android browser_family: Chrome @@ -8480,7 +8480,7 @@ engine_version: 68.0.3440.91 device: type: smartphone - brand: RIM + brand: Research In Motion model: KEY2 os_family: Android browser_family: Chrome @@ -8498,7 +8498,7 @@ engine_version: 68.0.3440.91 device: type: smartphone - brand: RIM + brand: Research In Motion model: KEY2 os_family: Android browser_family: Chrome @@ -8516,7 +8516,7 @@ engine_version: 68.0.3440.91 device: type: smartphone - brand: RIM + brand: Research In Motion model: KEY2 os_family: Android browser_family: Chrome @@ -8534,7 +8534,7 @@ engine_version: 68.0.3440.91 device: type: smartphone - brand: RIM + brand: Research In Motion model: KEY2 os_family: Android browser_family: Chrome @@ -8552,7 +8552,7 @@ engine_version: 67.0.3396.87 device: type: smartphone - brand: RIM + brand: Research In Motion model: KEY2 Black os_family: Android browser_family: Chrome @@ -8570,7 +8570,7 @@ engine_version: 69.0.3497 device: type: smartphone - brand: RIM + brand: Research In Motion model: KEY2 LE os_family: Android browser_family: Chrome @@ -8588,7 +8588,7 @@ engine_version: 69.0.3497 device: type: smartphone - brand: RIM + brand: Research In Motion model: KEY2 LE os_family: Android browser_family: Chrome @@ -8606,7 +8606,7 @@ engine_version: 69.0.3497 device: type: smartphone - brand: RIM + brand: Research In Motion model: KEY2 LE os_family: Android browser_family: Chrome @@ -8624,7 +8624,7 @@ engine_version: 69.0.3497 device: type: smartphone - brand: RIM + brand: Research In Motion model: KEY2 LE os_family: Android browser_family: Chrome @@ -8642,7 +8642,7 @@ engine_version: 69.0.3497 device: type: smartphone - brand: RIM + brand: Research In Motion model: KEY2 LE os_family: Android browser_family: Chrome @@ -8660,7 +8660,7 @@ engine_version: 69.0.3497 device: type: smartphone - brand: RIM + brand: Research In Motion model: KEY2 LE os_family: Android browser_family: Chrome @@ -8678,7 +8678,7 @@ engine_version: 69.0.3497 device: type: smartphone - brand: RIM + brand: Research In Motion model: KEY2 LE os_family: Android browser_family: Chrome @@ -8696,7 +8696,7 @@ engine_version: 69.0.3497 device: type: smartphone - brand: RIM + brand: Research In Motion model: KEY2 LE os_family: Android browser_family: Chrome @@ -8714,7 +8714,7 @@ engine_version: 69.0.3497 device: type: smartphone - brand: RIM + brand: Research In Motion model: KEY2 LE os_family: Android browser_family: Chrome @@ -8732,7 +8732,7 @@ engine_version: 67.0.3396.87 device: type: smartphone - brand: RIM + brand: Research In Motion model: KEY2 Silver os_family: Android browser_family: Chrome @@ -8750,7 +8750,7 @@ engine_version: 66.0.3359.158 device: type: smartphone - brand: RIM + brand: Research In Motion model: KEYone os_family: Android browser_family: Chrome @@ -8768,7 +8768,7 @@ engine_version: 67.0.3396.68 device: type: smartphone - brand: RIM + brand: Research In Motion model: KEYone os_family: Android browser_family: Chrome @@ -8786,7 +8786,7 @@ engine_version: 67.0.3396.68 device: type: smartphone - brand: RIM + brand: Research In Motion model: KEYone os_family: Android browser_family: Chrome @@ -8804,7 +8804,7 @@ engine_version: 67.0.3396.87 device: type: smartphone - brand: RIM + brand: Research In Motion model: KEYone os_family: Android browser_family: Chrome @@ -8822,7 +8822,7 @@ engine_version: 68.0.3440.91 device: type: smartphone - brand: RIM + brand: Research In Motion model: KEYone os_family: Android browser_family: Chrome @@ -8840,7 +8840,7 @@ engine_version: 37.0.0.0 device: type: smartphone - brand: RIM + brand: Research In Motion model: KEYone os_family: Android browser_family: Chrome @@ -8858,7 +8858,7 @@ engine_version: 61.0.3163.98 device: type: smartphone - brand: RIM + brand: Research In Motion model: Motion os_family: Android browser_family: Chrome @@ -8876,7 +8876,7 @@ engine_version: 63.0.3239.111 device: type: smartphone - brand: RIM + brand: Research In Motion model: Motion os_family: Android browser_family: Chrome @@ -8894,7 +8894,7 @@ engine_version: 67.0.3396.87 device: type: smartphone - brand: RIM + brand: Research In Motion model: Motion os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-24.yml b/Tests/fixtures/smartphone-24.yml index 138acdb92d..e957d54a1f 100644 --- a/Tests/fixtures/smartphone-24.yml +++ b/Tests/fixtures/smartphone-24.yml @@ -6213,7 +6213,7 @@ engine_version: "534.11" device: type: smartphone - brand: RIM + brand: Research In Motion model: Bold 9790 os_family: BlackBerry browser_family: BlackBerry Browser diff --git a/Tests/fixtures/smartphone-27.yml b/Tests/fixtures/smartphone-27.yml index e94b9784c7..6159f994fa 100644 --- a/Tests/fixtures/smartphone-27.yml +++ b/Tests/fixtures/smartphone-27.yml @@ -4939,7 +4939,7 @@ engine_version: "534.11" device: type: smartphone - brand: RIM + brand: Research In Motion model: BlackBerry 9900 os_family: BlackBerry browser_family: BlackBerry Browser @@ -4957,7 +4957,7 @@ engine_version: "534.8" device: type: smartphone - brand: RIM + brand: Research In Motion model: BlackBerry 9700 os_family: BlackBerry browser_family: BlackBerry Browser @@ -8951,7 +8951,7 @@ engine_version: 94.0.4606.71 device: type: smartphone - brand: RIM + brand: Research In Motion model: KEYone os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-39.yml b/Tests/fixtures/smartphone-39.yml index 4fc15b82b3..69f4094dd6 100644 --- a/Tests/fixtures/smartphone-39.yml +++ b/Tests/fixtures/smartphone-39.yml @@ -5299,7 +5299,7 @@ engine_version: 123.0.6345.223 device: type: smartphone - brand: RIM + brand: Research In Motion model: KEY2 os_family: Android browser_family: Chrome @@ -5317,7 +5317,7 @@ engine_version: 122.0.6284.202 device: type: smartphone - brand: RIM + brand: Research In Motion model: Motion os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-41.yml b/Tests/fixtures/smartphone-41.yml index 6172ab9a10..a646070110 100644 --- a/Tests/fixtures/smartphone-41.yml +++ b/Tests/fixtures/smartphone-41.yml @@ -1453,7 +1453,7 @@ engine_version: 123.0.0.0 device: type: smartphone - brand: RIM + brand: Research In Motion model: Evolve X os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-4.yml b/Tests/fixtures/tablet-4.yml index b93bac65ee..5ff0d2e5f2 100644 --- a/Tests/fixtures/tablet-4.yml +++ b/Tests/fixtures/tablet-4.yml @@ -99,7 +99,7 @@ engine_version: "536.2" device: type: tablet - brand: RIM + brand: Research In Motion model: BlackBerry Playbook os_family: BlackBerry browser_family: BlackBerry Browser diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index afa154d439..cce008a0cb 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -710,8 +710,8 @@ CnM: - regex: 'CnM[ -](?:Touchpad|TP)[ -]([0-9.]+)' model: 'Touchpad $1' -# RIM/BlackBerry -RIM: +# Research In Motion (aka RIM, former brand name of BlackBerry) +Research In Motion: regex: 'BB10;|BlackBerry|rim[0-9]+|PlayBook|STV100-[1234]|STH100-[12]|BBA100-[12]|BBB100-[1234567]|BBD100-[126]|BB[EF]100-[123456789]|BB[CGH]100-1' device: 'smartphone' models: From 7319733961c0d9389f0ec6212efc390e58587451 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Thu, 11 Sep 2025 20:16:46 +0300 Subject: [PATCH 16/77] Rinno to Rinno Telecom --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/smartphone-11.yml | 2 +- regexes/device/mobiles.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 0c883288ca..1980373194 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1563,7 +1563,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'RIC' => 'Ricoh', 'RI' => 'Rikomagic', 'RM' => 'Research In Motion', - 'RN' => 'Rinno', + 'RN' => 'Rinno Telecom', 'RNB' => 'Ringing Bells', 'RX' => 'Ritmix', 'R7' => 'Ritzviva', diff --git a/Tests/fixtures/smartphone-11.yml b/Tests/fixtures/smartphone-11.yml index 618112b015..6a50f8228c 100644 --- a/Tests/fixtures/smartphone-11.yml +++ b/Tests/fixtures/smartphone-11.yml @@ -8912,7 +8912,7 @@ engine_version: "534.30" device: type: smartphone - brand: Rinno + brand: Rinno Telecom model: R505 os_family: Android browser_family: Android Browser diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index cce008a0cb..9242fe47bf 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -8469,8 +8469,8 @@ Rikomagic: device: 'tv' model: 'MK$1' -# Rinno -Rinno: +# Rinno Telecom +Rinno Telecom: regex: 'Rinno (R(?:400|505))' device: 'smartphone' model: '$1' From c1b98a9dd2ab7b070f1eda6c736cc71db81b0c4c Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Thu, 11 Sep 2025 20:19:03 +0300 Subject: [PATCH 17/77] Spider to Spider Receiver --- Tests/fixtures/tv-5.yml | 8 ++++---- regexes/device/mobiles.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Tests/fixtures/tv-5.yml b/Tests/fixtures/tv-5.yml index 5081c4f4a1..3ca193af43 100644 --- a/Tests/fixtures/tv-5.yml +++ b/Tests/fixtures/tv-5.yml @@ -715,7 +715,7 @@ engine_version: 74.0.3729.186 device: type: tv - brand: Spider + brand: Spider Receiver model: Red 90 os_family: Android browser_family: Chrome @@ -733,7 +733,7 @@ engine_version: 74.0.3729.186 device: type: tv - brand: Spider + brand: Spider Receiver model: Red 60 os_family: Android browser_family: Chrome @@ -751,7 +751,7 @@ engine_version: 74.0.3729.186 device: type: tv - brand: Spider + brand: Spider Receiver model: Red 30 os_family: Android browser_family: Chrome @@ -769,7 +769,7 @@ engine_version: 74.0.3729.186 device: type: tv - brand: Spider + brand: Spider Receiver model: Red 10 os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 9242fe47bf..973bd4f7b9 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -44590,8 +44590,8 @@ Trecfone: device: 'smartphone' model: '17 Pro Max' -# Spider (spider-receiver.com) -Spider: +# Spider Receiver (spider-receiver.com) +Spider Receiver: regex: 'RED ([1369]0)(?:[);/ ]|$)' device: 'tv' model: 'Red $1' From 91d93fad9c7628d2cd1e7cade309019d5cdddc80 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Thu, 11 Sep 2025 20:22:00 +0300 Subject: [PATCH 18/77] RED to RED Digital Cinema --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/smartphone-11.yml | 2 +- regexes/device/mobiles.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 1980373194..4f342c6f23 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1545,7 +1545,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'RB' => 'Readboy', 'RE' => 'Realme', 'RE1' => 'Redbean', - 'R8' => 'RED', + 'R8' => 'RED Digital Cinema', 'RDX' => 'RED-X', 'REW' => 'Redway', '6F' => 'Redfox', diff --git a/Tests/fixtures/smartphone-11.yml b/Tests/fixtures/smartphone-11.yml index 6a50f8228c..ebbf56ecd6 100644 --- a/Tests/fixtures/smartphone-11.yml +++ b/Tests/fixtures/smartphone-11.yml @@ -6810,7 +6810,7 @@ engine_version: 83.0.4103.101 device: type: smartphone - brand: RED + brand: RED Digital Cinema model: Hydrogen One os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 973bd4f7b9..93675b307a 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -33783,8 +33783,8 @@ RedLine: - regex: 'IP-([678]0) MAX' model: 'IP-$1 Max' -# RED -RED: +# RED Digital Cinema (aka RED) +RED Digital Cinema: regex: '(?:H1A1000)(?:[);/ ]|$)' device: 'smartphone' model: 'Hydrogen One' From 5a3d20a41daf95eccc531a9abe66623b204d1715 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Thu, 11 Sep 2025 20:23:36 +0300 Subject: [PATCH 19/77] Reach to Reach Mobiletech --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/smartphone-19.yml | 10 +++++----- Tests/fixtures/smartphone-29.yml | 2 +- regexes/device/mobiles.yml | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 4f342c6f23..d64751c9a6 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1538,7 +1538,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'RAY' => 'Raylandz', 'RC' => 'RCA Tablets', 'RCT' => 'RCT', - '2R' => 'Reach', + '2R' => 'Reach Mobiletech', 'RLX' => 'Realix', 'REL' => 'RelNAT', 'RE4' => 'Relndoo', diff --git a/Tests/fixtures/smartphone-19.yml b/Tests/fixtures/smartphone-19.yml index cd2bcd4426..8c69472822 100644 --- a/Tests/fixtures/smartphone-19.yml +++ b/Tests/fixtures/smartphone-19.yml @@ -571,7 +571,7 @@ engine_version: 75.0.3770.101 device: type: smartphone - brand: Reach + brand: Reach Mobiletech model: Allure Ultra Curve os_family: Android browser_family: Chrome @@ -589,7 +589,7 @@ engine_version: 79.0.3945.93 device: type: smartphone - brand: Reach + brand: Reach Mobiletech model: Allure Ultra os_family: Android browser_family: Chrome @@ -607,7 +607,7 @@ engine_version: 80.0.3987.99 device: type: smartphone - brand: Reach + brand: Reach Mobiletech model: Allure Secure os_family: Android browser_family: Chrome @@ -625,7 +625,7 @@ engine_version: 79.0.3945.116 device: type: smartphone - brand: Reach + brand: Reach Mobiletech model: Allure Admire os_family: Android browser_family: Chrome @@ -643,7 +643,7 @@ engine_version: 84.0.4147.89 device: type: smartphone - brand: Reach + brand: Reach Mobiletech model: Allure Rise os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-29.yml b/Tests/fixtures/smartphone-29.yml index afff69ac03..f68c0c56e3 100644 --- a/Tests/fixtures/smartphone-29.yml +++ b/Tests/fixtures/smartphone-29.yml @@ -1129,7 +1129,7 @@ engine_version: 69.0.3497.100 device: type: smartphone - brand: Reach + brand: Reach Mobiletech model: Opulent X os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 93675b307a..569fe32729 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -35862,8 +35862,8 @@ Play Now: - regex: 'PLAY NOW TV BOX 2(?:[);/ ]|$)' model: 'TV Box 2' -# Reach -Reach: +# Reach Mobiletech (https://www.reachmobile.in/) +Reach Mobiletech: regex: '(Allure[_ ](?:Ultra(?:[_]Curve)?|Secure|Admire|Rise)|Opulent X)(?:[);/ ]|$)' device: 'smartphone' model: '$1' From 3dc2385c117f4e826645406b12e569bb667c0ae1 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Thu, 11 Sep 2025 20:26:03 +0300 Subject: [PATCH 20/77] RCA Tablets to RCA --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/portable_media_player.yml | 4 ++-- Tests/fixtures/smartphone-11.yml | 2 +- Tests/fixtures/smartphone-33.yml | 4 ++-- Tests/fixtures/smartphone-38.yml | 2 +- Tests/fixtures/tablet-10.yml | 10 +++++----- Tests/fixtures/tablet-3.yml | 2 +- Tests/fixtures/tablet-4.yml | 4 ++-- Tests/fixtures/tablet-6.yml | 10 +++++----- Tests/fixtures/tablet-7.yml | 2 +- Tests/fixtures/tablet-8.yml | 14 +++++++------- Tests/fixtures/tv-2.yml | 2 +- Tests/fixtures/tv-3.yml | 2 +- Tests/fixtures/tv-4.yml | 4 ++-- regexes/device/mobiles.yml | 4 ++-- regexes/device/shell_tv.yml | 4 ++-- regexes/device/televisions.yml | 4 ++-- 17 files changed, 38 insertions(+), 38 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index d64751c9a6..a2b6ab91c1 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1536,7 +1536,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'RAZ' => 'RAZZ', '95' => 'Rakuten', 'RAY' => 'Raylandz', - 'RC' => 'RCA Tablets', + 'RC' => 'RCA', 'RCT' => 'RCT', '2R' => 'Reach Mobiletech', 'RLX' => 'Realix', diff --git a/Tests/fixtures/portable_media_player.yml b/Tests/fixtures/portable_media_player.yml index 1ef92000ff..3134db15ab 100644 --- a/Tests/fixtures/portable_media_player.yml +++ b/Tests/fixtures/portable_media_player.yml @@ -385,7 +385,7 @@ engine_version: 80.0.3987.162 device: type: portable media player - brand: RCA Tablets + brand: RCA model: DRP29101 os_family: Android browser_family: Chrome @@ -421,7 +421,7 @@ engine_version: 81.0.4044.138 device: type: portable media player - brand: RCA Tablets + brand: RCA model: DRP2091 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-11.yml b/Tests/fixtures/smartphone-11.yml index ebbf56ecd6..a2c180bbb5 100644 --- a/Tests/fixtures/smartphone-11.yml +++ b/Tests/fixtures/smartphone-11.yml @@ -6936,7 +6936,7 @@ engine_version: 64.0.3282.137 device: type: smartphone - brand: RCA Tablets + brand: RCA model: RLTP4028 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-33.yml b/Tests/fixtures/smartphone-33.yml index 58e4db6955..aa79608b7a 100644 --- a/Tests/fixtures/smartphone-33.yml +++ b/Tests/fixtures/smartphone-33.yml @@ -2011,7 +2011,7 @@ engine_version: 63.0.3239.111 device: type: smartphone - brand: RCA Tablets + brand: RCA model: RLTP5567 os_family: Android browser_family: Chrome @@ -5013,7 +5013,7 @@ engine_version: 74.0.3729.157 device: type: smartphone - brand: RCA Tablets + brand: RCA model: RLTP5573 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-38.yml b/Tests/fixtures/smartphone-38.yml index 1087edfb09..adad58b229 100644 --- a/Tests/fixtures/smartphone-38.yml +++ b/Tests/fixtures/smartphone-38.yml @@ -9328,7 +9328,7 @@ engine_version: 103.0.0.0 device: type: smartphone - brand: RCA Tablets + brand: RCA model: Reno os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-10.yml b/Tests/fixtures/tablet-10.yml index 0288cf8625..2759653dc1 100644 --- a/Tests/fixtures/tablet-10.yml +++ b/Tests/fixtures/tablet-10.yml @@ -2915,7 +2915,7 @@ engine_version: 86.0.4240.75 device: type: tablet - brand: RCA Tablets + brand: RCA model: Viking II 10.0" os_family: Android browser_family: Chrome @@ -6263,7 +6263,7 @@ engine_version: 69.0.3497.86 device: type: tablet - brand: RCA Tablets + brand: RCA model: Galileo Pro 11.5" os_family: Android browser_family: Chrome @@ -6389,7 +6389,7 @@ engine_version: 80.0.3987.132 device: type: tablet - brand: RCA Tablets + brand: RCA model: Voyager III 7.0" os_family: Android browser_family: Chrome @@ -9971,7 +9971,7 @@ engine_version: 77.0.3865.116 device: type: tablet - brand: RCA Tablets + brand: RCA model: Viking Pro 10.0" os_family: Android browser_family: Chrome @@ -9989,7 +9989,7 @@ engine_version: 80.0.3987.87 device: type: tablet - brand: RCA Tablets + brand: RCA model: Viking Pro 10.0" os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-3.yml b/Tests/fixtures/tablet-3.yml index 5191a914f7..88ac88b42e 100644 --- a/Tests/fixtures/tablet-3.yml +++ b/Tests/fixtures/tablet-3.yml @@ -9276,7 +9276,7 @@ engine_version: 83.0.4103.96 device: type: tablet - brand: RCA Tablets + brand: RCA model: Atlas 10.0" os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-4.yml b/Tests/fixtures/tablet-4.yml index 5ff0d2e5f2..2e5974b7ac 100644 --- a/Tests/fixtures/tablet-4.yml +++ b/Tests/fixtures/tablet-4.yml @@ -63,7 +63,7 @@ engine_version: 34.0.1847.114 device: type: tablet - brand: RCA Tablets + brand: RCA model: RCT6077W2 os_family: Android browser_family: Chrome @@ -81,7 +81,7 @@ engine_version: 40.0.2214.109 device: type: tablet - brand: RCA Tablets + brand: RCA model: RCT6773W22 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-6.yml b/Tests/fixtures/tablet-6.yml index ab900a93a0..b957c878a0 100644 --- a/Tests/fixtures/tablet-6.yml +++ b/Tests/fixtures/tablet-6.yml @@ -3486,7 +3486,7 @@ engine_version: 93.0.4577.62 device: type: tablet - brand: RCA Tablets + brand: RCA model: Delta Pro 11.6" os_family: Android browser_family: Chrome @@ -6002,7 +6002,7 @@ engine_version: 94.0.4606.61 device: type: tablet - brand: RCA Tablets + brand: RCA model: Voyager III 7.0" os_family: Android browser_family: Chrome @@ -9204,7 +9204,7 @@ engine_version: 95.0.4638.74 device: type: tablet - brand: RCA Tablets + brand: RCA model: RC7T3G21 os_family: Android browser_family: Chrome @@ -9222,7 +9222,7 @@ engine_version: 95.0.4638.74 device: type: tablet - brand: RCA Tablets + brand: RCA model: Voyager 7.0" os_family: Android browser_family: Chrome @@ -9240,7 +9240,7 @@ engine_version: 95.0.4638.74 device: type: tablet - brand: RCA Tablets + brand: RCA model: RCT6A06Q22 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-7.yml b/Tests/fixtures/tablet-7.yml index 1db618d221..043ad5bea9 100644 --- a/Tests/fixtures/tablet-7.yml +++ b/Tests/fixtures/tablet-7.yml @@ -5517,7 +5517,7 @@ engine_version: 83.0.4103.106 device: type: tablet - brand: RCA Tablets + brand: RCA model: Voyager 7.0" os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-8.yml b/Tests/fixtures/tablet-8.yml index a036c389cc..b4b3ed6e85 100644 --- a/Tests/fixtures/tablet-8.yml +++ b/Tests/fixtures/tablet-8.yml @@ -10015,7 +10015,7 @@ engine_version: 85.0.4183.81 device: type: tablet - brand: RCA Tablets + brand: RCA model: Atlas 10.0" os_family: Android browser_family: Chrome @@ -10033,7 +10033,7 @@ engine_version: 85.0.4183.101 device: type: tablet - brand: RCA Tablets + brand: RCA model: Endeavor 10.0" HD os_family: Android browser_family: Chrome @@ -10051,7 +10051,7 @@ engine_version: 79.0.3945.93 device: type: tablet - brand: RCA Tablets + brand: RCA model: Viking Pro 10.0" os_family: Android browser_family: Chrome @@ -10069,7 +10069,7 @@ engine_version: 77.0.3865.92 device: type: tablet - brand: RCA Tablets + brand: RCA model: Voyager II 7.0" os_family: Android browser_family: Chrome @@ -10087,7 +10087,7 @@ engine_version: 78.0.3904.96 device: type: tablet - brand: RCA Tablets + brand: RCA model: Pro 10 Edition II os_family: Android browser_family: Chrome @@ -10105,7 +10105,7 @@ engine_version: 85.0.4183.127 device: type: tablet - brand: RCA Tablets + brand: RCA model: Voyager III 7.0" os_family: Android browser_family: Chrome @@ -10123,7 +10123,7 @@ engine_version: 85.0.4183.127 device: type: tablet - brand: RCA Tablets + brand: RCA model: Voyager 7.0" os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tv-2.yml b/Tests/fixtures/tv-2.yml index 543b1b2803..c82fdb769a 100644 --- a/Tests/fixtures/tv-2.yml +++ b/Tests/fixtures/tv-2.yml @@ -7483,7 +7483,7 @@ engine_version: 84.0.4147.140 device: type: tv - brand: RCA Tablets + brand: RCA model: "" os_family: GNU/Linux browser_family: Opera diff --git a/Tests/fixtures/tv-3.yml b/Tests/fixtures/tv-3.yml index 167a5f181e..12cfd5eea8 100644 --- a/Tests/fixtures/tv-3.yml +++ b/Tests/fixtures/tv-3.yml @@ -2823,7 +2823,7 @@ engine_version: "534.46" device: type: tv - brand: RCA Tablets + brand: RCA model: "" os_family: Android browser_family: Unknown diff --git a/Tests/fixtures/tv-4.yml b/Tests/fixtures/tv-4.yml index 8ab320f9f4..08ed533b92 100644 --- a/Tests/fixtures/tv-4.yml +++ b/Tests/fixtures/tv-4.yml @@ -6110,7 +6110,7 @@ engine_version: 68.0.3440.106 device: type: tv - brand: RCA Tablets + brand: RCA model: RWOSU6547 os_family: Other Mobile browser_family: Unknown @@ -7478,7 +7478,7 @@ engine_version: 104.0.5112.70 device: type: tv - brand: RCA Tablets + brand: RCA model: RK50UN1 os_family: GNU/Linux browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 569fe32729..81068c6d5d 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -22439,8 +22439,8 @@ ProScan: - regex: 'PLT(777[045]|9774|107[47]|9999)G' model: 'PLT$1G' -# RCA Tablets (RCA) (https://www.rca.com/ https://rca-televisions.com/) -RCA Tablets: +# RCA (RCA Tablets) (https://www.rca.com/ https://rca-televisions.com/) +RCA: regex: 'RCA-OEM[;,]|RC[AT]([^;/]+)(?: Build|[;)]|$)|RWOSU6547|RCA RLTP4028|RLTP5567|RLTP5573|RC7T3G21|DRP(?:29101|2091)' device: 'smartphone' models: diff --git a/regexes/device/shell_tv.yml b/regexes/device/shell_tv.yml index d8fe260a26..e4ac04efad 100644 --- a/regexes/device/shell_tv.yml +++ b/regexes/device/shell_tv.yml @@ -127,8 +127,8 @@ TCL: device: 'tv' model: '' -# RCA Tablets (RCA) (https://www.rca.com/) -RCA Tablets: +# RCA (https://www.rca.com/) +RCA: regex: 'TCL/RCA-' device: 'tv' model: '' diff --git a/regexes/device/televisions.yml b/regexes/device/televisions.yml index 160f584a42..2f9487b72f 100644 --- a/regexes/device/televisions.yml +++ b/regexes/device/televisions.yml @@ -1054,8 +1054,8 @@ Qilive: - regex: '_TV_[A-Z0-9]+_([0-9]{4});' model: 'Smart TV ($1)' -# RCA Tablets (RCA) (https://www.rca.com/ https://rca-televisions.com/) -RCA Tablets: +# RCA (https://www.rca.com/ https://rca-televisions.com/) +RCA: regex: 'RCA;' device: 'tv' models: From dabb61b6114f4f7fafeddafa3e5f39e381168c7d Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Thu, 11 Sep 2025 20:28:16 +0300 Subject: [PATCH 21/77] Raylandz to Raylan --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/smartphone-30.yml | 2 +- regexes/device/mobiles.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index a2b6ab91c1..b5f306202d 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1535,7 +1535,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'RZ' => 'Razer', 'RAZ' => 'RAZZ', '95' => 'Rakuten', - 'RAY' => 'Raylandz', + 'RAY' => 'Raylan', 'RC' => 'RCA', 'RCT' => 'RCT', '2R' => 'Reach Mobiletech', diff --git a/Tests/fixtures/smartphone-30.yml b/Tests/fixtures/smartphone-30.yml index 898c37ed27..e6d5886c42 100644 --- a/Tests/fixtures/smartphone-30.yml +++ b/Tests/fixtures/smartphone-30.yml @@ -10485,7 +10485,7 @@ engine_version: 83.0.4103.106 device: type: smartphone - brand: Raylandz + brand: Raylan model: XPower P6000 os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 81068c6d5d..af3b96daec 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -40728,8 +40728,8 @@ actiMirror: - regex: '(Desk21T-03)' # smart mirror model: '$1' -# Raylandz -Raylandz: +# Raylan (https://www.raylandz.com) +Raylan: regex: 'XPOWER_P6000(?:[);/ ]|$)' device: 'smartphone' models: From b63d5f66cbe0bf20c23d9ca0027b54046ddb498a Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sat, 13 Sep 2025 11:53:14 +0300 Subject: [PATCH 22/77] Play Now to Play --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/tv-3.yml | 2 +- regexes/device/mobiles.yml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index b5f306202d..25a2c100e7 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1461,7 +1461,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'PIR' => 'PIRANHA', 'PIN' => 'PINE', '9P' => 'Planet Computers', - 'PLA' => 'Play Now', + 'PLA' => 'Play', 'PY' => 'Ployer', 'P4' => 'Plum', 'PLU' => 'PlusStyle', diff --git a/Tests/fixtures/tv-3.yml b/Tests/fixtures/tv-3.yml index 12cfd5eea8..5537d80460 100644 --- a/Tests/fixtures/tv-3.yml +++ b/Tests/fixtures/tv-3.yml @@ -261,7 +261,7 @@ version: "20.2" device: type: tv - brand: Play Now + brand: Play model: TV Box 2 os_family: Android browser_family: Unknown diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index af3b96daec..9ce55dec91 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -35854,13 +35854,13 @@ Planet Computers: - regex: '(?:Gemini[_ ]4G)(?:[);/ ]|$)' model: 'Gemini 4G' -# Play Now (https://www.play.pl/) -Play Now: +# Play (https://www.play.pl/, previously "Play Now", but "Now" is name of the service and a set of TV Boxes for the service) +Play: regex: 'Play Now ' device: 'tv' models: - regex: 'PLAY NOW TV BOX 2(?:[);/ ]|$)' - model: 'TV Box 2' + model: 'Now TV Box 2' # Reach Mobiletech (https://www.reachmobile.in/) Reach Mobiletech: From 6632b67655b5dbaf58baf69c853f8ff1bc94f7c2 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sat, 13 Sep 2025 11:54:48 +0300 Subject: [PATCH 23/77] Rhino to Rhino Mobility --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/smartphone-39.yml | 2 +- regexes/device/mobiles.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 25a2c100e7..f107419f8b 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1559,7 +1559,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'REN' => 'Renova', 'RE3' => 'RENSO', 'REP' => 'rephone', - 'RHI' => 'Rhino', + 'RHI' => 'Rhino Mobility', 'RIC' => 'Ricoh', 'RI' => 'Rikomagic', 'RM' => 'Research In Motion', diff --git a/Tests/fixtures/smartphone-39.yml b/Tests/fixtures/smartphone-39.yml index 69f4094dd6..6460673696 100644 --- a/Tests/fixtures/smartphone-39.yml +++ b/Tests/fixtures/smartphone-39.yml @@ -7557,7 +7557,7 @@ engine_version: 126.0.0.0 device: type: smartphone - brand: Rhino + brand: Rhino Mobility model: Pace A1 os_family: Android browser_family: Opera diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 9ce55dec91..41e2aef4e6 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -33193,8 +33193,8 @@ RuggeTech: - regex: '(FieldPad 8)' model: '$1' -# Rhino -Rhino: +# Rhino Mobility (https://rhinomobility.com/) +Rhino Mobility: regex: '(?:PACE A1)(?:[);/ ]|$)' device: 'smartphone' model: 'Pace A1' From 6168165e3e2f1dbc35c4092793be8307b0dedfa1 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sat, 13 Sep 2025 12:04:17 +0300 Subject: [PATCH 24/77] WS to WS Education Electronics --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/tablet-11.yml | 2 +- regexes/device/mobiles.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index f107419f8b..d118bd61e9 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -2174,7 +2174,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'Z4' => 'ZH&K', 'OW' => 'öwn', 'WBF' => 'Webfleet', - 'WSS' => 'WS', + 'WSS' => 'WS Education Electronics', // legacy brands, might be removed in future versions 'WB' => 'Web TV', 'XX' => 'Unknown', diff --git a/Tests/fixtures/tablet-11.yml b/Tests/fixtures/tablet-11.yml index 7fd326b9a9..9eae28aac2 100644 --- a/Tests/fixtures/tablet-11.yml +++ b/Tests/fixtures/tablet-11.yml @@ -4765,7 +4765,7 @@ engine_version: 94.0.4606.85 device: type: tablet - brand: WS + brand: WS Education Electronics model: TD-TP010G-2 os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 41e2aef4e6..5a042ab5f3 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -43803,8 +43803,8 @@ Tuvio: device: 'tv' model: '$1' -# WS or WS(SZ) -WS: +# WS Education Electronics (previously just WS, but "WS Education Electronics" is shown on packages of the tablet) +WS Education Electronics: regex: '(TD-TP010G-2)(?:[);/ ]|$)' device: 'tablet' model: '$1' From 8a532a7e963adb33800b442700c15b2e01e0d66a Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sat, 13 Sep 2025 15:21:01 +0300 Subject: [PATCH 25/77] MAG to MAG InnoVision --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/tv-3.yml | 2 +- Tests/fixtures/tv-5.yml | 2 +- regexes/device/mobiles.yml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index d118bd61e9..6652ec307c 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1130,7 +1130,7 @@ abstract class AbstractDeviceParser extends AbstractParser '92' => 'MAC AUDIO', 'MJ' => 'Majestic', 'FQ' => 'Mafe', - 'MAG' => 'MAG', + 'MAG' => 'MAG InnoVision', 'MA2' => 'MAGCH', '6Y' => 'Magicsee', 'MA4' => 'Magenta', diff --git a/Tests/fixtures/tv-3.yml b/Tests/fixtures/tv-3.yml index 5537d80460..a35fad33a6 100644 --- a/Tests/fixtures/tv-3.yml +++ b/Tests/fixtures/tv-3.yml @@ -3815,7 +3815,7 @@ engine_version: 66.0.3359.158 device: type: tv - brand: MAG + brand: MAG InnoVision model: CRD55-UHD9 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tv-5.yml b/Tests/fixtures/tv-5.yml index 3ca193af43..4c72df8f4f 100644 --- a/Tests/fixtures/tv-5.yml +++ b/Tests/fixtures/tv-5.yml @@ -1075,7 +1075,7 @@ engine_version: 83.0.4103.120 device: type: tv - brand: MAG + brand: MAG InnoVision model: CRD65-UHD11 os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 5a042ab5f3..8406c8ad82 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -43624,8 +43624,8 @@ MAGCH: device: 'tablet' model: '$1' -# MAG -MAG: +# MAG InnoVision (https://en.wikipedia.org/wiki/MAG_InnoVision) +MAG InnoVision: regex: '(CRD55-UHD9|CRD65-UHD11)(?: Build|[);])' device: 'tv' model: '$1' From 7f3b460630bfbcc76d6f307055d96657d99a05d4 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sat, 13 Sep 2025 15:32:19 +0300 Subject: [PATCH 26/77] Paladin to Paladin TV --- Tests/fixtures/tv-1.yml | 2 +- regexes/device/mobiles.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Tests/fixtures/tv-1.yml b/Tests/fixtures/tv-1.yml index 598ab3ffc5..9bcd907a12 100644 --- a/Tests/fixtures/tv-1.yml +++ b/Tests/fixtures/tv-1.yml @@ -2723,7 +2723,7 @@ engine_version: 74.0.3729.186 device: type: tv - brand: Paladin + brand: Paladin TV model: TV Box os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 8406c8ad82..bc546c4bbb 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -35467,8 +35467,8 @@ Pacific Research Alliance: device: 'smartphone' model: 'Armadillo Phone' -# Paladin (https://paladin.com.my/) -Paladin: +# Paladin TV (https://paladin.com.my/) +Paladin TV: regex: 'Paladin TV' device: 'tv' model: 'TV Box' From d3872172866d0cf7a669ac1b78e63375a3baa3a1 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sat, 13 Sep 2025 15:55:05 +0300 Subject: [PATCH 27/77] OCEANIC to Oceanic Solar --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/tv-2.yml | 2 +- regexes/device/televisions.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 6652ec307c..0196835973 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1366,7 +1366,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'OLA' => 'Olax', 'OLK' => 'Olkya', 'OLY' => 'Olympia', - 'OCE' => 'OCEANIC', + 'OCE' => 'Oceanic Solar', 'OLT' => 'OLTO', 'OJ' => 'Ookee', 'OD' => 'Onda', diff --git a/Tests/fixtures/tv-2.yml b/Tests/fixtures/tv-2.yml index c82fdb769a..d8c67f7891 100644 --- a/Tests/fixtures/tv-2.yml +++ b/Tests/fixtures/tv-2.yml @@ -7915,7 +7915,7 @@ engine_version: 53.0.2785.143 device: type: tv - brand: OCEANIC + brand: Oceanic Solar model: Smart TV (2017) os_family: GNU/Linux browser_family: Opera diff --git a/regexes/device/televisions.yml b/regexes/device/televisions.yml index 2f9487b72f..3bb3a58d87 100644 --- a/regexes/device/televisions.yml +++ b/regexes/device/televisions.yml @@ -942,8 +942,8 @@ NORMANDE: - regex: '_TV_[A-Z0-9]+_([0-9]{4});' model: 'Smart TV ($1)' -# OCEANIC (https://www.oceanic.eu/) -OCEANIC: +# Oceanic Solar (Previously "OCEANIC" (https://www.oceanic.eu/), but it does not look like they ever had a Smart TV, unlike Oceanic Solar (now Marcon Solar) had - https://marconsolar.com/product/grid-solar-inverter/ (no idea why they changed the URL to "inverter")) +Oceanic Solar: regex: 'OCEANIC[;,)]' device: 'tv' models: From 3038ea5b6e5e8cf3cf524e5c63194942e5cdf09a Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sat, 13 Sep 2025 15:57:43 +0300 Subject: [PATCH 28/77] Obi to Obi Worldphone --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/smartphone-10.yml | 32 +++++++++++++------------- Tests/fixtures/smartphone-32.yml | 6 ++--- Tests/fixtures/smartphone-34.yml | 2 +- regexes/device/mobiles.yml | 2 +- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 0196835973..dbeab984e3 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1354,7 +1354,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'OT' => 'O2', 'O7' => 'Oale', 'OC' => 'OASYS', - 'OB' => 'Obi', + 'OB' => 'Obi Worldphone', 'OBR' => 'Ober', 'OQ' => 'Meta', 'O1' => 'Odys', diff --git a/Tests/fixtures/smartphone-10.yml b/Tests/fixtures/smartphone-10.yml index 26802cf0d0..da0c1dd8e6 100644 --- a/Tests/fixtures/smartphone-10.yml +++ b/Tests/fixtures/smartphone-10.yml @@ -4879,7 +4879,7 @@ engine_version: "" device: type: smartphone - brand: Obi + brand: Obi Worldphone model: Alligator os_family: Android browser_family: Unknown @@ -4897,7 +4897,7 @@ engine_version: "534.30" device: type: smartphone - brand: Obi + brand: Obi Worldphone model: Boa os_family: Android browser_family: Unknown @@ -4915,7 +4915,7 @@ engine_version: "534.30" device: type: smartphone - brand: Obi + brand: Obi Worldphone model: Boa Plus os_family: Android browser_family: Unknown @@ -4933,7 +4933,7 @@ engine_version: 54.0.2840.90 device: type: smartphone - brand: Obi + brand: Obi Worldphone model: Crane os_family: Android browser_family: Unknown @@ -4951,7 +4951,7 @@ engine_version: "534.30" device: type: smartphone - brand: Obi + brand: Obi Worldphone model: Flacon os_family: Android browser_family: Android Browser @@ -4969,7 +4969,7 @@ engine_version: 61.0.3163.98 device: type: smartphone - brand: Obi + brand: Obi Worldphone model: Flacon os_family: Android browser_family: Chrome @@ -4987,7 +4987,7 @@ engine_version: "534.30" device: type: smartphone - brand: Obi + brand: Obi Worldphone model: Fox os_family: Android browser_family: Unknown @@ -5005,7 +5005,7 @@ engine_version: "534.30" device: type: smartphone - brand: Obi + brand: Obi Worldphone model: Hornbill os_family: Android browser_family: Unknown @@ -5023,7 +5023,7 @@ engine_version: "534.30" device: type: smartphone - brand: Obi + brand: Obi Worldphone model: Leopard os_family: Android browser_family: Unknown @@ -5041,7 +5041,7 @@ engine_version: "528.5" device: type: smartphone - brand: Obi + brand: Obi Worldphone model: Octopus os_family: Android browser_family: Unknown @@ -5059,7 +5059,7 @@ engine_version: 51.0.2704.81 device: type: smartphone - brand: Obi + brand: Obi Worldphone model: Pelican os_family: Android browser_family: Chrome @@ -5077,7 +5077,7 @@ engine_version: "534.30" device: type: smartphone - brand: Obi + brand: Obi Worldphone model: Python os_family: Android browser_family: Unknown @@ -5095,7 +5095,7 @@ engine_version: 51.0.2704.81 device: type: smartphone - brand: Obi + brand: Obi Worldphone model: SJ1.5 os_family: Android browser_family: Chrome @@ -5113,7 +5113,7 @@ engine_version: 63.0.3239.111 device: type: smartphone - brand: Obi + brand: Obi Worldphone model: SJ2.6 os_family: Android browser_family: Chrome @@ -5131,7 +5131,7 @@ engine_version: 58.0.3029.83 device: type: smartphone - brand: Obi + brand: Obi Worldphone model: Skipper os_family: Android browser_family: Chrome @@ -5149,7 +5149,7 @@ engine_version: 30.0.0.0 device: type: smartphone - brand: Obi + brand: Obi Worldphone model: Wolverine os_family: Android browser_family: Unknown diff --git a/Tests/fixtures/smartphone-32.yml b/Tests/fixtures/smartphone-32.yml index 86d9803fc6..50bd9fd517 100644 --- a/Tests/fixtures/smartphone-32.yml +++ b/Tests/fixtures/smartphone-32.yml @@ -301,7 +301,7 @@ engine_version: 84.0.4147.111 device: type: smartphone - brand: Obi + brand: Obi Worldphone model: SJ1.5 os_family: Android browser_family: Chrome @@ -319,7 +319,7 @@ engine_version: 81.0.4044.117 device: type: smartphone - brand: Obi + brand: Obi Worldphone model: SJ2.2 os_family: Android browser_family: Chrome @@ -337,7 +337,7 @@ engine_version: 39.0.2171.93 device: type: smartphone - brand: Obi + brand: Obi Worldphone model: SJ3.2 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-34.yml b/Tests/fixtures/smartphone-34.yml index 3cafe5b561..d6f45fc6a2 100644 --- a/Tests/fixtures/smartphone-34.yml +++ b/Tests/fixtures/smartphone-34.yml @@ -2545,7 +2545,7 @@ engine_version: 87.0.4280.101 device: type: smartphone - brand: Obi + brand: Obi Worldphone model: SF1 os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index bc546c4bbb..2eabe19c10 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -20129,7 +20129,7 @@ Astro (UA): model: '$1' # Obi or Obi Worldphone -Obi: +Obi Worldphone: regex: 'Obi[ _-]|(?:(?:SJ1\.5|SJ2\.6|(? Date: Sat, 13 Sep 2025 15:58:33 +0300 Subject: [PATCH 29/77] OASYS to OASYS Cybernetics --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/peripheral.yml | 2 +- regexes/device/mobiles.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index dbeab984e3..5d79748096 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1353,7 +1353,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'O3' => 'O+', 'OT' => 'O2', 'O7' => 'Oale', - 'OC' => 'OASYS', + 'OC' => 'OASYS Cybernetics', 'OB' => 'Obi Worldphone', 'OBR' => 'Ober', 'OQ' => 'Meta', diff --git a/Tests/fixtures/peripheral.yml b/Tests/fixtures/peripheral.yml index 0375b9885c..dae66ef9f5 100644 --- a/Tests/fixtures/peripheral.yml +++ b/Tests/fixtures/peripheral.yml @@ -157,7 +157,7 @@ engine_version: 83.0.4103.83 device: type: peripheral - brand: OASYS + brand: OASYS Cybernetics model: TEG9300 os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 2eabe19c10..7709cc0f2a 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -37870,8 +37870,8 @@ v-mobile: - regex: 'Vmobile XS Pro(?:[);/ ]|$)' model: 'XS Pro' -# OASYS (oasys.co) -OASYS: +# OASYS Cybernetics (https://www.oasys.co/) +OASYS Cybernetics: regex: '(TEG9300)(?:[);/ ]|$)' device: 'peripheral' model: '$1' From 7076ea2a1a91597c03f888b2f9788bf3ea920b94 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sat, 13 Sep 2025 16:01:24 +0300 Subject: [PATCH 30/77] O+ to O+ USA --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/smartphone-10.yml | 14 +++---- Tests/fixtures/smartphone-32.yml | 58 +++++++++++++------------- Tests/fixtures/tablet-8.yml | 4 +- regexes/device/mobiles.yml | 4 +- 5 files changed, 41 insertions(+), 41 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 5d79748096..fea711a479 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1350,7 +1350,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'NV' => 'Nvidia', 'NY' => 'NYX Mobile', 'NON' => 'N-one', - 'O3' => 'O+', + 'O3' => 'O+ USA', 'OT' => 'O2', 'O7' => 'Oale', 'OC' => 'OASYS Cybernetics', diff --git a/Tests/fixtures/smartphone-10.yml b/Tests/fixtures/smartphone-10.yml index da0c1dd8e6..6401e9dee4 100644 --- a/Tests/fixtures/smartphone-10.yml +++ b/Tests/fixtures/smartphone-10.yml @@ -4717,7 +4717,7 @@ engine_version: "" device: type: smartphone - brand: O+ + brand: O+ USA model: 360 Alpha Plus 2.0 os_family: Android browser_family: Android Browser @@ -4735,7 +4735,7 @@ engine_version: 59.0.3071.125 device: type: smartphone - brand: O+ + brand: O+ USA model: Air os_family: Android browser_family: Chrome @@ -4753,7 +4753,7 @@ engine_version: 68.0.3440.70 device: type: smartphone - brand: O+ + brand: O+ USA model: Crunch os_family: Android browser_family: Chrome @@ -4771,7 +4771,7 @@ engine_version: 37.0.0.0 device: type: smartphone - brand: O+ + brand: O+ USA model: Ultra os_family: Android browser_family: Chrome @@ -4789,7 +4789,7 @@ engine_version: 71.0.3578.99 device: type: smartphone - brand: O+ + brand: O+ USA model: Ultra 2.0 os_family: Android browser_family: Chrome @@ -4807,7 +4807,7 @@ engine_version: 39.0.0.0 device: type: smartphone - brand: O+ + brand: O+ USA model: Upsized os_family: Android browser_family: Chrome @@ -4825,7 +4825,7 @@ engine_version: 63.0.3239.111 device: type: smartphone - brand: O+ + brand: O+ USA model: Venti 4G os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-32.yml b/Tests/fixtures/smartphone-32.yml index 50bd9fd517..65c14a7dc2 100644 --- a/Tests/fixtures/smartphone-32.yml +++ b/Tests/fixtures/smartphone-32.yml @@ -3739,7 +3739,7 @@ engine_version: 81.0.4044.138 device: type: smartphone - brand: O+ + brand: O+ USA model: 8.38z os_family: Android browser_family: Chrome @@ -3757,7 +3757,7 @@ engine_version: 83.0.4103.101 device: type: smartphone - brand: O+ + brand: O+ USA model: "8.97" os_family: Android browser_family: Chrome @@ -4189,7 +4189,7 @@ engine_version: 80.0.3987.162 device: type: smartphone - brand: O+ + brand: O+ USA model: Sonic os_family: Android browser_family: Chrome @@ -4207,7 +4207,7 @@ engine_version: 79.0.3945.136 device: type: smartphone - brand: O+ + brand: O+ USA model: 360 HD 2.0 os_family: Android browser_family: Chrome @@ -4225,7 +4225,7 @@ engine_version: 79.0.3945.116 device: type: smartphone - brand: O+ + brand: O+ USA model: 360 Alpha Plus 2.0 os_family: Android browser_family: Chrome @@ -4243,7 +4243,7 @@ engine_version: 78.0.3904.108 device: type: smartphone - brand: O+ + brand: O+ USA model: Xfinit os_family: Android browser_family: Chrome @@ -4261,7 +4261,7 @@ engine_version: 80.0.3987.132 device: type: smartphone - brand: O+ + brand: O+ USA model: Ultra Lite os_family: Android browser_family: Chrome @@ -4297,7 +4297,7 @@ engine_version: 79.0.3945.93 device: type: smartphone - brand: O+ + brand: O+ USA model: "8.98" os_family: Android browser_family: Chrome @@ -4315,7 +4315,7 @@ engine_version: 80.0.3987.132 device: type: smartphone - brand: O+ + brand: O+ USA model: 8.37y os_family: Android browser_family: Chrome @@ -4333,7 +4333,7 @@ engine_version: 81.0.4044.138 device: type: smartphone - brand: O+ + brand: O+ USA model: EVO 4G os_family: Android browser_family: Chrome @@ -4351,7 +4351,7 @@ engine_version: 79.0.3945.136 device: type: smartphone - brand: O+ + brand: O+ USA model: Grande os_family: Android browser_family: Chrome @@ -4369,7 +4369,7 @@ engine_version: 78.0.3904.96 device: type: smartphone - brand: O+ + brand: O+ USA model: "8.17" os_family: Android browser_family: Chrome @@ -4387,7 +4387,7 @@ engine_version: 30.0.0.0 device: type: smartphone - brand: O+ + brand: O+ USA model: "8.33" os_family: Android browser_family: Chrome @@ -4405,7 +4405,7 @@ engine_version: 71.0.3578.99 device: type: smartphone - brand: O+ + brand: O+ USA model: 8.37z os_family: Android browser_family: Chrome @@ -4423,7 +4423,7 @@ engine_version: 78.0.3904.62 device: type: smartphone - brand: O+ + brand: O+ USA model: "8.38" os_family: Android browser_family: Chrome @@ -4441,7 +4441,7 @@ engine_version: 71.0.3578.99 device: type: smartphone - brand: O+ + brand: O+ USA model: "8.92" os_family: Android browser_family: Chrome @@ -4459,7 +4459,7 @@ engine_version: 79.0.3945.93 device: type: smartphone - brand: O+ + brand: O+ USA model: "8.93" os_family: Android browser_family: Chrome @@ -4477,7 +4477,7 @@ engine_version: 75.0.3770.143 device: type: smartphone - brand: O+ + brand: O+ USA model: "360" os_family: Android browser_family: Chrome @@ -4495,7 +4495,7 @@ engine_version: 74.0.3729.136 device: type: smartphone - brand: O+ + brand: O+ USA model: 360 HD os_family: Android browser_family: Chrome @@ -4513,7 +4513,7 @@ engine_version: 79.0.3945.93 device: type: smartphone - brand: O+ + brand: O+ USA model: 360 Alpha os_family: Android browser_family: Chrome @@ -4531,7 +4531,7 @@ engine_version: 76.0.3809.111 device: type: smartphone - brand: O+ + brand: O+ USA model: 360 Alpha Plus os_family: Android browser_family: Chrome @@ -4549,7 +4549,7 @@ engine_version: "535.19" device: type: smartphone - brand: O+ + brand: O+ USA model: "8.6" os_family: Android browser_family: Chrome @@ -4567,7 +4567,7 @@ engine_version: 51.0.2704.81 device: type: smartphone - brand: O+ + brand: O+ USA model: "8.52" os_family: Android browser_family: Chrome @@ -4585,7 +4585,7 @@ engine_version: "535.19" device: type: smartphone - brand: O+ + brand: O+ USA model: "8.12" os_family: Android browser_family: Chrome @@ -4603,7 +4603,7 @@ engine_version: 42.0.2311.111 device: type: smartphone - brand: O+ + brand: O+ USA model: "8.12" os_family: Android browser_family: Chrome @@ -4621,7 +4621,7 @@ engine_version: "534.30" device: type: smartphone - brand: O+ + brand: O+ USA model: "8.91" os_family: Android browser_family: Android Browser @@ -4639,7 +4639,7 @@ engine_version: "534.30" device: type: smartphone - brand: O+ + brand: O+ USA model: 8.31z os_family: Android browser_family: Android Browser @@ -4657,7 +4657,7 @@ engine_version: "534.30" device: type: smartphone - brand: O+ + brand: O+ USA model: "8.15" os_family: Android browser_family: Android Browser @@ -4675,7 +4675,7 @@ engine_version: 74.0.3729.112 device: type: smartphone - brand: O+ + brand: O+ USA model: Presto 700 LTE os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-8.yml b/Tests/fixtures/tablet-8.yml index b4b3ed6e85..71c84ae091 100644 --- a/Tests/fixtures/tablet-8.yml +++ b/Tests/fixtures/tablet-8.yml @@ -6777,7 +6777,7 @@ engine_version: 72.0.3626.105 device: type: tablet - brand: O+ + brand: O+ USA model: Stream HDTV os_family: Android browser_family: Chrome @@ -6795,7 +6795,7 @@ engine_version: "534.30" device: type: tablet - brand: O+ + brand: O+ USA model: Fab Go os_family: Android browser_family: Android Browser diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 7709cc0f2a..4f741a925a 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -19854,8 +19854,8 @@ Nvidia: model: 'SHIELD Portable' device: 'console' -# O+ (OPlus) -O+: +# O+ USA (OPlus, https://www.facebook.com/OplusUSA/) +O+ USA: regex: 'O\+[ _](Presto 700 LTE|FAB GO|360|8\.(?:3[178]z|[15]2|37y|3[38]|9[12378]|1[75]|6)|Air|Grande|Crunch|Ultra|Xfinit|Upsized|Venti|EVO 4G|Sonic|360[ _]ALPHA[ _]PLUS[ _]2\.0|360[ _]HD[ _]2\.0|Stream HDTV)' device: 'smartphone' models: From b0f780c0921c22f0df09b4c651b23bf5a8536594 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sat, 13 Sep 2025 16:19:37 +0300 Subject: [PATCH 31/77] National to National Electronic Corporation --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/tv.yml | 2 +- regexes/device/mobiles.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index fea711a479..7007cc3228 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1263,7 +1263,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'NEO' => 'neoCore', 'NER' => 'Neoregent', '08' => 'Nabi', - 'N7' => 'National', + 'N7' => 'National Electronic Corporation', 'NC' => 'Navcity', '6N' => 'Navitech', '7V' => 'Navitel', diff --git a/Tests/fixtures/tv.yml b/Tests/fixtures/tv.yml index 75cd6a9624..2b541aa745 100644 --- a/Tests/fixtures/tv.yml +++ b/Tests/fixtures/tv.yml @@ -3325,7 +3325,7 @@ engine_version: 48.0.2542.0 device: type: tv - brand: National + brand: National Electronic Corporation model: NX-32THS100 os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 4f741a925a..d7ae9ef85e 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -33157,8 +33157,8 @@ Kaiomy: device: 'tablet' model: 'KaiCloud $1' -# National -National: +# National Electronic Corporation (previously and technically just "National", but may cause confusion with "National" brand from Panasonic) +National Electronic Corporation: regex: '(NX-32THS100)(?:[);/ ]|$)' device: 'tv' model: '$1' From cd0f0cfe5f2c0106fdb8995f386135cb5df5e50a Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sat, 13 Sep 2025 16:20:17 +0300 Subject: [PATCH 32/77] NASCO to NASCO Electronics --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/smartphone-37.yml | 2 +- Tests/fixtures/tablet-8.yml | 2 +- regexes/device/mobiles.yml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 7007cc3228..7e1870362d 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1270,7 +1270,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'N3' => 'Navon', '7R' => 'NavRoad', 'NAB' => 'NABO', - 'NAS' => 'NASCO', + 'NAS' => 'NASCO Electronics', 'NP' => 'Naomi Phone', 'NAN' => 'Nanho', 'NE' => 'NEC', diff --git a/Tests/fixtures/smartphone-37.yml b/Tests/fixtures/smartphone-37.yml index 611f1dbc14..a6d36eaec1 100644 --- a/Tests/fixtures/smartphone-37.yml +++ b/Tests/fixtures/smartphone-37.yml @@ -6765,7 +6765,7 @@ engine_version: 76.0.3809.132 device: type: smartphone - brand: NASCO + brand: NASCO Electronics model: Snap Pro os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-8.yml b/Tests/fixtures/tablet-8.yml index 71c84ae091..1e5f5f439a 100644 --- a/Tests/fixtures/tablet-8.yml +++ b/Tests/fixtures/tablet-8.yml @@ -6921,7 +6921,7 @@ engine_version: 75.0.3770.143 device: type: tablet - brand: NASCO + brand: NASCO Electronics model: Tango 7 os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index d7ae9ef85e..66d4953a1f 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -41388,8 +41388,8 @@ NINETEC: - regex: 'Platinum 10 G3' model: 'Platinum 10 G3' -# NASCO -NASCO: +# NASCO Electronics +NASCO Electronics: regex: '(?:NASCO (?:TANGO 7)|SNAP_PRO)(?:[);/ ]|$)' device: 'tablet' models: From f77b2a49fdc51da4bd93ad7b9e5e40dcc6557840 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sat, 13 Sep 2025 16:59:59 +0300 Subject: [PATCH 33/77] MStar to MStar Semiconductor --- Tests/fixtures/tv-2.yml | 2 +- Tests/fixtures/tv.yml | 4 ++-- regexes/device/mobiles.yml | 4 ++-- regexes/device/televisions.yml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Tests/fixtures/tv-2.yml b/Tests/fixtures/tv-2.yml index d8c67f7891..1141498ee4 100644 --- a/Tests/fixtures/tv-2.yml +++ b/Tests/fixtures/tv-2.yml @@ -6145,7 +6145,7 @@ engine_version: 48.0.2542.0 device: type: tv - brand: MStar + brand: MStar Semiconductor model: "" os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tv.yml b/Tests/fixtures/tv.yml index 2b541aa745..9daf83f147 100644 --- a/Tests/fixtures/tv.yml +++ b/Tests/fixtures/tv.yml @@ -8705,7 +8705,7 @@ engine_version: 47.0.2526.106 device: type: tv - brand: MStar + brand: MStar Semiconductor model: 2KTV18 os_family: GNU/Linux browser_family: Chrome @@ -8723,7 +8723,7 @@ engine_version: 47.0.2526.106 device: type: tv - brand: MStar + brand: MStar Semiconductor model: 4KTV18 os_family: GNU/Linux browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 66d4953a1f..78d841bfc4 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -32021,8 +32021,8 @@ Lemhoov: - regex: 'Lemhoov[ _-]([^/;]+) Build' model: '$1' -# MStar -MStar: +# MStar Semiconductor +MStar Semiconductor: regex: 'MStar(?:[);/ ]|$)' device: 'tv' model: '' diff --git a/regexes/device/televisions.yml b/regexes/device/televisions.yml index 3bb3a58d87..7aac475d7a 100644 --- a/regexes/device/televisions.yml +++ b/regexes/device/televisions.yml @@ -864,8 +864,8 @@ Miray: - regex: '_TV_[A-Z0-9]+_([0-9]{4});' model: 'Smart TV ($1)' -# MStar -MStar: +# MStar Semiconductor +MStar Semiconductor: regex: 'MStar[;,)]' device: 'tv' models: From 3e9bed8060d1c4d406fcec781ed24fe2054134e6 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sat, 13 Sep 2025 17:27:30 +0300 Subject: [PATCH 34/77] MLS to MLS Innovation --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/phablet.yml | 2 +- Tests/fixtures/smartphone-25.yml | 4 +- Tests/fixtures/smartphone-26.yml | 2 +- Tests/fixtures/smartphone-31.yml | 4 +- Tests/fixtures/smartphone-33.yml | 2 +- Tests/fixtures/smartphone-8.yml | 68 +++++++++++++------------- Tests/fixtures/tablet-3.yml | 36 +++++++------- Tests/fixtures/tablet-6.yml | 2 +- Tests/fixtures/tablet-8.yml | 6 +-- regexes/device/mobiles.yml | 4 +- 11 files changed, 66 insertions(+), 66 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 7e1870362d..ed565859a1 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1211,7 +1211,7 @@ abstract class AbstractDeviceParser extends AbstractParser '1Z' => 'MiXzo', 'MIW' => 'MIWANG', 'ML' => 'MLLED', - 'LS' => 'MLS', + 'LS' => 'MLS Innovation', 'MLA' => 'MLAB', '5H' => 'MMI', '4M' => 'Mobicel', diff --git a/Tests/fixtures/phablet.yml b/Tests/fixtures/phablet.yml index 876b83e915..a2e84bc8b3 100644 --- a/Tests/fixtures/phablet.yml +++ b/Tests/fixtures/phablet.yml @@ -775,7 +775,7 @@ engine_version: 79.0.3945.93 device: type: phablet - brand: MLS + brand: MLS Innovation model: Phab 6.0" os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-25.yml b/Tests/fixtures/smartphone-25.yml index ef268c0314..3a91d421b1 100644 --- a/Tests/fixtures/smartphone-25.yml +++ b/Tests/fixtures/smartphone-25.yml @@ -8187,7 +8187,7 @@ engine_version: 90.0.4430.210 device: type: smartphone - brand: MLS + brand: MLS Innovation model: MX (2019) os_family: Android browser_family: Chrome @@ -8925,7 +8925,7 @@ engine_version: 95.0.4638.74 device: type: smartphone - brand: MLS + brand: MLS Innovation model: Style 4G os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-26.yml b/Tests/fixtures/smartphone-26.yml index fa0506fa6c..59808c709b 100644 --- a/Tests/fixtures/smartphone-26.yml +++ b/Tests/fixtures/smartphone-26.yml @@ -8367,7 +8367,7 @@ engine_version: 93.0.4577.82 device: type: smartphone - brand: MLS + brand: MLS Innovation model: Pop 4G os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-31.yml b/Tests/fixtures/smartphone-31.yml index 18a4509cb9..96c7455f8a 100644 --- a/Tests/fixtures/smartphone-31.yml +++ b/Tests/fixtures/smartphone-31.yml @@ -319,7 +319,7 @@ engine_version: 78.0.3904.108 device: type: smartphone - brand: MLS + brand: MLS Innovation model: D6 4G os_family: Android browser_family: Chrome @@ -337,7 +337,7 @@ engine_version: 85.0.4183.81 device: type: smartphone - brand: MLS + brand: MLS Innovation model: Notch Sense os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-33.yml b/Tests/fixtures/smartphone-33.yml index aa79608b7a..f01fa28a91 100644 --- a/Tests/fixtures/smartphone-33.yml +++ b/Tests/fixtures/smartphone-33.yml @@ -4167,7 +4167,7 @@ engine_version: 80.0.3987.149 device: type: smartphone - brand: MLS + brand: MLS Innovation model: iQF200 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-8.yml b/Tests/fixtures/smartphone-8.yml index be13b12247..fa37d109f2 100644 --- a/Tests/fixtures/smartphone-8.yml +++ b/Tests/fixtures/smartphone-8.yml @@ -7705,7 +7705,7 @@ engine_version: "534.30" device: type: smartphone - brand: MLS + brand: MLS Innovation model: Alu 5.5" os_family: Android browser_family: Unknown @@ -7723,7 +7723,7 @@ engine_version: 77.0.3865.116 device: type: smartphone - brand: MLS + brand: MLS Innovation model: Alu 5.5" os_family: Android browser_family: Chrome @@ -7741,7 +7741,7 @@ engine_version: 57.0.2987.132 device: type: smartphone - brand: MLS + brand: MLS Innovation model: Color 3 4G os_family: Android browser_family: Chrome @@ -7759,7 +7759,7 @@ engine_version: 79.0.3945.93 device: type: smartphone - brand: MLS + brand: MLS Innovation model: Color Fingerprint 4G os_family: Android browser_family: Chrome @@ -7777,7 +7777,7 @@ engine_version: 59.0.3071.125 device: type: smartphone - brand: MLS + brand: MLS Innovation model: Color mini 4G os_family: Android browser_family: Chrome @@ -7795,7 +7795,7 @@ engine_version: 57.0.2987.132 device: type: smartphone - brand: MLS + brand: MLS Innovation model: Diamond 5.2 4G os_family: Android browser_family: Chrome @@ -7813,7 +7813,7 @@ engine_version: 76.0.3809.111 device: type: smartphone - brand: MLS + brand: MLS Innovation model: DX 4G os_family: Android browser_family: Chrome @@ -7829,7 +7829,7 @@ version: 111.1.0.25.152 device: type: smartphone - brand: MLS + brand: MLS Innovation model: DX 4G os_family: Android browser_family: Unknown @@ -7847,7 +7847,7 @@ engine_version: 61.0.3163.98 device: type: smartphone - brand: MLS + brand: MLS Innovation model: Energy 4G os_family: Android browser_family: Chrome @@ -7865,7 +7865,7 @@ engine_version: 61.0.3163.98 device: type: smartphone - brand: MLS + brand: MLS Innovation model: F5 os_family: Android browser_family: Chrome @@ -7883,7 +7883,7 @@ engine_version: "537.36" device: type: smartphone - brand: MLS + brand: MLS Innovation model: Fab 4G os_family: Android browser_family: Android Browser @@ -7901,7 +7901,7 @@ engine_version: 78.0.3904.108 device: type: smartphone - brand: MLS + brand: MLS Innovation model: Flame 4G (2018) os_family: Android browser_family: Chrome @@ -7919,7 +7919,7 @@ engine_version: 80.0.3987.132 device: type: smartphone - brand: MLS + brand: MLS Innovation model: Inspire 4G os_family: Android browser_family: Chrome @@ -7935,7 +7935,7 @@ version: 10.29.0 device: type: smartphone - brand: MLS + brand: MLS Innovation model: iQTalk Aura os_family: Android browser_family: Unknown @@ -7953,7 +7953,7 @@ engine_version: 59.0.3071.125 device: type: smartphone - brand: MLS + brand: MLS Innovation model: iQTalk Color 5.5 4G os_family: Android browser_family: Chrome @@ -7971,7 +7971,7 @@ engine_version: 64.0.3282.137 device: type: smartphone - brand: MLS + brand: MLS Innovation model: iQTalk Flame os_family: Android browser_family: Chrome @@ -7989,7 +7989,7 @@ engine_version: 54.0.2840.68 device: type: smartphone - brand: MLS + brand: MLS Innovation model: iQTalk Onyx os_family: Android browser_family: Chrome @@ -8007,7 +8007,7 @@ engine_version: 53.0.2785.124 device: type: smartphone - brand: MLS + brand: MLS Innovation model: iQTalk Spicy os_family: Android browser_family: Chrome @@ -8025,7 +8025,7 @@ engine_version: "534.30" device: type: smartphone - brand: MLS + brand: MLS Innovation model: iQTalk Titan 4G os_family: Android browser_family: Unknown @@ -8043,7 +8043,7 @@ engine_version: 57.0.2987.132 device: type: smartphone - brand: MLS + brand: MLS Innovation model: iQTalk Twist os_family: Android browser_family: Chrome @@ -8061,7 +8061,7 @@ engine_version: 47.0.2526.76 device: type: smartphone - brand: MLS + brand: MLS Innovation model: iQTalk Verse 4G os_family: Android browser_family: Chrome @@ -8079,7 +8079,7 @@ engine_version: 80.0.3987.132 device: type: smartphone - brand: MLS + brand: MLS Innovation model: Liberal os_family: Android browser_family: Chrome @@ -8097,7 +8097,7 @@ engine_version: "537.36" device: type: smartphone - brand: MLS + brand: MLS Innovation model: More 4G os_family: Android browser_family: Android Browser @@ -8115,7 +8115,7 @@ engine_version: 79.0.3945.93 device: type: smartphone - brand: MLS + brand: MLS Innovation model: MX 4G os_family: Android browser_family: Chrome @@ -8133,7 +8133,7 @@ engine_version: 72.0.3626.121 device: type: smartphone - brand: MLS + brand: MLS Innovation model: Notch Lite os_family: Android browser_family: Chrome @@ -8151,7 +8151,7 @@ engine_version: 59.0.3071.125 device: type: smartphone - brand: MLS + brand: MLS Innovation model: R3 4G os_family: Android browser_family: Chrome @@ -8169,7 +8169,7 @@ engine_version: 81.0.40 device: type: smartphone - brand: MLS + brand: MLS Innovation model: Range 4G os_family: Android browser_family: Chrome @@ -8187,7 +8187,7 @@ engine_version: 79.0.3945.136 device: type: smartphone - brand: MLS + brand: MLS Innovation model: Regal os_family: Android browser_family: Chrome @@ -8205,7 +8205,7 @@ engine_version: 66.0.3359.158 device: type: smartphone - brand: MLS + brand: MLS Innovation model: Ruby 4G os_family: Android browser_family: Chrome @@ -8223,7 +8223,7 @@ engine_version: 60.0.3112.107 device: type: smartphone - brand: MLS + brand: MLS Innovation model: Slice 4G os_family: Android browser_family: Chrome @@ -8241,7 +8241,7 @@ engine_version: 59.0.3071.125 device: type: smartphone - brand: MLS + brand: MLS Innovation model: Status 4G os_family: Android browser_family: Chrome @@ -8259,7 +8259,7 @@ engine_version: 68.0.3440.40 device: type: smartphone - brand: MLS + brand: MLS Innovation model: TOP-S 4G os_family: Android browser_family: Chrome @@ -8277,7 +8277,7 @@ engine_version: 66.0.3359.158 device: type: smartphone - brand: MLS + brand: MLS Innovation model: Trend 4G os_family: Android browser_family: Chrome @@ -8295,7 +8295,7 @@ engine_version: 44.0.2403.119 device: type: smartphone - brand: MLS + brand: MLS Innovation model: Wave 4G os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-3.yml b/Tests/fixtures/tablet-3.yml index 88ac88b42e..86a56b3d9c 100644 --- a/Tests/fixtures/tablet-3.yml +++ b/Tests/fixtures/tablet-3.yml @@ -175,7 +175,7 @@ engine_version: 76.0.3809.132 device: type: tablet - brand: MLS + brand: MLS Innovation model: Alu Plus 4G 10.1" os_family: Android browser_family: Chrome @@ -193,7 +193,7 @@ engine_version: 63.0.3239.111 device: type: tablet - brand: MLS + brand: MLS Innovation model: Angel 3G os_family: Android browser_family: Chrome @@ -211,7 +211,7 @@ engine_version: 79.0.3945.136 device: type: tablet - brand: MLS + brand: MLS Innovation model: Angel 3G (2018) os_family: Android browser_family: Chrome @@ -229,7 +229,7 @@ engine_version: "" device: type: tablet - brand: MLS + brand: MLS Innovation model: Brace 2018 4G os_family: Android browser_family: Android Browser @@ -247,7 +247,7 @@ engine_version: 46.0.2490.76 device: type: tablet - brand: MLS + brand: MLS Innovation model: iQTab 10 os_family: Android browser_family: Chrome @@ -265,7 +265,7 @@ engine_version: 49.0.2623.91 device: type: tablet - brand: MLS + brand: MLS Innovation model: iQTab 10 os_family: Android browser_family: Chrome @@ -283,7 +283,7 @@ engine_version: 59.0.3071.125 device: type: tablet - brand: MLS + brand: MLS Innovation model: iQTab Action 4G os_family: Android browser_family: Chrome @@ -301,7 +301,7 @@ engine_version: 67.0.3396.87 device: type: tablet - brand: MLS + brand: MLS Innovation model: iQTab Brave 3G os_family: Android browser_family: Chrome @@ -319,7 +319,7 @@ engine_version: 78.0.3904.108 device: type: tablet - brand: MLS + brand: MLS Innovation model: iQTab Brave 3G os_family: Android browser_family: Chrome @@ -337,7 +337,7 @@ engine_version: 78.0.3904.90 device: type: tablet - brand: MLS + brand: MLS Innovation model: iQTab Care 8.0" os_family: Android browser_family: Chrome @@ -355,7 +355,7 @@ engine_version: 72.0.3626.105 device: type: tablet - brand: MLS + brand: MLS Innovation model: iQTab Ideal 8.0" os_family: Android browser_family: Chrome @@ -373,7 +373,7 @@ engine_version: "" device: type: tablet - brand: MLS + brand: MLS Innovation model: iQTab Master os_family: Android browser_family: Android Browser @@ -391,7 +391,7 @@ engine_version: 61.0.3163.98 device: type: tablet - brand: MLS + brand: MLS Innovation model: iQTab Novel 3G os_family: Android browser_family: Chrome @@ -409,7 +409,7 @@ engine_version: "" device: type: tablet - brand: MLS + brand: MLS Innovation model: iQTab Rose os_family: Android browser_family: Android Browser @@ -427,7 +427,7 @@ engine_version: 60.0.3112 device: type: tablet - brand: MLS + brand: MLS Innovation model: Jet 3G os_family: Android browser_family: Chrome @@ -445,7 +445,7 @@ engine_version: 76.0.3809.111 device: type: tablet - brand: MLS + brand: MLS Innovation model: Level 4G os_family: Android browser_family: Chrome @@ -463,7 +463,7 @@ engine_version: 78.0.3904.96 device: type: tablet - brand: MLS + brand: MLS Innovation model: Life 10.1" os_family: Android browser_family: Chrome @@ -481,7 +481,7 @@ engine_version: 77.0.3865.92 device: type: tablet - brand: MLS + brand: MLS Innovation model: Vista 4G os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-6.yml b/Tests/fixtures/tablet-6.yml index b957c878a0..cc72abd0e2 100644 --- a/Tests/fixtures/tablet-6.yml +++ b/Tests/fixtures/tablet-6.yml @@ -8988,7 +8988,7 @@ engine_version: 95.0.4638.74 device: type: tablet - brand: MLS + brand: MLS Innovation model: Space S 4G os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-8.yml b/Tests/fixtures/tablet-8.yml index 1e5f5f439a..ee178a8201 100644 --- a/Tests/fixtures/tablet-8.yml +++ b/Tests/fixtures/tablet-8.yml @@ -1201,7 +1201,7 @@ engine_version: 87.0.4280.141 device: type: tablet - brand: MLS + brand: MLS Innovation model: Vital 4G os_family: Android browser_family: Chrome @@ -1219,7 +1219,7 @@ engine_version: 87.0.4280.101 device: type: tablet - brand: MLS + brand: MLS Innovation model: Trophy 4G os_family: Android browser_family: Chrome @@ -9367,7 +9367,7 @@ engine_version: 79.0.3945.93 device: type: tablet - brand: MLS + brand: MLS Innovation model: T8 Fingerprint 4G os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 78d841bfc4..9423db817d 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -30583,8 +30583,8 @@ Vivax: device: 'tv' model: '$1' -# MLS or Making Life Simple (mlsinnovation.com) -MLS: +# MLS Innovation or Making Life Simple (mlsinnovation.com - this is now a gambling site) +MLS Innovation: regex: 'IQ(?:0705|L550|1017|1010w?|1012N?|1019N|1025|1060M|1380|1401|1436|1452a|1453|1470|1502a|1511|155[23]|1568|1570|1805N|180[68]|1810B_M|1832|1850|1890|5017|L626|9610|181011N|A27X_E|E[12]00|EL41|G550|GW516|L30|L5[01]|M801|M1001|N700|P50|R300|S300|S801|S1001|W503|W511T|W553N?|W60[38]|W626|M960|D10S|D700|9013_4N|F 200|T800)(?:[);/ ]|$)' device: 'smartphone' models: From d45fd2c9d8279ccc8d5ccf836810c2a72ebf8755 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sat, 13 Sep 2025 17:31:24 +0300 Subject: [PATCH 35/77] MIXC to The MixC --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/smartphone-9.yml | 12 ++++++------ regexes/device/mobiles.yml | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index ed565859a1..bfb1f50cfe 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1206,7 +1206,7 @@ abstract class AbstractDeviceParser extends AbstractParser '8M' => 'Mito', 'MT' => 'Mitsubishi', '0Y' => 'Mitsui', - 'M5' => 'MIXC', + 'M5' => 'The MixC', '2D' => 'MIVO', '1Z' => 'MiXzo', 'MIW' => 'MIWANG', diff --git a/Tests/fixtures/smartphone-9.yml b/Tests/fixtures/smartphone-9.yml index 0ecffaeb05..ab583683fc 100644 --- a/Tests/fixtures/smartphone-9.yml +++ b/Tests/fixtures/smartphone-9.yml @@ -1367,7 +1367,7 @@ engine_version: "534.30" device: type: smartphone - brand: MIXC + brand: The MixC model: G7106 os_family: Android browser_family: Android Browser @@ -1385,7 +1385,7 @@ engine_version: "" device: type: smartphone - brand: MIXC + brand: The MixC model: G7106 os_family: Android browser_family: Unknown @@ -1403,7 +1403,7 @@ engine_version: "533.1" device: type: smartphone - brand: MIXC + brand: The MixC model: G7108 os_family: Android browser_family: Android Browser @@ -1421,7 +1421,7 @@ engine_version: "534.30" device: type: smartphone - brand: MIXC + brand: The MixC model: M20 os_family: Android browser_family: Android Browser @@ -1439,7 +1439,7 @@ engine_version: "" device: type: smartphone - brand: MIXC + brand: The MixC model: M20 os_family: Android browser_family: Android Browser @@ -1457,7 +1457,7 @@ engine_version: "" device: type: smartphone - brand: MIXC + brand: The MixC model: M35 os_family: Android browser_family: Android Browser diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 9423db817d..abe5d46969 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -17967,8 +17967,8 @@ Mitsubishi: - regex: 'portalmmm/[12]\.0 (M[a-z0-9]+)' model: '$1' -# MIXC -MIXC: +# The MixC +The MixC: regex: '(? Date: Sat, 13 Sep 2025 17:37:38 +0300 Subject: [PATCH 36/77] Mito to MITO Electronic --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/smartphone-20.yml | 8 ++-- Tests/fixtures/smartphone-22.yml | 4 +- Tests/fixtures/smartphone-23.yml | 4 +- Tests/fixtures/smartphone-26.yml | 8 ++-- Tests/fixtures/smartphone-32.yml | 2 +- Tests/fixtures/smartphone-40.yml | 2 +- Tests/fixtures/smartphone.yml | 56 +++++++++++++------------- Tests/fixtures/tablet-10.yml | 2 +- Tests/fixtures/tablet-5.yml | 8 ++-- Tests/fixtures/tablet-6.yml | 10 ++--- Tests/fixtures/tablet.yml | 12 +++--- Tests/fixtures/tv-1.yml | 2 +- regexes/device/mobiles.yml | 4 +- 14 files changed, 62 insertions(+), 62 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index bfb1f50cfe..1ce445936b 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1203,7 +1203,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'X7' => 'Mione', 'M7' => 'Miray', 'MIT' => 'Mitchell & Brown', - '8M' => 'Mito', + '8M' => 'MITO Electronic', 'MT' => 'Mitsubishi', '0Y' => 'Mitsui', 'M5' => 'The MixC', diff --git a/Tests/fixtures/smartphone-20.yml b/Tests/fixtures/smartphone-20.yml index c1fbfab29a..302fee5748 100644 --- a/Tests/fixtures/smartphone-20.yml +++ b/Tests/fixtures/smartphone-20.yml @@ -4105,7 +4105,7 @@ engine_version: 85.0.4183.101 device: type: smartphone - brand: Mito + brand: MITO Electronic model: A19 2GB os_family: Android browser_family: Chrome @@ -4123,7 +4123,7 @@ engine_version: 85.0.4183.127 device: type: smartphone - brand: Mito + brand: MITO Electronic model: A19 1GB os_family: Android browser_family: Chrome @@ -4141,7 +4141,7 @@ engine_version: 84.0.4147.89 device: type: smartphone - brand: Mito + brand: MITO Electronic model: A21 os_family: Android browser_family: Chrome @@ -4159,7 +4159,7 @@ engine_version: 84.0.4147.89 device: type: smartphone - brand: Mito + brand: MITO Electronic model: A17 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-22.yml b/Tests/fixtures/smartphone-22.yml index 044f66835d..1efb1a8a8a 100644 --- a/Tests/fixtures/smartphone-22.yml +++ b/Tests/fixtures/smartphone-22.yml @@ -4971,7 +4971,7 @@ engine_version: 84.0.4147.111 device: type: smartphone - brand: Mito + brand: MITO Electronic model: A35 os_family: Android browser_family: Chrome @@ -9039,7 +9039,7 @@ engine_version: 87.0.4280.86 device: type: smartphone - brand: Mito + brand: MITO Electronic model: A37 Z1 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-23.yml b/Tests/fixtures/smartphone-23.yml index 24a621338d..7b5e08a75f 100644 --- a/Tests/fixtures/smartphone-23.yml +++ b/Tests/fixtures/smartphone-23.yml @@ -1669,7 +1669,7 @@ engine_version: 78.0.3904.90 device: type: smartphone - brand: Mito + brand: MITO Electronic model: A38 os_family: Android browser_family: Chrome @@ -1687,7 +1687,7 @@ engine_version: 77.0.3865.116 device: type: smartphone - brand: Mito + brand: MITO Electronic model: A80 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-26.yml b/Tests/fixtures/smartphone-26.yml index 59808c709b..1c00b519e9 100644 --- a/Tests/fixtures/smartphone-26.yml +++ b/Tests/fixtures/smartphone-26.yml @@ -5311,7 +5311,7 @@ engine_version: 84.0.4147.89 device: type: smartphone - brand: Mito + brand: MITO Electronic model: A37 Z1 Plus os_family: Android browser_family: Chrome @@ -5329,7 +5329,7 @@ engine_version: 83.0.4103.106 device: type: smartphone - brand: Mito + brand: MITO Electronic model: A36 W1 os_family: Android browser_family: Chrome @@ -5365,7 +5365,7 @@ engine_version: 78.0.3904.108 device: type: smartphone - brand: Mito + brand: MITO Electronic model: A77 os_family: Android browser_family: Chrome @@ -5383,7 +5383,7 @@ engine_version: 73.0.3683.90 device: type: smartphone - brand: Mito + brand: MITO Electronic model: A900 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-32.yml b/Tests/fixtures/smartphone-32.yml index 65c14a7dc2..57e852a6e4 100644 --- a/Tests/fixtures/smartphone-32.yml +++ b/Tests/fixtures/smartphone-32.yml @@ -9427,7 +9427,7 @@ engine_version: "534.30" device: type: smartphone - brand: Mito + brand: MITO Electronic model: A880 os_family: Android browser_family: Unknown diff --git a/Tests/fixtures/smartphone-40.yml b/Tests/fixtures/smartphone-40.yml index 35b5256a15..b1c10a181b 100644 --- a/Tests/fixtures/smartphone-40.yml +++ b/Tests/fixtures/smartphone-40.yml @@ -2479,7 +2479,7 @@ engine_version: 122.0.6261.447 device: type: smartphone - brand: Mito + brand: MITO Electronic model: A67 os_family: Android browser_family: Unknown diff --git a/Tests/fixtures/smartphone.yml b/Tests/fixtures/smartphone.yml index 91163fa844..93db9b1ee3 100644 --- a/Tests/fixtures/smartphone.yml +++ b/Tests/fixtures/smartphone.yml @@ -4567,7 +4567,7 @@ engine_version: "" device: type: smartphone - brand: Mito + brand: MITO Electronic model: "311" os_family: Android browser_family: Android Browser @@ -4585,7 +4585,7 @@ engine_version: "" device: type: smartphone - brand: Mito + brand: MITO Electronic model: A10 os_family: Android browser_family: Android Browser @@ -4603,7 +4603,7 @@ engine_version: 62.0.3202.84 device: type: smartphone - brand: Mito + brand: MITO Electronic model: A16 os_family: Android browser_family: Chrome @@ -4621,7 +4621,7 @@ engine_version: "" device: type: smartphone - brand: Mito + brand: MITO Electronic model: A18 os_family: Android browser_family: Android Browser @@ -4639,7 +4639,7 @@ engine_version: "" device: type: smartphone - brand: Mito + brand: MITO Electronic model: A180 os_family: Android browser_family: Android Browser @@ -4657,7 +4657,7 @@ engine_version: 39.0.0.0 device: type: smartphone - brand: Mito + brand: MITO Electronic model: A230 os_family: Android browser_family: Chrome @@ -4675,7 +4675,7 @@ engine_version: "" device: type: smartphone - brand: Mito + brand: MITO Electronic model: A260 os_family: Android browser_family: Android Browser @@ -4693,7 +4693,7 @@ engine_version: "" device: type: smartphone - brand: Mito + brand: MITO Electronic model: A30 os_family: Android browser_family: Android Browser @@ -4711,7 +4711,7 @@ engine_version: "" device: type: smartphone - brand: Mito + brand: MITO Electronic model: A310 os_family: Android browser_family: Android Browser @@ -4729,7 +4729,7 @@ engine_version: "" device: type: smartphone - brand: Mito + brand: MITO Electronic model: A313 os_family: Android browser_family: Android Browser @@ -4747,7 +4747,7 @@ engine_version: "534.30" device: type: smartphone - brand: Mito + brand: MITO Electronic model: A322 os_family: Android browser_family: Android Browser @@ -4765,7 +4765,7 @@ engine_version: "" device: type: smartphone - brand: Mito + brand: MITO Electronic model: A33 os_family: Android browser_family: Android Browser @@ -4783,7 +4783,7 @@ engine_version: "" device: type: smartphone - brand: Mito + brand: MITO Electronic model: A330 os_family: Android browser_family: Android Browser @@ -4801,7 +4801,7 @@ engine_version: "" device: type: smartphone - brand: Mito + brand: MITO Electronic model: A350 os_family: Android browser_family: Android Browser @@ -4819,7 +4819,7 @@ engine_version: "" device: type: smartphone - brand: Mito + brand: MITO Electronic model: A360 os_family: Android browser_family: Android Browser @@ -4837,7 +4837,7 @@ engine_version: 76.0.3809.132 device: type: smartphone - brand: Mito + brand: MITO Electronic model: A39 os_family: Android browser_family: Chrome @@ -4855,7 +4855,7 @@ engine_version: "" device: type: smartphone - brand: Mito + brand: MITO Electronic model: A50 os_family: Android browser_family: Android Browser @@ -4873,7 +4873,7 @@ engine_version: "" device: type: smartphone - brand: Mito + brand: MITO Electronic model: A55 os_family: Android browser_family: Android Browser @@ -4891,7 +4891,7 @@ engine_version: "" device: type: smartphone - brand: Mito + brand: MITO Electronic model: A550 os_family: Android browser_family: Android Browser @@ -4909,7 +4909,7 @@ engine_version: "" device: type: smartphone - brand: Mito + brand: MITO Electronic model: A60 os_family: Android browser_family: Android Browser @@ -4927,7 +4927,7 @@ engine_version: "" device: type: smartphone - brand: Mito + brand: MITO Electronic model: A68 os_family: Android browser_family: Android Browser @@ -4945,7 +4945,7 @@ engine_version: "" device: type: smartphone - brand: Mito + brand: MITO Electronic model: A69 os_family: Android browser_family: Android Browser @@ -4963,7 +4963,7 @@ engine_version: "" device: type: smartphone - brand: Mito + brand: MITO Electronic model: A72 os_family: Android browser_family: Android Browser @@ -4981,7 +4981,7 @@ engine_version: "" device: type: smartphone - brand: Mito + brand: MITO Electronic model: A73 os_family: Android browser_family: Android Browser @@ -4999,7 +4999,7 @@ engine_version: "" device: type: smartphone - brand: Mito + brand: MITO Electronic model: A75 os_family: Android browser_family: Android Browser @@ -5017,7 +5017,7 @@ engine_version: "" device: type: smartphone - brand: Mito + brand: MITO Electronic model: A810 os_family: Android browser_family: Android Browser @@ -5035,7 +5035,7 @@ engine_version: "" device: type: smartphone - brand: Mito + brand: MITO Electronic model: A82 os_family: Android browser_family: Android Browser @@ -5053,7 +5053,7 @@ engine_version: "" device: type: smartphone - brand: Mito + brand: MITO Electronic model: A950 os_family: Android browser_family: Android Browser diff --git a/Tests/fixtures/tablet-10.yml b/Tests/fixtures/tablet-10.yml index 2759653dc1..e21b5ed8e1 100644 --- a/Tests/fixtures/tablet-10.yml +++ b/Tests/fixtures/tablet-10.yml @@ -9737,7 +9737,7 @@ engine_version: 77.0.3865.92 device: type: tablet - brand: Mito + brand: MITO Electronic model: T8 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-5.yml b/Tests/fixtures/tablet-5.yml index d7c9e8e395..bc8a294207 100644 --- a/Tests/fixtures/tablet-5.yml +++ b/Tests/fixtures/tablet-5.yml @@ -5699,7 +5699,7 @@ engine_version: 81.0.4044.111 device: type: tablet - brand: Mito + brand: MITO Electronic model: T71 os_family: Android browser_family: Chrome @@ -5717,7 +5717,7 @@ engine_version: 74.0.3729.157 device: type: tablet - brand: Mito + brand: MITO Electronic model: T15 os_family: Android browser_family: Chrome @@ -5735,7 +5735,7 @@ engine_version: 80.0.3987.162 device: type: tablet - brand: Mito + brand: MITO Electronic model: T65 os_family: Android browser_family: Chrome @@ -5753,7 +5753,7 @@ engine_version: 81.0.4044.138 device: type: tablet - brand: Mito + brand: MITO Electronic model: T89 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-6.yml b/Tests/fixtures/tablet-6.yml index cc72abd0e2..ac77a8d75e 100644 --- a/Tests/fixtures/tablet-6.yml +++ b/Tests/fixtures/tablet-6.yml @@ -2406,7 +2406,7 @@ engine_version: 83.0.4103.106 device: type: tablet - brand: Mito + brand: MITO Electronic model: T85 os_family: Android browser_family: Chrome @@ -2424,7 +2424,7 @@ engine_version: 76.0.3809.89 device: type: tablet - brand: Mito + brand: MITO Electronic model: T75 os_family: Android browser_family: Chrome @@ -2442,7 +2442,7 @@ engine_version: 79.0.3945.93 device: type: tablet - brand: Mito + brand: MITO Electronic model: T81 os_family: Android browser_family: Chrome @@ -2460,7 +2460,7 @@ engine_version: 76.0.3809.132 device: type: tablet - brand: Mito + brand: MITO Electronic model: T61 os_family: Android browser_family: Chrome @@ -2478,7 +2478,7 @@ engine_version: 81.0.4044.111 device: type: tablet - brand: Mito + brand: MITO Electronic model: T59 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet.yml b/Tests/fixtures/tablet.yml index f4143c4fa2..de1f0f92b4 100644 --- a/Tests/fixtures/tablet.yml +++ b/Tests/fixtures/tablet.yml @@ -3613,7 +3613,7 @@ engine_version: "" device: type: tablet - brand: Mito + brand: MITO Electronic model: T10 os_family: Android browser_family: Android Browser @@ -3631,7 +3631,7 @@ engine_version: "" device: type: tablet - brand: Mito + brand: MITO Electronic model: t300 os_family: Android browser_family: Android Browser @@ -3649,7 +3649,7 @@ engine_version: "" device: type: tablet - brand: Mito + brand: MITO Electronic model: T330 os_family: Android browser_family: Android Browser @@ -3667,7 +3667,7 @@ engine_version: "" device: type: tablet - brand: Mito + brand: MITO Electronic model: T35 os_family: Android browser_family: Android Browser @@ -3685,7 +3685,7 @@ engine_version: "" device: type: tablet - brand: Mito + brand: MITO Electronic model: t510 os_family: Android browser_family: Android Browser @@ -3703,7 +3703,7 @@ engine_version: "" device: type: tablet - brand: Mito + brand: MITO Electronic model: T888 os_family: Android browser_family: Android Browser diff --git a/Tests/fixtures/tv-1.yml b/Tests/fixtures/tv-1.yml index 9bcd907a12..ccd9e8ad54 100644 --- a/Tests/fixtures/tv-1.yml +++ b/Tests/fixtures/tv-1.yml @@ -2411,7 +2411,7 @@ engine_version: 69.0.3497.91 device: type: tv - brand: Mito + brand: MITO Electronic model: "3255" os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index abe5d46969..6d890828b1 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -33635,8 +33635,8 @@ VKworld: - regex: 'VK(700[0X]|6050|6735|700)(?:[);/ ]|$)' model: 'VK$1' -# Mito (mitomobile.com) -Mito: +# MITO Electronic (https://mito.co.id/, previously "Mito", but may be confused with Mito Corporation, which is separate) +MITO Electronic: regex: 'MITO[- _]' device: 'smartphone' models: From 7e1c384bd98a48cb64006da8c5a7a2ced6fe6e12 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sat, 13 Sep 2025 17:40:03 +0300 Subject: [PATCH 37/77] Mint to MINT Connect --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/smartphone-33.yml | 2 +- Tests/fixtures/smartphone-34.yml | 4 ++-- Tests/fixtures/smartphone-36.yml | 6 +++--- regexes/device/mobiles.yml | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 1ce445936b..d677544868 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1196,7 +1196,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'MIG' => 'Mightier', '1X' => 'Minix', 'OM' => 'Mintt', - 'MIN' => 'Mint', + 'MIN' => 'MINT Connect', 'MO' => 'Mio', 'MOD' => 'Moondrop', 'MOR' => 'MORTAL', diff --git a/Tests/fixtures/smartphone-33.yml b/Tests/fixtures/smartphone-33.yml index f01fa28a91..44c71f5f3a 100644 --- a/Tests/fixtures/smartphone-33.yml +++ b/Tests/fixtures/smartphone-33.yml @@ -5733,7 +5733,7 @@ engine_version: 79.0.3945.93 device: type: smartphone - brand: Mint + brand: MINT Connect model: Pearl Neo os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-34.yml b/Tests/fixtures/smartphone-34.yml index d6f45fc6a2..aa0d8c6fb4 100644 --- a/Tests/fixtures/smartphone-34.yml +++ b/Tests/fixtures/smartphone-34.yml @@ -9139,7 +9139,7 @@ engine_version: 75.0.3770.101 device: type: smartphone - brand: Mint + brand: MINT Connect model: Clover os_family: Android browser_family: Chrome @@ -9157,7 +9157,7 @@ engine_version: 80.0.3987.87 device: type: smartphone - brand: Mint + brand: MINT Connect model: Clover os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-36.yml b/Tests/fixtures/smartphone-36.yml index 172404c785..fcab798efb 100644 --- a/Tests/fixtures/smartphone-36.yml +++ b/Tests/fixtures/smartphone-36.yml @@ -5981,7 +5981,7 @@ engine_version: 60.0.3112.116 device: type: smartphone - brand: Mint + brand: MINT Connect model: Emerald os_family: Android browser_family: Opera @@ -9053,7 +9053,7 @@ engine_version: 96.0.4664.45 device: type: smartphone - brand: Mint + brand: MINT Connect model: VirGo os_family: Android browser_family: Chrome @@ -9071,7 +9071,7 @@ engine_version: 77.0.3865.92 device: type: smartphone - brand: Mint + brand: MINT Connect model: Orion os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 6d890828b1..72f2b3d738 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -36396,8 +36396,8 @@ Artizlee: device: 'smartphone' model: 'S9' -# Mint or Mint Connect -Mint: +# Mint or Mint Connect (https://twitter.com/MINTConnectSA or https://www.instagram.com/mintconnect/?hl=en) +MINT Connect: regex: '(?:Pearl_Neo|M4CRD?|Emerald_M55CR|Mint[ _](?:VirGo|Orion))(?:[);/ ]|$)' device: 'smartphone' models: From e5c4e03cc375ab3c1ec593858a675d9d651cebfb Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sat, 13 Sep 2025 18:21:57 +0300 Subject: [PATCH 38/77] MDC Store to MDC --- Tests/fixtures/smartphone-2.yml | 2 +- Tests/fixtures/smartphone-30.yml | 4 ++-- Tests/fixtures/smartphone-8.yml | 4 ++-- regexes/device/mobiles.yml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Tests/fixtures/smartphone-2.yml b/Tests/fixtures/smartphone-2.yml index 4b3526b2c3..cfd693d9ec 100644 --- a/Tests/fixtures/smartphone-2.yml +++ b/Tests/fixtures/smartphone-2.yml @@ -9534,7 +9534,7 @@ engine_version: 87.0.4280.101 device: type: smartphone - brand: MDC Store + brand: MDC model: Prime S os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-30.yml b/Tests/fixtures/smartphone-30.yml index e6d5886c42..4ea8eca8b3 100644 --- a/Tests/fixtures/smartphone-30.yml +++ b/Tests/fixtures/smartphone-30.yml @@ -3087,7 +3087,7 @@ engine_version: 100.0.4896.127 device: type: smartphone - brand: MDC Store + brand: MDC model: Nova Pro os_family: Android browser_family: Chrome @@ -7389,7 +7389,7 @@ engine_version: 75.0.3770.143 device: type: smartphone - brand: MDC Store + brand: MDC model: Grand Pro os_family: Android browser_family: Unknown diff --git a/Tests/fixtures/smartphone-8.yml b/Tests/fixtures/smartphone-8.yml index fa37d109f2..18d5f2dcc3 100644 --- a/Tests/fixtures/smartphone-8.yml +++ b/Tests/fixtures/smartphone-8.yml @@ -9375,7 +9375,7 @@ engine_version: 91.0.4472.120 device: type: smartphone - brand: MDC Store + brand: MDC model: M300 4G os_family: Android browser_family: Chrome @@ -9393,7 +9393,7 @@ engine_version: 91.0.4472.164 device: type: smartphone - brand: MDC Store + brand: MDC model: M5 os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 72f2b3d738..08163f49ad 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -35229,8 +35229,8 @@ MAXVI: device: 'feature phone' model: '$1' -# MDC Store (http://mdc.store/ or https://www.facebook.com/mdcmobileuzbekistan/) -MDC Store: +# MDC (http://mdc.store/ or https://www.facebook.com/mdcmobileuzbekistan/) +MDC: regex: '(?:Prime_S|M300 4G|MDC M5|Nova Pro|Grand Pro)(?:[);/ ]|$)' device: 'smartphone' models: From 9251dd65ecd8b55bebe183bdce0eebb7b18e41c8 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sat, 13 Sep 2025 18:23:06 +0300 Subject: [PATCH 39/77] MBI to MBI International --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/smartphone-30.yml | 2 +- regexes/device/mobiles.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index d677544868..717cd933a2 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1163,7 +1163,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'MAU' => 'Maunfeld', 'MCL' => 'McLaut', '28' => 'MBOX', - 'FK' => 'MBI', + 'FK' => 'MBI International', 'MBK' => 'MBK', '3D' => 'MDC Store', '1Y' => 'MDTV', diff --git a/Tests/fixtures/smartphone-30.yml b/Tests/fixtures/smartphone-30.yml index 4ea8eca8b3..87fdd66c9a 100644 --- a/Tests/fixtures/smartphone-30.yml +++ b/Tests/fixtures/smartphone-30.yml @@ -1647,7 +1647,7 @@ engine_version: 57.0.2987.132 device: type: smartphone - brand: MBI + brand: MBI International model: R7 os_family: Android browser_family: Unknown diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 08163f49ad..1b974fe296 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -40418,7 +40418,7 @@ MBK: model: '$1' # MBI International -MBI: +MBI International: regex: 'MBI[_ ](R7)(?:[);/ ]|$)' device: 'smartphone' model: '$1' From c3cc57a8d60515a0953df4a04e126c3fe3c4acb5 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sat, 13 Sep 2025 18:27:21 +0300 Subject: [PATCH 40/77] MAXX to TJ Maxx --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/tablet-7.yml | 2 +- regexes/device/mobiles.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 717cd933a2..b565e4d1f1 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1155,7 +1155,6 @@ abstract class AbstractDeviceParser extends AbstractParser '6X' => 'Maxtron', '0D' => 'MAXVI', 'MAX' => 'Maxwell', - 'XZ' => 'MAXX', 'MW' => 'Maxwest', 'M0' => 'Maze', 'YM' => 'Maze Speed', @@ -1839,6 +1838,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'YV' => 'TiVo', 'TIV' => 'Tivax', 'TIB' => 'Tibuta', + 'XZ' => 'TJ Maxx', 'Y3' => 'TOKYO', 'TOX' => 'TOX', 'T1' => 'Tolino', diff --git a/Tests/fixtures/tablet-7.yml b/Tests/fixtures/tablet-7.yml index 043ad5bea9..95c111a781 100644 --- a/Tests/fixtures/tablet-7.yml +++ b/Tests/fixtures/tablet-7.yml @@ -2081,7 +2081,7 @@ engine_version: 78.0.3904.108 device: type: tablet - brand: MAXX + brand: TJ Maxx model: T1270G os_family: Android browser_family: Opera diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 1b974fe296..e66088d541 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -40216,8 +40216,8 @@ Airtel: - regex: 'Imagine(?:[);/ ]|$)' model: 'Imagine' -# MAXX -MAXX: +# TJ Maxx (previously MAXX, but based on logo in some ads (for example https://vk.com/wall-29511580_13773), it is part of TJ Maxx brand) +TJ Maxx: regex: '(T1270G)(?:[);/ ]|$)' device: 'tablet' model: '$1' From 1822a25b08add427c12efe3b70c220d470cca53d Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sat, 13 Sep 2025 18:40:14 +0300 Subject: [PATCH 41/77] Marshal to Marshal Electronic --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/smartphone-32.yml | 12 ++++++------ Tests/fixtures/tablet-8.yml | 6 +++--- regexes/device/mobiles.yml | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index b565e4d1f1..286d9d4503 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1141,7 +1141,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'MA' => 'Manta Multimedia', 'Z0' => 'Mantra', 'J4' => 'Mara', - 'MAR' => 'Marshal', + 'MAR' => 'Marshal Electronic', '8Y' => 'Massgo', 'MA1' => 'Mascom', '2M' => 'Masstel', diff --git a/Tests/fixtures/smartphone-32.yml b/Tests/fixtures/smartphone-32.yml index 57e852a6e4..69b2e6aa4a 100644 --- a/Tests/fixtures/smartphone-32.yml +++ b/Tests/fixtures/smartphone-32.yml @@ -8059,7 +8059,7 @@ engine_version: 79.0.3945.93 device: type: smartphone - brand: Marshal + brand: Marshal Electronic model: ME-348 os_family: Android browser_family: Chrome @@ -8077,7 +8077,7 @@ engine_version: 70.0.3538.102 device: type: smartphone - brand: Marshal + brand: Marshal Electronic model: ME-347 os_family: Android browser_family: Unknown @@ -8095,7 +8095,7 @@ engine_version: "" device: type: smartphone - brand: Marshal + brand: Marshal Electronic model: ME-364 os_family: Android browser_family: Unknown @@ -8113,7 +8113,7 @@ engine_version: "534.30" device: type: smartphone - brand: Marshal + brand: Marshal Electronic model: ME-364 os_family: Android browser_family: Android Browser @@ -8131,7 +8131,7 @@ engine_version: "534.30" device: type: smartphone - brand: Marshal + brand: Marshal Electronic model: ME-365 os_family: Android browser_family: Android Browser @@ -8149,7 +8149,7 @@ engine_version: "534.30" device: type: smartphone - brand: Marshal + brand: Marshal Electronic model: ME-366 os_family: Android browser_family: Android Browser diff --git a/Tests/fixtures/tablet-8.yml b/Tests/fixtures/tablet-8.yml index ee178a8201..5f4d02f77e 100644 --- a/Tests/fixtures/tablet-8.yml +++ b/Tests/fixtures/tablet-8.yml @@ -8053,7 +8053,7 @@ engine_version: "534.30" device: type: tablet - brand: Marshal + brand: Marshal Electronic model: ME-700A os_family: Android browser_family: Android Browser @@ -8071,7 +8071,7 @@ engine_version: 81.0.4044.117 device: type: tablet - brand: Marshal + brand: Marshal Electronic model: ME-617 os_family: Android browser_family: Chrome @@ -8089,7 +8089,7 @@ engine_version: "534.30" device: type: tablet - brand: Marshal + brand: Marshal Electronic model: ME-720 os_family: Android browser_family: Android Browser diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index e66088d541..cdb34db6cf 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -41573,8 +41573,8 @@ iMI: - regex: 'Messi (No\.1|3)' model: 'Messi $1' -# Marshal -Marshal: +# Marshal Electronic +Marshal Electronic: regex: 'Marshal[_ -]?ME' device: 'smartphone' models: From 09770d6ad516abff0eee544fbebef55bc1ad66b0 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sat, 13 Sep 2025 18:40:48 +0300 Subject: [PATCH 42/77] Manhattan to Manhattan TV --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/tv.yml | 2 +- regexes/device/televisions.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 286d9d4503..94b8372eb7 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1135,7 +1135,7 @@ abstract class AbstractDeviceParser extends AbstractParser '6Y' => 'Magicsee', 'MA4' => 'Magenta', '23' => 'Magnus', - 'NH' => 'Manhattan', + 'NH' => 'Manhattan TV', 'MAN' => 'Mango', '5M' => 'Mann', 'MA' => 'Manta Multimedia', diff --git a/Tests/fixtures/tv.yml b/Tests/fixtures/tv.yml index 9daf83f147..6357b80e95 100644 --- a/Tests/fixtures/tv.yml +++ b/Tests/fixtures/tv.yml @@ -9579,7 +9579,7 @@ client: null device: type: tv - brand: Manhattan + brand: Manhattan TV model: T3 os_family: Unknown browser_family: Unknown diff --git a/regexes/device/televisions.yml b/regexes/device/televisions.yml index 7aac475d7a..765f7fbc9a 100644 --- a/regexes/device/televisions.yml +++ b/regexes/device/televisions.yml @@ -822,8 +822,8 @@ Luxor: - regex: '_TV_[A-Z0-9]+_([0-9]{4});' model: 'Smart TV ($1)' -# Manhattan (https://manhattan-tv.com/) -Manhattan: +# Manhattan TV (https://manhattan-tv.com/) +Manhattan TV: regex: 'Manhattan' device: 'tv' models: From 916842610eece6be15fe1b906433e8072a789d8d Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sat, 13 Sep 2025 18:57:19 +0300 Subject: [PATCH 43/77] KRONO to Krono Digital --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/smartphone-2.yml | 4 ++-- Tests/fixtures/smartphone-30.yml | 2 +- Tests/fixtures/smartphone-42.yml | 4 ++-- Tests/fixtures/smartphone-7.yml | 2 +- Tests/fixtures/tablet-11.yml | 2 +- Tests/fixtures/tablet-7.yml | 6 +++--- Tests/fixtures/tablet-8.yml | 2 +- regexes/device/mobiles.yml | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 94b8372eb7..bbaade5445 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1038,7 +1038,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'KP' => 'KOPO', 'KR' => 'Koridy', 'XK' => 'Koslam', - 'K2' => 'KRONO', + 'K2' => 'Krono Digital', 'KRX' => 'Korax', 'KE' => 'Krüger&Matz', '5K' => 'KREZ', diff --git a/Tests/fixtures/smartphone-2.yml b/Tests/fixtures/smartphone-2.yml index cfd693d9ec..8431baa6b8 100644 --- a/Tests/fixtures/smartphone-2.yml +++ b/Tests/fixtures/smartphone-2.yml @@ -9282,7 +9282,7 @@ engine_version: 87.0.4280.101 device: type: smartphone - brand: KRONO + brand: Krono Digital model: NET TITAN os_family: Android browser_family: Chrome @@ -9498,7 +9498,7 @@ engine_version: 88.0.4324.93 device: type: smartphone - brand: KRONO + brand: Krono Digital model: NET VOLT os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-30.yml b/Tests/fixtures/smartphone-30.yml index 87fdd66c9a..b94f56e614 100644 --- a/Tests/fixtures/smartphone-30.yml +++ b/Tests/fixtures/smartphone-30.yml @@ -6273,7 +6273,7 @@ engine_version: 87.0.4280.101 device: type: smartphone - brand: KRONO + brand: Krono Digital model: NET LITE os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-42.yml b/Tests/fixtures/smartphone-42.yml index 470a9c2933..216f111926 100644 --- a/Tests/fixtures/smartphone-42.yml +++ b/Tests/fixtures/smartphone-42.yml @@ -4575,7 +4575,7 @@ engine_version: 138.0.0.0 device: type: smartphone - brand: KRONO + brand: Krono Digital model: NET HIT os_family: Android browser_family: Chrome @@ -4593,7 +4593,7 @@ engine_version: 138.0.0.0 device: type: smartphone - brand: KRONO + brand: Krono Digital model: NET ALPHA os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-7.yml b/Tests/fixtures/smartphone-7.yml index 67d4313221..35d03732c9 100644 --- a/Tests/fixtures/smartphone-7.yml +++ b/Tests/fixtures/smartphone-7.yml @@ -5337,7 +5337,7 @@ engine_version: 72.0.3626.105 device: type: smartphone - brand: KRONO + brand: Krono Digital model: NET 1100 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-11.yml b/Tests/fixtures/tablet-11.yml index 9eae28aac2..083871d00d 100644 --- a/Tests/fixtures/tablet-11.yml +++ b/Tests/fixtures/tablet-11.yml @@ -8787,7 +8787,7 @@ engine_version: 120.0.6099.230 device: type: tablet - brand: KRONO + brand: Krono Digital model: Net R7 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-7.yml b/Tests/fixtures/tablet-7.yml index 95c111a781..5be239090b 100644 --- a/Tests/fixtures/tablet-7.yml +++ b/Tests/fixtures/tablet-7.yml @@ -5697,7 +5697,7 @@ engine_version: 81.0.4044.26 device: type: tablet - brand: KRONO + brand: Krono Digital model: Net Max os_family: Android browser_family: Chrome @@ -5715,7 +5715,7 @@ engine_version: 83.0.4103.60 device: type: tablet - brand: KRONO + brand: Krono Digital model: Net Matrix os_family: Android browser_family: Chrome @@ -5733,7 +5733,7 @@ engine_version: 87.0.4280.101 device: type: tablet - brand: KRONO + brand: Krono Digital model: Network os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-8.yml b/Tests/fixtures/tablet-8.yml index 5f4d02f77e..99c8ff0363 100644 --- a/Tests/fixtures/tablet-8.yml +++ b/Tests/fixtures/tablet-8.yml @@ -4043,7 +4043,7 @@ engine_version: 102.0.5005.125 device: type: tablet - brand: KRONO + brand: Krono Digital model: Net K7 os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index cdb34db6cf..cf4cc2d664 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -14815,8 +14815,8 @@ Koridy: device: 'smartphone' model: '$1' -# KRONO (www.kronodigital.com) -KRONO: +# Krono Digital (www.kronodigital.com) +Krono Digital: regex: '(?:NET1100|NET (?:HIT|ALPHA)|NET_(?:LITE|TITAN|VOLT|MAX|MATRIX|[KR]7|HIT)|android 8([\d.]*);(?: [\w-]+;)? NETWORK)(?:[);/ ]|$)' device: 'smartphone' models: From 46a9c299907625708194ec1d549f821db1306b77 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sat, 13 Sep 2025 18:59:36 +0300 Subject: [PATCH 44/77] Jumper to Jumper Tech --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/tablet-11.yml | 2 +- Tests/fixtures/tablet-7.yml | 6 +++--- Tests/fixtures/tablet-9.yml | 2 +- regexes/device/mobiles.yml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index bbaade5445..e9f2314bcc 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -984,7 +984,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'UJ' => 'Juniper Systems', 'J5' => 'Just5', 'JUS' => 'JUSYEA', - '7J' => 'Jumper', + '7J' => 'Jumper Tech', 'JPA' => 'JPay', 'JV' => 'JVC', 'JXD' => 'JXD', diff --git a/Tests/fixtures/tablet-11.yml b/Tests/fixtures/tablet-11.yml index 083871d00d..1991581331 100644 --- a/Tests/fixtures/tablet-11.yml +++ b/Tests/fixtures/tablet-11.yml @@ -4853,7 +4853,7 @@ engine_version: 122.0.6261.96 device: type: tablet - brand: Jumper + brand: Jumper Tech model: EZpad M11 os_family: Android browser_family: Unknown diff --git a/Tests/fixtures/tablet-7.yml b/Tests/fixtures/tablet-7.yml index 5be239090b..661d392e91 100644 --- a/Tests/fixtures/tablet-7.yml +++ b/Tests/fixtures/tablet-7.yml @@ -589,7 +589,7 @@ engine_version: 43.0.2357.121 device: type: tablet - brand: Jumper + brand: Jumper Tech model: EZpad 4SE os_family: Android browser_family: Chrome @@ -607,7 +607,7 @@ engine_version: 96.0.4664.104 device: type: tablet - brand: Jumper + brand: Jumper Tech model: EZpad M10 os_family: Android browser_family: Chrome @@ -625,7 +625,7 @@ engine_version: 39.0.2171.93 device: type: tablet - brand: Jumper + brand: Jumper Tech model: EZpad 5SE os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-9.yml b/Tests/fixtures/tablet-9.yml index b55061d240..52a5d6a6aa 100644 --- a/Tests/fixtures/tablet-9.yml +++ b/Tests/fixtures/tablet-9.yml @@ -8039,7 +8039,7 @@ engine_version: 112.0.0.0 device: type: tablet - brand: Jumper + brand: Jumper Tech model: EZpad M10S os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index cf4cc2d664..a2b307430f 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -9373,8 +9373,8 @@ Extrem: - regex: 'ROCK_X11' model: 'Rock X11' -# Jumper (jumper.com.ru) -Jumper: +# Jumper Tech (https://en.jumper.com.cn/en/index.aspx or https://jumper.com.ru) +Jumper Tech: regex: 'EZpad ([^;/)]+)(?: Build|[;)])' device: 'tablet' model: 'EZpad $1' From 761265f2182453fdd0a2e0e16b0e2741f3da81eb Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sat, 13 Sep 2025 19:10:50 +0300 Subject: [PATCH 45/77] iVooMi to iVOOMi Energy --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/smartphone-17.yml | 2 +- Tests/fixtures/smartphone-21.yml | 2 +- Tests/fixtures/smartphone-23.yml | 2 +- Tests/fixtures/smartphone-33.yml | 10 +++++----- Tests/fixtures/smartphone-34.yml | 4 ++-- regexes/device/mobiles.yml | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index e9f2314bcc..6b74142c2d 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -958,7 +958,7 @@ abstract class AbstractDeviceParser extends AbstractParser '0I' => 'iTruck', 'I8' => 'iVA', 'IE' => 'iView', - '0J' => 'iVooMi', + '0J' => 'iVOOMi Energy', 'UI' => 'ivvi', 'QW' => 'iWaylink', 'I9' => 'iZotron', diff --git a/Tests/fixtures/smartphone-17.yml b/Tests/fixtures/smartphone-17.yml index a524ab0795..e8bf7b8b7c 100644 --- a/Tests/fixtures/smartphone-17.yml +++ b/Tests/fixtures/smartphone-17.yml @@ -4997,7 +4997,7 @@ engine_version: 78.0.3904.90 device: type: smartphone - brand: iVooMi + brand: iVOOMi Energy model: Innelo 1 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-21.yml b/Tests/fixtures/smartphone-21.yml index 2a8fbcef3c..e3a307ae84 100644 --- a/Tests/fixtures/smartphone-21.yml +++ b/Tests/fixtures/smartphone-21.yml @@ -3251,7 +3251,7 @@ engine_version: 80.0.3987.162 device: type: smartphone - brand: iVooMi + brand: iVOOMi Energy model: Me 1 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-23.yml b/Tests/fixtures/smartphone-23.yml index 7b5e08a75f..87671b7a3e 100644 --- a/Tests/fixtures/smartphone-23.yml +++ b/Tests/fixtures/smartphone-23.yml @@ -8799,7 +8799,7 @@ engine_version: 80.0.3987.149 device: type: smartphone - brand: iVooMi + brand: iVOOMi Energy model: Me 1+ os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-33.yml b/Tests/fixtures/smartphone-33.yml index 44c71f5f3a..117fb12c23 100644 --- a/Tests/fixtures/smartphone-33.yml +++ b/Tests/fixtures/smartphone-33.yml @@ -7547,7 +7547,7 @@ engine_version: 80.0.3987.99 device: type: smartphone - brand: iVooMi + brand: iVOOMi Energy model: Me 3S os_family: Android browser_family: Chrome @@ -7565,7 +7565,7 @@ engine_version: 79.0.3945.136 device: type: smartphone - brand: iVooMi + brand: iVOOMi Energy model: Me 2 os_family: Android browser_family: Chrome @@ -7583,7 +7583,7 @@ engine_version: 80.0.3987.132 device: type: smartphone - brand: iVooMi + brand: iVOOMi Energy model: Me 3 os_family: Android browser_family: Chrome @@ -7601,7 +7601,7 @@ engine_version: 75.0.3770.101 device: type: smartphone - brand: iVooMi + brand: iVOOMi Energy model: Me 4 os_family: Android browser_family: Chrome @@ -7619,7 +7619,7 @@ engine_version: 83.0.4103.60 device: type: smartphone - brand: iVooMi + brand: iVOOMi Energy model: Me 5 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-34.yml b/Tests/fixtures/smartphone-34.yml index aa0d8c6fb4..8c0a8c9a4c 100644 --- a/Tests/fixtures/smartphone-34.yml +++ b/Tests/fixtures/smartphone-34.yml @@ -7815,7 +7815,7 @@ engine_version: 84.0.4147.89 device: type: smartphone - brand: iVooMi + brand: iVOOMi Energy model: i2 Lite os_family: Android browser_family: Chrome @@ -7833,7 +7833,7 @@ engine_version: 84.0.4147.111 device: type: smartphone - brand: iVooMi + brand: iVOOMi Energy model: i2 os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index a2b307430f..3a0fe6cad0 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -35473,8 +35473,8 @@ Paladin TV: device: 'tv' model: 'TV Box' -# iVooMi -iVooMi: +# iVOOMi Energy (https://ivoomienergy.com/about-us) +iVOOMi Energy: regex: '(?:Innelo_1|iV 505|Me 1\+|Me 3S|Me [2345]|Android 8(?:[\d.]*);(?: [\w-]+;)? (?:i2_Lite|i2))(?:[);/ ]|$)' device: 'smartphone' models: From d180d822d2ae15a856c40199e4916c7e94c387e8 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sat, 13 Sep 2025 19:21:14 +0300 Subject: [PATCH 46/77] Inco to Inco Electronics --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/smartphone-19.yml | 8 ++++---- Tests/fixtures/smartphone-21.yml | 6 +++--- Tests/fixtures/smartphone-22.yml | 2 +- Tests/fixtures/smartphone-23.yml | 6 +++--- Tests/fixtures/smartphone-26.yml | 2 +- Tests/fixtures/smartphone-31.yml | 4 ++-- Tests/fixtures/smartphone-32.yml | 2 +- Tests/fixtures/tablet-10.yml | 2 +- Tests/fixtures/tablet-5.yml | 2 +- regexes/device/mobiles.yml | 4 ++-- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 6b74142c2d..3db6e6ec66 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -910,7 +910,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'I3' => 'Impression', 'FC' => 'INCAR', '2H' => 'Inch', - '6I' => 'Inco', + '6I' => 'Inco Electronics', 'INK' => 'Inka', 'IW' => 'iNew', 'IF' => 'Infinix', diff --git a/Tests/fixtures/smartphone-19.yml b/Tests/fixtures/smartphone-19.yml index 8c69472822..64c59bce3f 100644 --- a/Tests/fixtures/smartphone-19.yml +++ b/Tests/fixtures/smartphone-19.yml @@ -1003,7 +1003,7 @@ engine_version: 85.0.4183.81 device: type: smartphone - brand: Inco + brand: Inco Electronics model: Horizon S os_family: Android browser_family: Chrome @@ -1021,7 +1021,7 @@ engine_version: 80.0.3987.99 device: type: smartphone - brand: Inco + brand: Inco Electronics model: Horizon + os_family: Android browser_family: Chrome @@ -1039,7 +1039,7 @@ engine_version: 80.0.3987.149 device: type: smartphone - brand: Inco + brand: Inco Electronics model: Aurora II os_family: Android browser_family: Chrome @@ -1993,7 +1993,7 @@ engine_version: 77.0.3865.92 device: type: smartphone - brand: Inco + brand: Inco Electronics model: Plain 2 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-21.yml b/Tests/fixtures/smartphone-21.yml index e3a307ae84..1422623e86 100644 --- a/Tests/fixtures/smartphone-21.yml +++ b/Tests/fixtures/smartphone-21.yml @@ -5357,7 +5357,7 @@ engine_version: 71.0.3578.99 device: type: smartphone - brand: Inco + brand: Inco Electronics model: Flex 2S os_family: Android browser_family: Chrome @@ -5375,7 +5375,7 @@ engine_version: 73.0.3683.90 device: type: smartphone - brand: Inco + brand: Inco Electronics model: S4 os_family: Android browser_family: Chrome @@ -5393,7 +5393,7 @@ engine_version: 59.0.3071.125 device: type: smartphone - brand: Inco + brand: Inco Electronics model: Bloom 2 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-22.yml b/Tests/fixtures/smartphone-22.yml index 1efb1a8a8a..db2db9b336 100644 --- a/Tests/fixtures/smartphone-22.yml +++ b/Tests/fixtures/smartphone-22.yml @@ -1201,7 +1201,7 @@ engine_version: 61.0.3163.98 device: type: smartphone - brand: Inco + brand: Inco Electronics model: Plain 2S os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-23.yml b/Tests/fixtures/smartphone-23.yml index 87671b7a3e..17b4ab005d 100644 --- a/Tests/fixtures/smartphone-23.yml +++ b/Tests/fixtures/smartphone-23.yml @@ -2263,7 +2263,7 @@ engine_version: 71.0.3578.99 device: type: smartphone - brand: Inco + brand: Inco Electronics model: Flex os_family: Android browser_family: Chrome @@ -2281,7 +2281,7 @@ engine_version: 76.0.3809.111 device: type: smartphone - brand: Inco + brand: Inco Electronics model: Bloom os_family: Android browser_family: Chrome @@ -2299,7 +2299,7 @@ engine_version: 76.0.3809.89 device: type: smartphone - brand: Inco + brand: Inco Electronics model: Colors os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-26.yml b/Tests/fixtures/smartphone-26.yml index 1c00b519e9..197d17fa5c 100644 --- a/Tests/fixtures/smartphone-26.yml +++ b/Tests/fixtures/smartphone-26.yml @@ -5257,7 +5257,7 @@ engine_version: 83.0.4103.106 device: type: smartphone - brand: Inco + brand: Inco Electronics model: Matter os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-31.yml b/Tests/fixtures/smartphone-31.yml index 96c7455f8a..9f1a64c5de 100644 --- a/Tests/fixtures/smartphone-31.yml +++ b/Tests/fixtures/smartphone-31.yml @@ -3413,7 +3413,7 @@ engine_version: 84.0.4147.125 device: type: smartphone - brand: Inco + brand: Inco Electronics model: Bloom 4 os_family: Android browser_family: Chrome @@ -3647,7 +3647,7 @@ engine_version: 87.0.4280.101 device: type: smartphone - brand: Inco + brand: Inco Electronics model: Eco S os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-32.yml b/Tests/fixtures/smartphone-32.yml index 69b2e6aa4a..880f4f6e0b 100644 --- a/Tests/fixtures/smartphone-32.yml +++ b/Tests/fixtures/smartphone-32.yml @@ -8833,7 +8833,7 @@ engine_version: 81.0.4044.111 device: type: smartphone - brand: Inco + brand: Inco Electronics model: Flex 3 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-10.yml b/Tests/fixtures/tablet-10.yml index e21b5ed8e1..09558818b4 100644 --- a/Tests/fixtures/tablet-10.yml +++ b/Tests/fixtures/tablet-10.yml @@ -10457,7 +10457,7 @@ engine_version: 80.0.3987.117 device: type: tablet - brand: Inco + brand: Inco Electronics model: Sphere os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-5.yml b/Tests/fixtures/tablet-5.yml index bc8a294207..ef3be4a567 100644 --- a/Tests/fixtures/tablet-5.yml +++ b/Tests/fixtures/tablet-5.yml @@ -6023,7 +6023,7 @@ engine_version: 77.0.3865.116 device: type: tablet - brand: Inco + brand: Inco Electronics model: Sphere 3 os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 3a0fe6cad0..b1fe3ece47 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -28747,8 +28747,8 @@ Wexler: - regex: '(ULTIMA 7 TWIST PLUS|ULTIMA [78] TWIST|ULTIMA 7 OCTA|ULTIMA 7|MOBI 7 LTE)(?:[);/ ]|$)' model: '$1' -# Inco (incomobile.com) -Inco: +# Inco Electronics (incomobile.com) +Inco Electronics: regex: '(?:Inco[ _](Aurora II|Colors|Sphere|Plain[_ ]2S?|Plain2 S|Flex(?: 2S)?|S4|Bloom(?: 2)?)|(Horizon_S|Horizon \+|MATTER)|Bloom4|eco_s|Flex-3)(?:[);/ ]|$)' device: 'smartphone' models: From 05e5de055d95045dd32a42045f462d417bcc1c77 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sat, 13 Sep 2025 19:21:58 +0300 Subject: [PATCH 47/77] iNavo to iNavi Systems --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/tablet-8.yml | 2 +- regexes/device/mobiles.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 3db6e6ec66..97a3e52fdc 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -937,7 +937,7 @@ abstract class AbstractDeviceParser extends AbstractParser '32' => 'Invens', '4I' => 'Invin', 'IFT' => 'iFIT', - 'INA' => 'iNavi', + 'INA' => 'iNavi Systems', 'I1' => 'iOcean', 'IMU' => 'iMuz', 'IP' => 'iPro', diff --git a/Tests/fixtures/tablet-8.yml b/Tests/fixtures/tablet-8.yml index 99c8ff0363..fa0925cc6e 100644 --- a/Tests/fixtures/tablet-8.yml +++ b/Tests/fixtures/tablet-8.yml @@ -8197,7 +8197,7 @@ engine_version: 80.0.3987.149 device: type: tablet - brand: iNavi + brand: iNavi Systems model: U+ Pad8 os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index b1fe3ece47..73bad9d83f 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -41663,8 +41663,8 @@ iFIT: device: 'tablet' model: 'Compass' -# iNavi (www.inavi.com) -iNavi: +# iNavi Systems (www.inavi.com) +iNavi Systems: regex: '(ITP-XD80L)(?: Build|[);])' device: 'tablet' models: From 71fcf527b2c65f0282864d91bea1b9ba51fc699f Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sat, 13 Sep 2025 19:23:44 +0300 Subject: [PATCH 48/77] Impression to Impression Electronics --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/smartphone-7.yml | 14 +++---- Tests/fixtures/tablet-12.yml | 2 +- Tests/fixtures/tablet-2.yml | 54 +++++++++++++------------- Tests/fixtures/tablet-7.yml | 4 +- Tests/fixtures/tablet-9.yml | 4 +- regexes/device/mobiles.yml | 4 +- 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 97a3e52fdc..d47877d290 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -907,7 +907,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'IL' => 'IMO Mobile', 'IMA' => 'Imaq', 'IM1' => 'Imose', - 'I3' => 'Impression', + 'I3' => 'Impression Electronics', 'FC' => 'INCAR', '2H' => 'Inch', '6I' => 'Inco Electronics', diff --git a/Tests/fixtures/smartphone-7.yml b/Tests/fixtures/smartphone-7.yml index 35d03732c9..ade60257a1 100644 --- a/Tests/fixtures/smartphone-7.yml +++ b/Tests/fixtures/smartphone-7.yml @@ -1361,7 +1361,7 @@ engine_version: 51.0.2704.106 device: type: smartphone - brand: Impression + brand: Impression Electronics model: A502 os_family: Android browser_family: Unknown @@ -1379,7 +1379,7 @@ engine_version: "534.30" device: type: smartphone - brand: Impression + brand: Impression Electronics model: I10-LE os_family: Android browser_family: Android Browser @@ -1397,7 +1397,7 @@ engine_version: 30.0.0.0 device: type: smartphone - brand: Impression + brand: Impression Electronics model: ImSmart A401 os_family: Android browser_family: Chrome @@ -1415,7 +1415,7 @@ engine_version: 30.0.0.0 device: type: smartphone - brand: Impression + brand: Impression Electronics model: ImSmart A501 os_family: Android browser_family: Chrome @@ -1433,7 +1433,7 @@ engine_version: 50.0.2661.86 device: type: smartphone - brand: Impression + brand: Impression Electronics model: ImSmart A503 os_family: Android browser_family: Chrome @@ -1451,7 +1451,7 @@ engine_version: 54.0.2840.68 device: type: smartphone - brand: Impression + brand: Impression Electronics model: ImSmart C501 os_family: Android browser_family: Chrome @@ -1469,7 +1469,7 @@ engine_version: 64.0.3282.137 device: type: smartphone - brand: Impression + brand: Impression Electronics model: ImSmart C571 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-12.yml b/Tests/fixtures/tablet-12.yml index a2e9a52cb6..a57bdad899 100644 --- a/Tests/fixtures/tablet-12.yml +++ b/Tests/fixtures/tablet-12.yml @@ -4135,7 +4135,7 @@ engine_version: 73.0.3683.90 device: type: tablet - brand: Impression + brand: Impression Electronics model: ImPad 6414 os_family: Android browser_family: Opera diff --git a/Tests/fixtures/tablet-2.yml b/Tests/fixtures/tablet-2.yml index 3ad189c8de..bfe263e55f 100644 --- a/Tests/fixtures/tablet-2.yml +++ b/Tests/fixtures/tablet-2.yml @@ -1993,7 +1993,7 @@ engine_version: 38.0.2125.122 device: type: tablet - brand: Impression + brand: Impression Electronics model: ImPad 0113 os_family: Android browser_family: Unknown @@ -2011,7 +2011,7 @@ engine_version: 47.0.2526.83 device: type: tablet - brand: Impression + brand: Impression Electronics model: ImPad 0314 os_family: Android browser_family: Chrome @@ -2029,7 +2029,7 @@ engine_version: 53.0.2785.124 device: type: tablet - brand: Impression + brand: Impression Electronics model: ImPad 0413 os_family: Android browser_family: Chrome @@ -2047,7 +2047,7 @@ engine_version: "534.30" device: type: tablet - brand: Impression + brand: Impression Electronics model: ImPad 1002 os_family: Android browser_family: Android Browser @@ -2065,7 +2065,7 @@ engine_version: 59.0.3071.125 device: type: tablet - brand: Impression + brand: Impression Electronics model: ImPad 1005 os_family: Android browser_family: Chrome @@ -2083,7 +2083,7 @@ engine_version: 55.0.2883.91 device: type: tablet - brand: Impression + brand: Impression Electronics model: ImPad 1006v2 os_family: Android browser_family: Chrome @@ -2101,7 +2101,7 @@ engine_version: "534.30" device: type: tablet - brand: Impression + brand: Impression Electronics model: ImPad 1113 os_family: Android browser_family: Android Browser @@ -2119,7 +2119,7 @@ engine_version: "533.1" device: type: tablet - brand: Impression + brand: Impression Electronics model: ImPad 1311 os_family: Android browser_family: Android Browser @@ -2137,7 +2137,7 @@ engine_version: "534.30" device: type: tablet - brand: Impression + brand: Impression Electronics model: ImPad 1412 os_family: Android browser_family: Android Browser @@ -2155,7 +2155,7 @@ engine_version: "534.30" device: type: tablet - brand: Impression + brand: Impression Electronics model: ImPad 1412 rev2 os_family: Android browser_family: Android Browser @@ -2173,7 +2173,7 @@ engine_version: "534.30" device: type: tablet - brand: Impression + brand: Impression Electronics model: ImPad 2113 os_family: Android browser_family: Android Browser @@ -2191,7 +2191,7 @@ engine_version: "" device: type: tablet - brand: Impression + brand: Impression Electronics model: ImPad 2412 os_family: Android browser_family: Android Browser @@ -2209,7 +2209,7 @@ engine_version: 35.0.1916.141 device: type: tablet - brand: Impression + brand: Impression Electronics model: ImPad 2413 os_family: Android browser_family: Chrome @@ -2227,7 +2227,7 @@ engine_version: 31.0.1650.59 device: type: tablet - brand: Impression + brand: Impression Electronics model: ImPad 3113 os_family: Android browser_family: Chrome @@ -2245,7 +2245,7 @@ engine_version: 31.0.1650.59 device: type: tablet - brand: Impression + brand: Impression Electronics model: ImPad 3412 os_family: Android browser_family: Chrome @@ -2263,7 +2263,7 @@ engine_version: 31.0.1650.59 device: type: tablet - brand: Impression + brand: Impression Electronics model: ImPad 4113 os_family: Android browser_family: Chrome @@ -2281,7 +2281,7 @@ engine_version: 30.0.0.0 device: type: tablet - brand: Impression + brand: Impression Electronics model: ImPad 6015 os_family: Android browser_family: Chrome @@ -2299,7 +2299,7 @@ engine_version: 42.0.2311.152 device: type: tablet - brand: Impression + brand: Impression Electronics model: ImPad 6115 os_family: Android browser_family: Unknown @@ -2317,7 +2317,7 @@ engine_version: 30.0.0.0 device: type: tablet - brand: Impression + brand: Impression Electronics model: ImPad 6115M os_family: Android browser_family: Chrome @@ -2335,7 +2335,7 @@ engine_version: 47.0.2526.83 device: type: tablet - brand: Impression + brand: Impression Electronics model: ImPad 6214 os_family: Android browser_family: Chrome @@ -2353,7 +2353,7 @@ engine_version: "534.30" device: type: tablet - brand: Impression + brand: Impression Electronics model: ImPad 8213 os_family: Android browser_family: Android Browser @@ -2371,7 +2371,7 @@ engine_version: "534.30" device: type: tablet - brand: Impression + brand: Impression Electronics model: ImPad 8901 os_family: Android browser_family: Android Browser @@ -2389,7 +2389,7 @@ engine_version: "534.30" device: type: tablet - brand: Impression + brand: Impression Electronics model: ImPad 9213 os_family: Android browser_family: Android Browser @@ -2407,7 +2407,7 @@ engine_version: "534.30" device: type: tablet - brand: Impression + brand: Impression Electronics model: ImPad 9702 os_family: Android browser_family: Android Browser @@ -2425,7 +2425,7 @@ engine_version: "534.30" device: type: tablet - brand: Impression + brand: Impression Electronics model: ImPad 9704 os_family: Android browser_family: Android Browser @@ -2443,7 +2443,7 @@ engine_version: 70.0.3538.80 device: type: tablet - brand: Impression + brand: Impression Electronics model: ImPad B702 os_family: Android browser_family: Chrome @@ -2461,7 +2461,7 @@ engine_version: 83.0.4103.106 device: type: tablet - brand: Impression + brand: Impression Electronics model: ImPad P104 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-7.yml b/Tests/fixtures/tablet-7.yml index 661d392e91..743b84ac1a 100644 --- a/Tests/fixtures/tablet-7.yml +++ b/Tests/fixtures/tablet-7.yml @@ -1955,7 +1955,7 @@ engine_version: 97.0.4692.98 device: type: tablet - brand: Impression + brand: Impression Electronics model: ImPad P101 os_family: Android browser_family: Chrome @@ -6129,7 +6129,7 @@ engine_version: 87.0.4280.66 device: type: tablet - brand: Impression + brand: Impression Electronics model: ImPad P701 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-9.yml b/Tests/fixtures/tablet-9.yml index 52a5d6a6aa..5431c6f935 100644 --- a/Tests/fixtures/tablet-9.yml +++ b/Tests/fixtures/tablet-9.yml @@ -4407,7 +4407,7 @@ engine_version: 77.0.3865.120 device: type: tablet - brand: Impression + brand: Impression Electronics model: ImPad 9415 os_family: Android browser_family: Unknown @@ -4425,7 +4425,7 @@ engine_version: 76.0.3809.132 device: type: tablet - brand: Impression + brand: Impression Electronics model: ImPad 1006 os_family: Android browser_family: Unknown diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 73bad9d83f..d2d690f751 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -14122,8 +14122,8 @@ iView: - regex: '((?:733|730|766|930)TPC|769TPC(?:II)?)(?:[);/ ]|$)' model: '$1' -# Impression -Impression: +# Impression Electronics +Impression Electronics: regex: '(?:Impression[ _-]?([^/;]+)|A502|I10\-LE|ImPad[ _]?(.*)|ImSmart[ _]?(.*))(?:[);/ ]|$)' device: 'tablet' models: From ce1bce4c4056317cc8900577c3f842cb30c28899 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sat, 13 Sep 2025 19:59:15 +0300 Subject: [PATCH 49/77] BGH to Positivo BGH --- Parser/Device/AbstractDeviceParser.php | 1 - Tests/fixtures/smartphone-2.yml | 22 ++++++++--------- Tests/fixtures/tablet-1.yml | 16 ++++++------ Tests/fixtures/tablet-8.yml | 2 +- regexes/device/mobiles.yml | 34 +++++++++++--------------- 5 files changed, 34 insertions(+), 41 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index d47877d290..180cd628a5 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -267,7 +267,6 @@ abstract class AbstractDeviceParser extends AbstractParser 'BEL' => 'Bell', '9B' => 'Bellphone', '63' => 'Beyond', - 'BG' => 'BGH', '6B' => 'Bigben', 'B8' => 'BIHEE', '1B' => 'Billion', diff --git a/Tests/fixtures/smartphone-2.yml b/Tests/fixtures/smartphone-2.yml index 8431baa6b8..6a68f2ab19 100644 --- a/Tests/fixtures/smartphone-2.yml +++ b/Tests/fixtures/smartphone-2.yml @@ -5106,7 +5106,7 @@ engine_version: 70.0.3538.110 device: type: smartphone - brand: BGH + brand: Positivo BGH model: Joy 303 os_family: Android browser_family: Chrome @@ -5124,7 +5124,7 @@ engine_version: 70.0.3538.110 device: type: smartphone - brand: BGH + brand: Positivo BGH model: Joy Smart A5C os_family: Android browser_family: Chrome @@ -5142,7 +5142,7 @@ engine_version: 59.0.3071.125 device: type: smartphone - brand: BGH + brand: Positivo BGH model: Joy Smart A6 os_family: Android browser_family: Chrome @@ -5160,7 +5160,7 @@ engine_version: 70.0.3538.110 device: type: smartphone - brand: BGH + brand: Positivo BGH model: Joy Smart A7G os_family: Android browser_family: Chrome @@ -5178,7 +5178,7 @@ engine_version: 70.0.3538.110 device: type: smartphone - brand: BGH + brand: Positivo BGH model: Joy Smart AXS II os_family: Android browser_family: Chrome @@ -5196,7 +5196,7 @@ engine_version: 63.0.3239.111 device: type: smartphone - brand: BGH + brand: Positivo BGH model: Joy Smart AXS II D os_family: Android browser_family: Chrome @@ -5214,7 +5214,7 @@ engine_version: 70.0.3538.110 device: type: smartphone - brand: BGH + brand: Positivo BGH model: Joy Smart AXS II D os_family: Android browser_family: Chrome @@ -5232,7 +5232,7 @@ engine_version: 70.0.3538.110 device: type: smartphone - brand: BGH + brand: Positivo BGH model: Joy V6 os_family: Android browser_family: Chrome @@ -5250,7 +5250,7 @@ engine_version: 43.0.2357.93 device: type: smartphone - brand: BGH + brand: Positivo BGH model: Joy X2 os_family: Android browser_family: Chrome @@ -5268,7 +5268,7 @@ engine_version: 70.0.3538.110 device: type: smartphone - brand: BGH + brand: Positivo BGH model: Joy X2 os_family: Android browser_family: Chrome @@ -5286,7 +5286,7 @@ engine_version: 70.0.3538.110 device: type: smartphone - brand: BGH + brand: Positivo BGH model: Joy X5 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-1.yml b/Tests/fixtures/tablet-1.yml index 25ae80f38d..449fd401e6 100644 --- a/Tests/fixtures/tablet-1.yml +++ b/Tests/fixtures/tablet-1.yml @@ -335,7 +335,7 @@ engine_version: 68.0.3440.91 device: type: tablet - brand: BGH + brand: Positivo BGH model: +Simple os_family: Android browser_family: Chrome @@ -353,7 +353,7 @@ engine_version: 47.0.2526.83 device: type: tablet - brand: BGH + brand: Positivo BGH model: Mini os_family: Android browser_family: Chrome @@ -371,7 +371,7 @@ engine_version: 70.0.3538.64 device: type: tablet - brand: BGH + brand: Positivo BGH model: Y100 os_family: Android browser_family: Chrome @@ -389,7 +389,7 @@ engine_version: 63.0.3239.111 device: type: tablet - brand: BGH + brand: Positivo BGH model: Y1010 os_family: Android browser_family: Chrome @@ -407,7 +407,7 @@ engine_version: 63.0.3239.111 device: type: tablet - brand: BGH + brand: Positivo BGH model: Y200 os_family: Android browser_family: Chrome @@ -425,7 +425,7 @@ engine_version: 62.0.3202.84 device: type: tablet - brand: BGH + brand: Positivo BGH model: Y210 os_family: Android browser_family: Chrome @@ -443,7 +443,7 @@ engine_version: 70.0.3538.110 device: type: tablet - brand: BGH + brand: Positivo BGH model: Y700 os_family: Android browser_family: Chrome @@ -461,7 +461,7 @@ engine_version: 71.0.3578.99 device: type: tablet - brand: BGH + brand: Positivo BGH model: Y710 Kids os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-8.yml b/Tests/fixtures/tablet-8.yml index fa0925cc6e..8ad7e62125 100644 --- a/Tests/fixtures/tablet-8.yml +++ b/Tests/fixtures/tablet-8.yml @@ -9799,7 +9799,7 @@ engine_version: 80.0.3987.149 device: type: tablet - brand: BGH + brand: Positivo BGH model: M840 os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index d2d690f751..7969afb9f5 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -4051,25 +4051,6 @@ Barnes & Noble: - regex: '(BN[TR]V[0-9]+)' model: 'Nook $1' -# BGH -BGH: - regex: '(?!Positivo )BGH ([^/;)]+)(?: Build|[;)])' - device: 'smartphone' - models: - - regex: 'Y([17]00|2[01]0|1010)' - device: 'tablet' - model: 'Y$1' - - regex: 'BGH (\+Simple|Mini|M840)' - device: 'tablet' - model: '$1' - - regex: 'Y710 KIDS' - device: 'tablet' - model: 'Y710 Kids' - - regex: 'JOY X2' - model: 'Joy X2' - - regex: 'BGH ([^/;)]+)(?: Build|[;)])' - model: '$1' - # Bitel Bitel: regex: 'Bitel[ _-]([^/;]+) Build|(?:B(?:840[5-9]|841[0456]|850[2346]|860[146]|9401|950[1-5])|S8402L?|S8501L?|BPRO)(?:[);/ ]|$)' @@ -33948,7 +33929,7 @@ Multilaser: # Positivo BGH Positivo BGH: - regex: '(?:T1060B|S455|Positivo (?:Twist|Ypy|Mini I)|Twist[ _](?:\(2018\)|2 (?:Fit|Pro)|Mini|Tab|Metal(?: 32GB)?|Max|XL|SE|[23SM])|KC770|G1101T)(?:[);/ ]|$)' + regex: '(?:BGH ([^/;)]+)(?: Build|[;)])|T1060B|S455|Positivo (?:Twist|Ypy|Mini I)|Twist[ _](?:\(2018\)|2 (?:Fit|Pro)|Mini|Tab|Metal(?: 32GB)?|Max|XL|SE|[23SM])|KC770|G1101T)(?:[);/ ]|$)' device: 'smartphone' models: - regex: 'S455(?:[);/ ]|$)' @@ -33977,6 +33958,10 @@ Positivo BGH: model: 'Twist $1' - regex: '(?:Positivo )Mini I(?:[);/ ]|$)' model: 'Mini I' + - regex: 'JOY X2' + model: 'Joy X2' + - regex: 'BGH ([^/;)]+)(?: Build|[;)])' + model: '$1' - regex: '(T1060B|KC770|G1101T)(?:[);/ ]|$)' device: 'tablet' @@ -33987,6 +33972,15 @@ Positivo BGH: - regex: 'Twist Tab(?:[);/ ]|$)' device: 'tablet' model: 'Twist Tab' + - regex: 'Y([17]00|2[01]0|1010)' + device: 'tablet' + model: 'Y$1' + - regex: 'BGH (\+Simple|Mini|M840)' + device: 'tablet' + model: '$1' + - regex: 'Y710 KIDS' + device: 'tablet' + model: 'Y710 Kids' # Maxtron Maxtron: From c1f246c9f1cc5f2b9dd566b4026734cf880c11f3 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sat, 13 Sep 2025 20:04:07 +0300 Subject: [PATCH 50/77] BRAVE to Brave Techs --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/tablet-11.yml | 4 ++-- Tests/fixtures/tablet-9.yml | 2 +- regexes/device/mobiles.yml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 180cd628a5..129fe3aaf9 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -315,7 +315,7 @@ abstract class AbstractDeviceParser extends AbstractParser '8B' => 'Brandt', 'BRA' => 'BrandCode', 'BV' => 'Bravis', - 'BRV' => 'BRAVE', + 'BRV' => 'Brave Techs', 'BRG' => 'Brigmton', 'BR' => 'Brondi', 'XF' => 'BROR', diff --git a/Tests/fixtures/tablet-11.yml b/Tests/fixtures/tablet-11.yml index 1991581331..af04f5d8c5 100644 --- a/Tests/fixtures/tablet-11.yml +++ b/Tests/fixtures/tablet-11.yml @@ -6167,7 +6167,7 @@ engine_version: 124.0.6367.179 device: type: tablet - brand: BRAVE + brand: Brave Techs model: EX10SL4 os_family: Android browser_family: Chrome @@ -8157,7 +8157,7 @@ engine_version: 126.0.0.0 device: type: tablet - brand: BRAVE + brand: Brave Techs model: BTXS1 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-9.yml b/Tests/fixtures/tablet-9.yml index 5431c6f935..ee59004d3f 100644 --- a/Tests/fixtures/tablet-9.yml +++ b/Tests/fixtures/tablet-9.yml @@ -3849,7 +3849,7 @@ engine_version: 83.0.4103.106 device: type: tablet - brand: BRAVE + brand: Brave Techs model: BT7X1 os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 7969afb9f5..18a44ac6b7 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -42371,8 +42371,8 @@ iRobot: device: 'tablet' model: '$1' -# BRAVE -BRAVE: +# Brave Techs +Brave Techs: regex: '(BT7X1|EX10SL4|BTXS1)(?:[);/ ]|$)' # EXCEED EX10SL4 device: 'tablet' model: '$1' From 8ac727b847747352e3581b349d040ba0789f1608 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sat, 13 Sep 2025 20:04:45 +0300 Subject: [PATCH 51/77] Bubblegum to Bubblegum Tablets --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/tablet-6.yml | 2 +- regexes/device/mobiles.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 129fe3aaf9..356045b71b 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -322,7 +322,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'BJ' => 'BrightSign', 'B1' => 'Bush', '4Q' => 'Bundy', - 'Y8' => 'Bubblegum', + 'Y8' => 'Bubblegum Tablets', 'BMW' => 'BMW', 'BYJ' => 'BYJU\'S', 'BYY' => 'BYYBUO', diff --git a/Tests/fixtures/tablet-6.yml b/Tests/fixtures/tablet-6.yml index ac77a8d75e..293b4db23e 100644 --- a/Tests/fixtures/tablet-6.yml +++ b/Tests/fixtures/tablet-6.yml @@ -6416,7 +6416,7 @@ engine_version: 96.0.4664.45 device: type: tablet - brand: Bubblegum + brand: Bubblegum Tablets model: BUB6R-3T os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 18a44ac6b7..5a7c09406c 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -39299,8 +39299,8 @@ Partner Mobile: - regex: 'EV1 PRO' model: 'EV1 Pro' -# Bubblegum (bubblegumtablets.co.za) -Bubblegum: +# Bubblegum Tablets (bubblegumtablets.co.za) +Bubblegum Tablets: regex: '(BUB6R-3T)(?:[);/ ]|$)' device: 'tablet' model: '$1' From 8408267b86b5b6d8cb5bae80ef3a468ebe00e36a Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sat, 13 Sep 2025 20:18:52 +0300 Subject: [PATCH 52/77] Coby Kyros to Coby --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/tablet-1.yml | 112 ++++++++++++------------- Tests/fixtures/tablet-6.yml | 4 +- Tests/fixtures/tablet-7.yml | 4 +- regexes/device/mobiles.yml | 4 +- 5 files changed, 63 insertions(+), 63 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 356045b71b..a65842636e 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -382,7 +382,7 @@ abstract class AbstractDeviceParser extends AbstractParser '6C' => 'Cloudpad', 'C0' => 'Clout', 'CN' => 'CnM', - 'CY' => 'Coby Kyros', + 'CY' => 'Coby', 'XC' => 'Cobalt', 'C6' => 'Comio', 'COM' => 'CommScope', diff --git a/Tests/fixtures/tablet-1.yml b/Tests/fixtures/tablet-1.yml index 449fd401e6..511af17acb 100644 --- a/Tests/fixtures/tablet-1.yml +++ b/Tests/fixtures/tablet-1.yml @@ -3647,8 +3647,8 @@ engine_version: "533.1" device: type: tablet - brand: Coby Kyros - model: MID1024 + brand: Coby + model: Kyros MID1024 os_family: Android browser_family: Android Browser - @@ -3665,8 +3665,8 @@ engine_version: "534.30" device: type: tablet - brand: Coby Kyros - model: MID1045 + brand: Coby + model: Kyros MID1045 os_family: Android browser_family: Android Browser - @@ -3683,8 +3683,8 @@ engine_version: "534.30" device: type: tablet - brand: Coby Kyros - model: MID1048 + brand: Coby + model: Kyros MID1048 os_family: Android browser_family: Android Browser - @@ -3701,8 +3701,8 @@ engine_version: "534.30" device: type: tablet - brand: Coby Kyros - model: MID1060 + brand: Coby + model: Kyros MID1060 os_family: Android browser_family: Android Browser - @@ -3719,8 +3719,8 @@ engine_version: "533.1" device: type: tablet - brand: Coby Kyros - model: MID1125 + brand: Coby + model: Kyros MID1125 os_family: Android browser_family: Android Browser - @@ -3737,8 +3737,8 @@ engine_version: "533.1" device: type: tablet - brand: Coby Kyros - model: MID1126 + brand: Coby + model: Kyros MID1126 os_family: Android browser_family: Android Browser - @@ -3755,8 +3755,8 @@ engine_version: "533.1" device: type: tablet - brand: Coby Kyros - model: MID7012 + brand: Coby + model: Kyros MID7012 os_family: Android browser_family: Android Browser - @@ -3773,8 +3773,8 @@ engine_version: "530.17" device: type: tablet - brand: Coby Kyros - model: MID7015 + brand: Coby + model: Kyros MID7015 os_family: Android browser_family: Android Browser - @@ -3791,8 +3791,8 @@ engine_version: "530.17" device: type: tablet - brand: Coby Kyros - model: MID7015A + brand: Coby + model: Kyros MID7015A os_family: Android browser_family: Android Browser - @@ -3809,8 +3809,8 @@ engine_version: "533.1" device: type: tablet - brand: Coby Kyros - model: MID7016 + brand: Coby + model: Kyros MID7016 os_family: Android browser_family: Android Browser - @@ -3827,8 +3827,8 @@ engine_version: "533.1" device: type: tablet - brand: Coby Kyros - model: MID7022 + brand: Coby + model: Kyros MID7022 os_family: Android browser_family: Android Browser - @@ -3845,8 +3845,8 @@ engine_version: "534.30" device: type: tablet - brand: Coby Kyros - model: MID7032 + brand: Coby + model: Kyros MID7032 os_family: Android browser_family: Android Browser - @@ -3863,8 +3863,8 @@ engine_version: "534.30" device: type: tablet - brand: Coby Kyros - model: MID7035 + brand: Coby + model: Kyros MID7035 os_family: Android browser_family: Android Browser - @@ -3881,8 +3881,8 @@ engine_version: "534.30" device: type: tablet - brand: Coby Kyros - model: MID7036 + brand: Coby + model: Kyros MID7036 os_family: Android browser_family: Android Browser - @@ -3899,8 +3899,8 @@ engine_version: "534.30" device: type: tablet - brand: Coby Kyros - model: MID7042 + brand: Coby + model: Kyros MID7042 os_family: Android browser_family: Android Browser - @@ -3917,8 +3917,8 @@ engine_version: "534.30" device: type: tablet - brand: Coby Kyros - model: MID7048 + brand: Coby + model: Kyros MID7048 os_family: Android browser_family: Android Browser - @@ -3935,8 +3935,8 @@ engine_version: 28.0.1500.94 device: type: tablet - brand: Coby Kyros - model: MID7052 + brand: Coby + model: Kyros MID7052 os_family: Android browser_family: Chrome - @@ -3953,8 +3953,8 @@ engine_version: 34.0.1847.114 device: type: tablet - brand: Coby Kyros - model: MID7065 + brand: Coby + model: Kyros MID7065 os_family: Android browser_family: Chrome - @@ -3971,8 +3971,8 @@ engine_version: "533.1" device: type: tablet - brand: Coby Kyros - model: MID7120 + brand: Coby + model: Kyros MID7120 os_family: Android browser_family: Android Browser - @@ -3989,8 +3989,8 @@ engine_version: "533.1" device: type: tablet - brand: Coby Kyros - model: MID8024 + brand: Coby + model: Kyros MID8024 os_family: Android browser_family: Android Browser - @@ -4007,8 +4007,8 @@ engine_version: "534.30" device: type: tablet - brand: Coby Kyros - model: MID8042 + brand: Coby + model: Kyros MID8042 os_family: Android browser_family: Android Browser - @@ -4025,8 +4025,8 @@ engine_version: "534.30" device: type: tablet - brand: Coby Kyros - model: MID8048 + brand: Coby + model: Kyros MID8048 os_family: Android browser_family: Android Browser - @@ -4043,8 +4043,8 @@ engine_version: "533.1" device: type: tablet - brand: Coby Kyros - model: MID8125 + brand: Coby + model: Kyros MID8125 os_family: Android browser_family: Android Browser - @@ -4061,8 +4061,8 @@ engine_version: "533.1" device: type: tablet - brand: Coby Kyros - model: MID8127 + brand: Coby + model: Kyros MID8127 os_family: Android browser_family: Android Browser - @@ -4079,8 +4079,8 @@ engine_version: "533.1" device: type: tablet - brand: Coby Kyros - model: MID8128 + brand: Coby + model: Kyros MID8128 os_family: Android browser_family: Android Browser - @@ -4097,8 +4097,8 @@ engine_version: "534.30" device: type: tablet - brand: Coby Kyros - model: MID9724 + brand: Coby + model: Kyros MID9724 os_family: Android browser_family: Android Browser - @@ -4115,8 +4115,8 @@ engine_version: "534.30" device: type: tablet - brand: Coby Kyros - model: MID9740 + brand: Coby + model: Kyros MID9740 os_family: Android browser_family: Android Browser - @@ -4133,8 +4133,8 @@ engine_version: "534.30" device: type: tablet - brand: Coby Kyros - model: MID9742 + brand: Coby + model: Kyros MID9742 os_family: Android browser_family: Android Browser - diff --git a/Tests/fixtures/tablet-6.yml b/Tests/fixtures/tablet-6.yml index 293b4db23e..e966f2575c 100644 --- a/Tests/fixtures/tablet-6.yml +++ b/Tests/fixtures/tablet-6.yml @@ -8360,8 +8360,8 @@ engine_version: 95.0.4638.74 device: type: tablet - brand: Coby Kyros - model: MID8072 + brand: Coby + model: Kyros MID8072 os_family: Android browser_family: Chrome - diff --git a/Tests/fixtures/tablet-7.yml b/Tests/fixtures/tablet-7.yml index 743b84ac1a..2cf2eb90e9 100644 --- a/Tests/fixtures/tablet-7.yml +++ b/Tests/fixtures/tablet-7.yml @@ -6741,8 +6741,8 @@ engine_version: 78.0.3904.62 device: type: tablet - brand: Coby Kyros - model: CTB761 + brand: Coby + model: Kyros CTB761 os_family: Android browser_family: Chrome - diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 5a7c09406c..b09cca8688 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -17419,8 +17419,8 @@ Sagem: - regex: 'portalmmm/2\.0 ((?:SG|my)[a-z0-9]+)' model: '$1' -# Coby Kyros -Coby Kyros: +# Coby (https://en.wikipedia.org/wiki/Coby_Electronics_Corporation) +Coby: regex: '(MID(?:1024|112[56]|1045|1048|106[05]|4331|701[26]|7015A?|70[32]2|703[56]|704[278]|7052|7065|7120|8024|80[47]2|8048|8065|8125|812[78]|9724|974[02])|CTB761)(?:[);/ ]|$)' device: 'tablet' model: '$1' From 922075e760c62a868d8f9c5c91529028247a0910 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sat, 13 Sep 2025 20:26:33 +0300 Subject: [PATCH 53/77] Connex to Connex Devices --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/tablet-10.yml | 4 ++-- Tests/fixtures/tablet-6.yml | 2 +- regexes/device/mobiles.yml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index a65842636e..6ec55463c0 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -398,7 +398,7 @@ abstract class AbstractDeviceParser extends AbstractParser '4C' => 'Conquest', 'COG' => 'CONSUNG', '3C' => 'Contixo', - '8C' => 'Connex', + '8C' => 'Connex Devices', '53' => 'Connectce', 'CON' => 'Conceptum', 'CED' => 'Continental Edison', diff --git a/Tests/fixtures/tablet-10.yml b/Tests/fixtures/tablet-10.yml index 09558818b4..3ec5d004f9 100644 --- a/Tests/fixtures/tablet-10.yml +++ b/Tests/fixtures/tablet-10.yml @@ -4013,7 +4013,7 @@ engine_version: 74.0.3729.136 device: type: tablet - brand: Connex + brand: Connex Devices model: CTAB1044hn os_family: Android browser_family: Chrome @@ -4031,7 +4031,7 @@ engine_version: 78.0.3904.96 device: type: tablet - brand: Connex + brand: Connex Devices model: CTAB-1044 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-6.yml b/Tests/fixtures/tablet-6.yml index e966f2575c..8e4780b37b 100644 --- a/Tests/fixtures/tablet-6.yml +++ b/Tests/fixtures/tablet-6.yml @@ -5140,7 +5140,7 @@ engine_version: 81.0.4044.138 device: type: tablet - brand: Connex + brand: Connex Devices model: Serenity 1055 10.1" os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index b09cca8688..7622513483 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -36837,8 +36837,8 @@ AfriOne: device: 'smartphone' model: 'Champion Pro' -# Connex (connexdevices.co.za) -Connex: +# Connex Devices (connexdevices.co.za) +Connex Devices: regex: '(?:CTAB1044hn|CTAB-1044|SEN_1055_ARM)(?:[);/ ]|$)' device: 'tablet' models: From 17e57adbdbc9d4856efbf9a4b5d3ed934f24dde3 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sat, 13 Sep 2025 20:30:13 +0300 Subject: [PATCH 54/77] Cricket to Cricket Wireless --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/feature_phone.yml | 6 +++--- Tests/fixtures/smartphone-12.yml | 6 +++--- Tests/fixtures/smartphone-22.yml | 2 +- Tests/fixtures/smartphone-3.yml | 16 ++++++++-------- Tests/fixtures/smartphone-37.yml | 2 +- Tests/fixtures/smartphone-38.yml | 2 +- Tests/fixtures/smartphone-39.yml | 8 ++++---- Tests/fixtures/smartphone-40.yml | 2 +- Tests/fixtures/smartphone-41.yml | 4 ++-- Tests/fixtures/smartphone-42.yml | 2 +- regexes/device/mobiles.yml | 4 ++-- 12 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 6ec55463c0..f148db6e25 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -419,7 +419,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'CR' => 'CreNova', 'CX' => 'Crescent', 'CRE' => 'Crestron', - 'CK' => 'Cricket', + 'CK' => 'Cricket Wireless', 'CM' => 'Crius Mea', 'CMF' => 'CMF', '0C' => 'Crony', diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index 2a6016381e..3af939060a 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -46,7 +46,7 @@ engine_version: "" device: type: feature phone - brand: Cricket + brand: Cricket Wireless model: A310 os_family: Real-time OS browser_family: Unknown @@ -2286,7 +2286,7 @@ engine_version: "48.0" device: type: feature phone - brand: Cricket + brand: Cricket Wireless model: Debut Flip os_family: Firefox OS browser_family: Firefox @@ -2304,7 +2304,7 @@ engine_version: "84.0" device: type: feature phone - brand: Cricket + brand: Cricket Wireless model: Debut Flex os_family: Firefox OS browser_family: Firefox diff --git a/Tests/fixtures/smartphone-12.yml b/Tests/fixtures/smartphone-12.yml index e665f04870..572326ff04 100644 --- a/Tests/fixtures/smartphone-12.yml +++ b/Tests/fixtures/smartphone-12.yml @@ -9811,7 +9811,7 @@ engine_version: 106.0.0.0 device: type: smartphone - brand: Cricket + brand: Cricket Wireless model: Debut Smart os_family: Android browser_family: Chrome @@ -9865,7 +9865,7 @@ engine_version: 107.0.0.0 device: type: smartphone - brand: Cricket + brand: Cricket Wireless model: Vision Plus os_family: Android browser_family: Chrome @@ -10981,7 +10981,7 @@ engine_version: 107.0.0.0 device: type: smartphone - brand: Cricket + brand: Cricket Wireless model: Icon 4 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-22.yml b/Tests/fixtures/smartphone-22.yml index db2db9b336..97e559ee38 100644 --- a/Tests/fixtures/smartphone-22.yml +++ b/Tests/fixtures/smartphone-22.yml @@ -2515,7 +2515,7 @@ engine_version: 86.0.4240.198 device: type: smartphone - brand: Cricket + brand: Cricket Wireless model: Ovation os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-3.yml b/Tests/fixtures/smartphone-3.yml index 6a760858c6..d2e7ba05dd 100644 --- a/Tests/fixtures/smartphone-3.yml +++ b/Tests/fixtures/smartphone-3.yml @@ -9209,7 +9209,7 @@ engine_version: 81.0.4044.138 device: type: smartphone - brand: Cricket + brand: Cricket Wireless model: Influence os_family: Android browser_family: Chrome @@ -9227,7 +9227,7 @@ engine_version: 90.0.4430.210 device: type: smartphone - brand: Cricket + brand: Cricket Wireless model: Icon 2 os_family: Android browser_family: Chrome @@ -12310,7 +12310,7 @@ engine_version: 96.0.4664.92 device: type: smartphone - brand: Cricket + brand: Cricket Wireless model: Ovation 2 os_family: Android browser_family: Chrome @@ -12328,7 +12328,7 @@ engine_version: 90.0.4430.210 device: type: smartphone - brand: Cricket + brand: Cricket Wireless model: Dream 5G os_family: Android browser_family: Chrome @@ -12346,7 +12346,7 @@ engine_version: 96.0.4664.45 device: type: smartphone - brand: Cricket + brand: Cricket Wireless model: Icon 3 os_family: Android browser_family: Chrome @@ -12364,7 +12364,7 @@ engine_version: 94.0.4606.85 device: type: smartphone - brand: Cricket + brand: Cricket Wireless model: Splendor os_family: Android browser_family: Chrome @@ -12382,7 +12382,7 @@ engine_version: 94.0.4606.85 device: type: smartphone - brand: Cricket + brand: Cricket Wireless model: Innovate 5G os_family: Android browser_family: Chrome @@ -12472,7 +12472,7 @@ engine_version: 96.0.4664.45 device: type: smartphone - brand: Cricket + brand: Cricket Wireless model: Icon os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-37.yml b/Tests/fixtures/smartphone-37.yml index a6d36eaec1..3b7bd08ff9 100644 --- a/Tests/fixtures/smartphone-37.yml +++ b/Tests/fixtures/smartphone-37.yml @@ -9437,7 +9437,7 @@ engine_version: 109.0.0.0 device: type: smartphone - brand: Cricket + brand: Cricket Wireless model: Ovation 3 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-38.yml b/Tests/fixtures/smartphone-38.yml index adad58b229..32a40976e5 100644 --- a/Tests/fixtures/smartphone-38.yml +++ b/Tests/fixtures/smartphone-38.yml @@ -623,7 +623,7 @@ engine_version: 76.0.3809.111 device: type: smartphone - brand: Cricket + brand: Cricket Wireless model: Icon 5 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-39.yml b/Tests/fixtures/smartphone-39.yml index 6460673696..7a00fabe40 100644 --- a/Tests/fixtures/smartphone-39.yml +++ b/Tests/fixtures/smartphone-39.yml @@ -2593,7 +2593,7 @@ engine_version: 124.0.6367.123 device: type: smartphone - brand: Cricket + brand: Cricket Wireless model: Outlast os_family: Android browser_family: Chrome @@ -4025,7 +4025,7 @@ engine_version: 124.0.6367.113 device: type: smartphone - brand: Cricket + brand: Cricket Wireless model: Innovate E 5G os_family: Android browser_family: Opera @@ -6575,7 +6575,7 @@ engine_version: 126.0.0.0 device: type: smartphone - brand: Cricket + brand: Cricket Wireless model: Debut S2 os_family: Android browser_family: Chrome @@ -6647,7 +6647,7 @@ engine_version: 126.0.6478.71 device: type: smartphone - brand: Cricket + brand: Cricket Wireless model: Magic 5G os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-40.yml b/Tests/fixtures/smartphone-40.yml index b1c10a181b..c7cffef638 100644 --- a/Tests/fixtures/smartphone-40.yml +++ b/Tests/fixtures/smartphone-40.yml @@ -8980,7 +8980,7 @@ engine_version: 128.0.6613.50 device: type: smartphone - brand: Cricket + brand: Cricket Wireless model: Magic 2 5G os_family: Android browser_family: Unknown diff --git a/Tests/fixtures/smartphone-41.yml b/Tests/fixtures/smartphone-41.yml index a646070110..511c287b0b 100644 --- a/Tests/fixtures/smartphone-41.yml +++ b/Tests/fixtures/smartphone-41.yml @@ -7810,7 +7810,7 @@ engine_version: 135.0.7049.111 device: type: smartphone - brand: Cricket + brand: Cricket Wireless model: Debut S3 os_family: Android browser_family: Chrome @@ -8474,7 +8474,7 @@ version: "" device: type: smartphone - brand: Cricket + brand: Cricket Wireless model: Outlast 5G os_family: Android browser_family: Unknown diff --git a/Tests/fixtures/smartphone-42.yml b/Tests/fixtures/smartphone-42.yml index 216f111926..5764238114 100644 --- a/Tests/fixtures/smartphone-42.yml +++ b/Tests/fixtures/smartphone-42.yml @@ -3245,7 +3245,7 @@ engine_version: 136.0.7103.111 device: type: smartphone - brand: Cricket + brand: Cricket Wireless model: Icon 6 os_family: Android browser_family: Unknown diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 7622513483..04b5781579 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -6841,8 +6841,8 @@ Cosmote: - regex: 'Cosmote?[_ ]([^;/)]+)(?: Build|[);])' model: '$1' -# Cricket -Cricket: +# Cricket Wireless (https://www.cricketwireless.com) +Cricket Wireless: regex: 'Cricket-([a-z0-9]+)|CKT_|(?:U(?:102|304|325|380|572|6080|655|668|680|705|1030)AC|V350C|EC1002|EC21100[1-4]|SL100EA|SL101AE|WTCKT01|SL112C|SL219C|SN304AE|SN509C)(?:[);/ ]|$)' device: 'smartphone' models: From 98a16d9c9efb5acfd63fb6521c5286f0e1d3cea6 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sat, 13 Sep 2025 20:34:53 +0300 Subject: [PATCH 55/77] Crown to Crown Micro --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/tablet-7.yml | 2 +- Tests/fixtures/tv-1.yml | 2 +- Tests/fixtures/tv-2.yml | 2 +- Tests/fixtures/tv-4.yml | 2 +- regexes/device/mobiles.yml | 4 ++-- regexes/device/televisions.yml | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index f148db6e25..ed561f9696 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -424,7 +424,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'CMF' => 'CMF', '0C' => 'Crony', 'C1' => 'Crosscall', - '4W' => 'Crown', + '4W' => 'Crown Micro', 'CTR' => 'Ctroniq', 'CU' => 'Cube', 'CB' => 'CUBOT', diff --git a/Tests/fixtures/tablet-7.yml b/Tests/fixtures/tablet-7.yml index 2cf2eb90e9..821eca8b48 100644 --- a/Tests/fixtures/tablet-7.yml +++ b/Tests/fixtures/tablet-7.yml @@ -3773,7 +3773,7 @@ engine_version: 67.0.3396.87 device: type: tablet - brand: Crown + brand: Crown Micro model: Blossom B902 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tv-1.yml b/Tests/fixtures/tv-1.yml index ccd9e8ad54..7f37fb05d7 100644 --- a/Tests/fixtures/tv-1.yml +++ b/Tests/fixtures/tv-1.yml @@ -4926,7 +4926,7 @@ engine_version: 2.12.407 device: type: tv - brand: Crown + brand: Crown Micro model: "" os_family: GNU/Linux browser_family: Opera diff --git a/Tests/fixtures/tv-2.yml b/Tests/fixtures/tv-2.yml index 1141498ee4..600275d29e 100644 --- a/Tests/fixtures/tv-2.yml +++ b/Tests/fixtures/tv-2.yml @@ -7537,7 +7537,7 @@ engine_version: 53.0.2785.143 device: type: tv - brand: Crown + brand: Crown Micro model: Smart TV (2017) os_family: GNU/Linux browser_family: Opera diff --git a/Tests/fixtures/tv-4.yml b/Tests/fixtures/tv-4.yml index 08ed533b92..7c74b486a1 100644 --- a/Tests/fixtures/tv-4.yml +++ b/Tests/fixtures/tv-4.yml @@ -7586,7 +7586,7 @@ engine_version: 108.0.5359.128 device: type: tv - brand: Crown + brand: Crown Micro model: "" os_family: GNU/Linux browser_family: Opera diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 04b5781579..9e74dffef7 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -6944,8 +6944,8 @@ Walker: device: 'tv' model: '' -# Crown (https://www.crownindiatv.com/) -Crown: +# Crown Micro (https://www.crownindiatv.com/) +Crown Micro: regex: 'CROWN, ([a-z0-9_ -]+), (?:wired|wireless)|BlossomB902(?:[);/ ]|$)' device: 'tablet' models: diff --git a/regexes/device/televisions.yml b/regexes/device/televisions.yml index 765f7fbc9a..5a616da03e 100644 --- a/regexes/device/televisions.yml +++ b/regexes/device/televisions.yml @@ -208,8 +208,8 @@ CreNova: device: 'tv' model: 'CNV001' -# Crown (https://www.crownindiatv.com/) -Crown: +# Crown Micro (https://www.crownindiatv.com/) +Crown Micro: regex: 'CROWN[;,)]' device: 'tv' models: From 5adfba0c079f12ac96027dd128e85f68114079aa Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sun, 14 Sep 2025 10:03:16 +0300 Subject: [PATCH 56/77] DoCoMo (brand) to NTT DOCOMO --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/feature_phone.yml | 8 ++++---- regexes/device/mobiles.yml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index ed561f9696..4b9e11f4fb 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -494,7 +494,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'DM' => 'DMM', 'DMO' => 'DMOAO', 'DN' => 'DNS', - 'DC' => 'DoCoMo', + 'DC' => 'NTT DOCOMO', 'DF' => 'Doffler', 'D9' => 'Dolamee', 'DO' => 'Doogee', diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index 3af939060a..257cc1b9b7 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -1359,7 +1359,7 @@ engine_version: "" device: type: feature phone - brand: DoCoMo + brand: NTT DOCOMO model: SH2101V os_family: Unknown browser_family: Unknown @@ -1374,7 +1374,7 @@ engine_version: "" device: type: feature phone - brand: DoCoMo + brand: NTT DOCOMO model: D501i os_family: Unknown browser_family: Unknown @@ -1389,7 +1389,7 @@ engine_version: "" device: type: feature phone - brand: DoCoMo + brand: NTT DOCOMO model: F501i os_family: Unknown browser_family: Unknown @@ -1404,7 +1404,7 @@ engine_version: "" device: type: feature phone - brand: DoCoMo + brand: NTT DOCOMO model: P501i os_family: Unknown browser_family: Unknown diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 9e74dffef7..a7b1c8f10b 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -7856,8 +7856,8 @@ Digma: device: 'tv' model: 'DM-LED$1' -# DoCoMo -DoCoMo: +# NTT DOCOMO (https://www.docomo.ne.jp/english/) +NTT DOCOMO: regex: 'DoCoMo|\;FOMA|KGT/1\.0' device: 'feature phone' models: From 7b5a2b47bab3cdf42f7bfd7b449f7241bfb6e4d1 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sun, 14 Sep 2025 10:10:21 +0300 Subject: [PATCH 57/77] ECS to Elitegroup Computer Systems --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/tablet-1.yml | 10 +++++----- Tests/fixtures/tablet-10.yml | 2 +- Tests/fixtures/tablet-7.yml | 2 +- regexes/device/mobiles.yml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 4b9e11f4fb..44d93f5add 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -546,7 +546,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'YC' => 'EBEN', 'E4' => 'Echo Mobiles', 'EQ1' => 'Equator', - 'ES' => 'ECS', + 'ES' => 'Elitegroup Computer Systems', '35' => 'ECON', 'ECC' => 'ECOO', 'ZZ' => 'ecom', diff --git a/Tests/fixtures/tablet-1.yml b/Tests/fixtures/tablet-1.yml index 511af17acb..f14582162b 100644 --- a/Tests/fixtures/tablet-1.yml +++ b/Tests/fixtures/tablet-1.yml @@ -6257,7 +6257,7 @@ engine_version: 41.0.2272.96 device: type: tablet - brand: ECS + brand: Elitegroup Computer Systems model: TA10CA3 os_family: Android browser_family: Chrome @@ -6275,7 +6275,7 @@ engine_version: 33.0.1750.132 device: type: tablet - brand: ECS + brand: Elitegroup Computer Systems model: TM105 os_family: Android browser_family: Chrome @@ -6293,7 +6293,7 @@ engine_version: 34.0.1847.114 device: type: tablet - brand: ECS + brand: Elitegroup Computer Systems model: TM105A os_family: Android browser_family: Chrome @@ -6311,7 +6311,7 @@ engine_version: 35.0.1916.122 device: type: tablet - brand: ECS + brand: Elitegroup Computer Systems model: TR10CS1 os_family: Android browser_family: Chrome @@ -9025,7 +9025,7 @@ engine_version: "" device: type: tablet - brand: ECS + brand: Elitegroup Computer Systems model: TR10RS1 os_family: Android browser_family: Android Browser diff --git a/Tests/fixtures/tablet-10.yml b/Tests/fixtures/tablet-10.yml index 3ec5d004f9..2d53dcd2ad 100644 --- a/Tests/fixtures/tablet-10.yml +++ b/Tests/fixtures/tablet-10.yml @@ -265,7 +265,7 @@ engine_version: 42.0.2311.111 device: type: tablet - brand: ECS + brand: Elitegroup Computer Systems model: TR10CS2 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-7.yml b/Tests/fixtures/tablet-7.yml index 821eca8b48..a537acecc7 100644 --- a/Tests/fixtures/tablet-7.yml +++ b/Tests/fixtures/tablet-7.yml @@ -1039,7 +1039,7 @@ engine_version: 80.0.3987.119 device: type: tablet - brand: ECS + brand: Elitegroup Computer Systems model: TF10EA2 os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index a7b1c8f10b..1728993209 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -8194,8 +8194,8 @@ Echo Mobiles: - regex: 'ECHO[ _](HOLI|MAX|MOSS|NOTE|POWER|SMART|DUNE|JAVA|FUSION|PUSH|PRISM|STUDIO)' model: '$1' -# ECS -ECS: +# Elitegroup Computer Systems (https://www.ecs.com.tw/en) +Elitegroup Computer Systems: regex: '(?:TA10CA3|TM105A?|TR10[CR]S1|TF10EA2|TR10CS2)(?:[);/ ]|$)' device: 'tablet' models: From b83109831ccf5b48b62b7533567b46da29c7f3ac Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sun, 14 Sep 2025 10:16:52 +0300 Subject: [PATCH 58/77] EFT to EFT Group --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/peripheral.yml | 6 +++--- regexes/device/mobiles.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 44d93f5add..28f31eb689 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -555,7 +555,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'E6' => 'EE', 'GW' => 'EGL', 'EGO' => 'EGOTEK', - 'EFT' => 'EFT', + 'EFT' => 'EFT Group', 'EK' => 'EKO', 'EY' => 'Einstein', 'EM' => 'Eks Mobility', diff --git a/Tests/fixtures/peripheral.yml b/Tests/fixtures/peripheral.yml index dae66ef9f5..49e0a6473b 100644 --- a/Tests/fixtures/peripheral.yml +++ b/Tests/fixtures/peripheral.yml @@ -818,7 +818,7 @@ engine_version: 42.0.2311.111 device: type: peripheral - brand: EFT + brand: EFT Group model: H2 os_family: Android browser_family: Chrome @@ -1052,7 +1052,7 @@ engine_version: 106.0.0.0 device: type: peripheral - brand: EFT + brand: EFT Group model: H4 os_family: Android browser_family: Unknown @@ -1070,7 +1070,7 @@ engine_version: 106.0.0.0 device: type: peripheral - brand: EFT + brand: EFT Group model: H3 os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 1728993209..52402c85f1 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -41513,8 +41513,8 @@ Dinalink: - regex: 'Dynalink TV BOX(?:[);/ ]|$)' model: 'TV Box' -# EFT Group (eft-survey.ru) -EFT: +# EFT Group (https://eftgroup.ru) +EFT Group: regex: 'EFT_(H[234])(?:[);/ ]|$)' device: 'peripheral' model: '$1' From 9f788fbd9cd352f40e5f6912bafbf310d079bad7 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sun, 14 Sep 2025 10:57:55 +0300 Subject: [PATCH 59/77] F150 to IIIF150 --- Tests/fixtures/smartphone-22.yml | 2 +- Tests/fixtures/smartphone-24.yml | 2 +- Tests/fixtures/smartphone-27.yml | 2 +- Tests/fixtures/smartphone-28.yml | 2 +- Tests/fixtures/smartphone-31.yml | 2 +- Tests/fixtures/smartphone-33.yml | 2 +- Tests/fixtures/smartphone-34.yml | 4 ++-- Tests/fixtures/smartphone-35.yml | 2 +- Tests/fixtures/smartphone-37.yml | 2 +- Tests/fixtures/smartphone-38.yml | 4 ++-- Tests/fixtures/smartphone-39.yml | 6 +++--- Tests/fixtures/smartphone-40.yml | 4 ++-- Tests/fixtures/smartphone-41.yml | 4 ++-- Tests/fixtures/smartphone-42.yml | 2 +- regexes/device/mobiles.yml | 4 ++-- 15 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Tests/fixtures/smartphone-22.yml b/Tests/fixtures/smartphone-22.yml index 97e559ee38..ec04d8c254 100644 --- a/Tests/fixtures/smartphone-22.yml +++ b/Tests/fixtures/smartphone-22.yml @@ -1921,7 +1921,7 @@ engine_version: 87.0.4280.141 device: type: smartphone - brand: F150 + brand: IIIF150 model: B2021 os_family: Android browser_family: Unknown diff --git a/Tests/fixtures/smartphone-24.yml b/Tests/fixtures/smartphone-24.yml index e957d54a1f..0077bd6825 100644 --- a/Tests/fixtures/smartphone-24.yml +++ b/Tests/fixtures/smartphone-24.yml @@ -8885,7 +8885,7 @@ engine_version: 91.0.4472.101 device: type: smartphone - brand: F150 + brand: IIIF150 model: B2021 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-27.yml b/Tests/fixtures/smartphone-27.yml index 6159f994fa..08ce202b01 100644 --- a/Tests/fixtures/smartphone-27.yml +++ b/Tests/fixtures/smartphone-27.yml @@ -5515,7 +5515,7 @@ engine_version: 94.0.4606.85 device: type: smartphone - brand: F150 + brand: IIIF150 model: R2022 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-28.yml b/Tests/fixtures/smartphone-28.yml index abcda34c7b..28e11bea44 100644 --- a/Tests/fixtures/smartphone-28.yml +++ b/Tests/fixtures/smartphone-28.yml @@ -9417,7 +9417,7 @@ engine_version: 97.0.4692.98 device: type: smartphone - brand: F150 + brand: IIIF150 model: H2022 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-31.yml b/Tests/fixtures/smartphone-31.yml index 9f1a64c5de..cdc24c7772 100644 --- a/Tests/fixtures/smartphone-31.yml +++ b/Tests/fixtures/smartphone-31.yml @@ -6561,7 +6561,7 @@ engine_version: 102.0.5005.148 device: type: smartphone - brand: F150 + brand: IIIF150 model: Air1 Pro os_family: Android browser_family: Unknown diff --git a/Tests/fixtures/smartphone-33.yml b/Tests/fixtures/smartphone-33.yml index 117fb12c23..a62e385a4b 100644 --- a/Tests/fixtures/smartphone-33.yml +++ b/Tests/fixtures/smartphone-33.yml @@ -121,7 +121,7 @@ engine_version: 106.0.0.0 device: type: smartphone - brand: F150 + brand: IIIF150 model: Air1 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-34.yml b/Tests/fixtures/smartphone-34.yml index 8c0a8c9a4c..dedb018eb4 100644 --- a/Tests/fixtures/smartphone-34.yml +++ b/Tests/fixtures/smartphone-34.yml @@ -67,7 +67,7 @@ engine_version: 107.0.0.0 device: type: smartphone - brand: F150 + brand: IIIF150 model: B1 Pro os_family: Android browser_family: Chrome @@ -3427,7 +3427,7 @@ engine_version: 108.0.0.0 device: type: smartphone - brand: F150 + brand: IIIF150 model: Air1 Ultra os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-35.yml b/Tests/fixtures/smartphone-35.yml index 53e1b18ad3..2350900af8 100644 --- a/Tests/fixtures/smartphone-35.yml +++ b/Tests/fixtures/smartphone-35.yml @@ -4645,7 +4645,7 @@ engine_version: 110.0.0.0 device: type: smartphone - brand: F150 + brand: IIIF150 model: Air1 Ultra+ os_family: Android browser_family: Unknown diff --git a/Tests/fixtures/smartphone-37.yml b/Tests/fixtures/smartphone-37.yml index 3b7bd08ff9..b04f4e4c78 100644 --- a/Tests/fixtures/smartphone-37.yml +++ b/Tests/fixtures/smartphone-37.yml @@ -4881,7 +4881,7 @@ engine_version: 108.0.0.0 device: type: smartphone - brand: F150 + brand: IIIF150 model: Air1 Ultra Pro os_family: Android browser_family: Unknown diff --git a/Tests/fixtures/smartphone-38.yml b/Tests/fixtures/smartphone-38.yml index 32a40976e5..67a83356fe 100644 --- a/Tests/fixtures/smartphone-38.yml +++ b/Tests/fixtures/smartphone-38.yml @@ -4987,7 +4987,7 @@ engine_version: 120.0.6099.90 device: type: smartphone - brand: F150 + brand: IIIF150 model: B2 Ultra os_family: Android browser_family: Unknown @@ -5005,7 +5005,7 @@ engine_version: 120.0.6099.94 device: type: smartphone - brand: F150 + brand: IIIF150 model: B2 Pro os_family: Android browser_family: Unknown diff --git a/Tests/fixtures/smartphone-39.yml b/Tests/fixtures/smartphone-39.yml index 7a00fabe40..5b53e69861 100644 --- a/Tests/fixtures/smartphone-39.yml +++ b/Tests/fixtures/smartphone-39.yml @@ -8433,7 +8433,7 @@ engine_version: 76.0.3809.111 device: type: smartphone - brand: F150 + brand: IIIF150 model: Raptor LTD os_family: Android browser_family: Chrome @@ -8451,7 +8451,7 @@ engine_version: 122.0.6261.300 device: type: smartphone - brand: F150 + brand: IIIF150 model: Raptor LTD os_family: Android browser_family: Unknown @@ -8595,7 +8595,7 @@ engine_version: 124.0.6367.1853 device: type: smartphone - brand: F150 + brand: IIIF150 model: Air2 Ultra os_family: Android browser_family: Unknown diff --git a/Tests/fixtures/smartphone-40.yml b/Tests/fixtures/smartphone-40.yml index c7cffef638..a5e651a823 100644 --- a/Tests/fixtures/smartphone-40.yml +++ b/Tests/fixtures/smartphone-40.yml @@ -3629,7 +3629,7 @@ engine_version: 124.0.6367.98 device: type: smartphone - brand: F150 + brand: IIIF150 model: B1 os_family: Android browser_family: Unknown @@ -3647,7 +3647,7 @@ engine_version: 76.0.3809.111 device: type: smartphone - brand: F150 + brand: IIIF150 model: B2 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-41.yml b/Tests/fixtures/smartphone-41.yml index 511c287b0b..424fb1fe08 100644 --- a/Tests/fixtures/smartphone-41.yml +++ b/Tests/fixtures/smartphone-41.yml @@ -6838,7 +6838,7 @@ engine_version: 135.0.0.0 device: type: smartphone - brand: F150 + brand: IIIF150 model: Raptor LTD os_family: Android browser_family: Chrome @@ -6856,7 +6856,7 @@ engine_version: 134.0.6998.261 device: type: smartphone - brand: F150 + brand: IIIF150 model: Raptor 5G os_family: Android browser_family: Unknown diff --git a/Tests/fixtures/smartphone-42.yml b/Tests/fixtures/smartphone-42.yml index 5764238114..33d7a1cde0 100644 --- a/Tests/fixtures/smartphone-42.yml +++ b/Tests/fixtures/smartphone-42.yml @@ -4127,7 +4127,7 @@ engine_version: 136.0.7103.102 device: type: smartphone - brand: F150 + brand: IIIF150 model: Action A5 Pro os_family: Android browser_family: Unknown diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 52402c85f1..e5d51d0b96 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -37903,8 +37903,8 @@ Hitech: device: 'smartphone' model: '$1' -# F150 or iiiF150 or ANT DAO TECHNOLOGY LIMITED (sub brand Oukitel) (iif150.com) -F150: +# F150 or IIIF150 or ANT DAO TECHNOLOGY LIMITED (sub brand Oukitel) (https://www.iiif150.com, about page uses "IIIF150" name) +IIIF150: regex: '(?:Bison2021|B2021|[HR]2022|Air1 Pro| Air1| B[12] Pro|(?:B2|Air2) Ultra|Action A5Pro|Raptor (?:5G|LTD)|Android 12(?:[\d.]*);(?: [\w-]+;)? (?:B1)|Android 1[34](?:[\d.]*);(?: [\w-]+;)? (?:Raptor|B2))(?:[);/ ]|$)' device: 'smartphone' models: From 32a0933d99541eb80553f9df3e32e05e80198c4d Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sun, 14 Sep 2025 10:58:51 +0300 Subject: [PATCH 60/77] Famous to Famous Fones --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/smartphone-30.yml | 6 +++--- Tests/fixtures/smartphone-34.yml | 2 +- Tests/fixtures/tablet-7.yml | 2 +- regexes/device/mobiles.yml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 28f31eb689..1ad3d17800 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -637,7 +637,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'FA1' => 'Facime', 'FA' => 'Fairphone', 'FM' => 'Famoco', - 'FAM' => 'Famous', + 'FAM' => 'Famous Fones', '17' => 'FarEasTone', '9R' => 'FaRao Pro', 'FAR' => 'Farassoo', diff --git a/Tests/fixtures/smartphone-30.yml b/Tests/fixtures/smartphone-30.yml index b94f56e614..c5821299d4 100644 --- a/Tests/fixtures/smartphone-30.yml +++ b/Tests/fixtures/smartphone-30.yml @@ -10251,7 +10251,7 @@ engine_version: 100.0.4896.127 device: type: smartphone - brand: Famous + brand: Famous Fones model: "5" os_family: Android browser_family: Chrome @@ -10269,7 +10269,7 @@ engine_version: 83.0.4103.106 device: type: smartphone - brand: Famous + brand: Famous Fones model: Red 5 Plus os_family: Android browser_family: Chrome @@ -10287,7 +10287,7 @@ engine_version: 96.0.4664.104 device: type: smartphone - brand: Famous + brand: Famous Fones model: 5 Plus os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-34.yml b/Tests/fixtures/smartphone-34.yml index dedb018eb4..d7b49bc532 100644 --- a/Tests/fixtures/smartphone-34.yml +++ b/Tests/fixtures/smartphone-34.yml @@ -8067,7 +8067,7 @@ engine_version: 96.0.4664.104 device: type: smartphone - brand: Famous + brand: Famous Fones model: Red Royal Edition os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-7.yml b/Tests/fixtures/tablet-7.yml index a537acecc7..1f3e9597de 100644 --- a/Tests/fixtures/tablet-7.yml +++ b/Tests/fixtures/tablet-7.yml @@ -6273,7 +6273,7 @@ engine_version: 94.0.4606.71 device: type: tablet - brand: Famous + brand: Famous Fones model: Tab 10 os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index e5d51d0b96..6fa510704b 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -40514,7 +40514,7 @@ TTK: model: 'SB-214' # Famous or Famous Fones -Famous: +Famous Fones: regex: 'Famous|Red Royal Edition' device: 'smartphone' models: From 050033b43513cff03beb9ddfc9bb62afb1087062 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sun, 14 Sep 2025 11:01:19 +0300 Subject: [PATCH 61/77] FFF SmartLife to FFF Smart Life Connected --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/tablet-9.yml | 2 +- regexes/device/mobiles.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 1ad3d17800..48375ffb0f 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -695,7 +695,7 @@ abstract class AbstractDeviceParser extends AbstractParser '4F' => 'Funai', '5J' => 'Fusion5', 'FF' => 'Future Mobile Technology', - 'FFF' => 'FFF SmartLife', + 'FFF' => 'FFF Smart Life Connected', 'FW' => 'FNF', 'FXT' => 'Fxtec', 'GT' => 'G-TiDE', diff --git a/Tests/fixtures/tablet-9.yml b/Tests/fixtures/tablet-9.yml index ee59004d3f..96857ddb65 100644 --- a/Tests/fixtures/tablet-9.yml +++ b/Tests/fixtures/tablet-9.yml @@ -4711,7 +4711,7 @@ engine_version: 109.0.0.0 device: type: tablet - brand: FFF SmartLife + brand: FFF Smart Life Connected model: TAB-10A4 os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 6fa510704b..84a8f964d7 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -42465,8 +42465,8 @@ BenWee: - regex: 'BenWee[ _-]?([^;/)]+)(?: Build|[;)])' model: '$1' -# FFF or FFF Smart Life Connected (www.fff-no1.co.jp) -FFF SmartLife: +# FFF or FFF Smart Life Connected (https://www.fff-no1.co.jp) +FFF Smart Life Connected: regex: '(?:FFFTAB10a4)(?:[);/ ]|$)' device: 'tablet' model: 'TAB-10A4' From 64dc7d34937fdf5cdcc44e798d90d0094b8470bd Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sun, 14 Sep 2025 11:02:14 +0300 Subject: [PATCH 62/77] Figgers to Figgers Communication --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/smartphone-33.yml | 4 ++-- regexes/device/mobiles.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 48375ffb0f..f7f2468602 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -649,7 +649,7 @@ abstract class AbstractDeviceParser extends AbstractParser '67' => 'FEONAL', 'FI' => 'FiGO', 'J9' => 'FiGi', - 'FIG' => 'Figgers', + 'FIG' => 'Figgers Communication', 'F9' => 'FiiO', 'F1' => 'FinePower', 'FX' => 'Finlux', diff --git a/Tests/fixtures/smartphone-33.yml b/Tests/fixtures/smartphone-33.yml index a62e385a4b..d65b2924e8 100644 --- a/Tests/fixtures/smartphone-33.yml +++ b/Tests/fixtures/smartphone-33.yml @@ -2101,7 +2101,7 @@ engine_version: 102.0.5005.125 device: type: smartphone - brand: Figgers + brand: Figgers Communication model: F3 os_family: Android browser_family: Chrome @@ -2119,7 +2119,7 @@ engine_version: 105.0.0.0 device: type: smartphone - brand: Figgers + brand: Figgers Communication model: DragonX os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 84a8f964d7..20b03a0faf 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -41687,8 +41687,8 @@ Rizzen: device: 'tablet' model: '$1' -# Figgers (www.figgers.com) -Figgers: +# Figgers Communication (www.figgers.com) +Figgers Communication: regex: 'Figgers' device: 'smartphone' models: From d2668e39f0431eb2fd57c665bd5267a996db4ba3 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sun, 14 Sep 2025 11:07:10 +0300 Subject: [PATCH 63/77] FMT to Future Mobile Technology --- Parser/Device/AbstractDeviceParser.php | 3 +-- Tests/fixtures/phablet.yml | 8 ++++---- Tests/fixtures/smartphone-22.yml | 12 ++++++------ Tests/fixtures/smartphone-30.yml | 4 ++-- Tests/fixtures/smartphone-31.yml | 2 +- Tests/fixtures/smartphone-32.yml | 4 ++-- Tests/fixtures/smartphone-34.yml | 4 ++-- Tests/fixtures/smartphone-35.yml | 2 +- Tests/fixtures/smartphone-36.yml | 8 ++++---- Tests/fixtures/tablet-12.yml | 2 +- Tests/fixtures/tablet-8.yml | 2 +- regexes/device/mobiles.yml | 16 ++++++---------- 12 files changed, 31 insertions(+), 36 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index f7f2468602..a20606f62f 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -648,7 +648,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'F7' => 'Fero', '67' => 'FEONAL', 'FI' => 'FiGO', - 'J9' => 'FiGi', + 'J9' => 'FIGI Mobile', 'FIG' => 'Figgers Communication', 'F9' => 'FiiO', 'F1' => 'FinePower', @@ -687,7 +687,6 @@ abstract class AbstractDeviceParser extends AbstractParser 'FEY' => 'FreeYond', 'FRU' => 'Frunsi', 'F4' => 'F&U', - '1F' => 'FMT', 'FPT' => 'FPT', 'FG' => 'Fuego', 'FUJ' => 'FUJICOM', diff --git a/Tests/fixtures/phablet.yml b/Tests/fixtures/phablet.yml index a2e84bc8b3..b526c31574 100644 --- a/Tests/fixtures/phablet.yml +++ b/Tests/fixtures/phablet.yml @@ -7990,7 +7990,7 @@ engine_version: 96.0.4664.104 device: type: phablet - brand: FiGi + brand: FIGI Mobile model: Note 7 Pro os_family: Android browser_family: Chrome @@ -8098,7 +8098,7 @@ engine_version: 97.0.4692.87 device: type: phablet - brand: FiGi + brand: FIGI Mobile model: Note 3 Pro os_family: Android browser_family: Chrome @@ -8116,7 +8116,7 @@ engine_version: 97.0.4692.98 device: type: phablet - brand: FiGi + brand: FIGI Mobile model: Note 11 Pro os_family: Android browser_family: Chrome @@ -8582,7 +8582,7 @@ engine_version: 88.0.4324.181 device: type: phablet - brand: FiGi + brand: FIGI Mobile model: Note 1 Lite os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-22.yml b/Tests/fixtures/smartphone-22.yml index ec04d8c254..82a359673d 100644 --- a/Tests/fixtures/smartphone-22.yml +++ b/Tests/fixtures/smartphone-22.yml @@ -9901,7 +9901,7 @@ engine_version: 81.0.4044.117 device: type: smartphone - brand: FMT + brand: Future Mobile Technology model: Netsurfer Storm os_family: Android browser_family: Chrome @@ -9919,7 +9919,7 @@ engine_version: 72.0.3626.121 device: type: smartphone - brand: FMT + brand: Future Mobile Technology model: Flash os_family: Android browser_family: Chrome @@ -9937,7 +9937,7 @@ engine_version: 79.0.3945.116 device: type: smartphone - brand: FMT + brand: Future Mobile Technology model: Falcon os_family: Android browser_family: Chrome @@ -9955,7 +9955,7 @@ engine_version: 79.0.3945.93 device: type: smartphone - brand: FMT + brand: Future Mobile Technology model: B52 os_family: Android browser_family: Chrome @@ -9973,7 +9973,7 @@ engine_version: 74.0.3729.157 device: type: smartphone - brand: FMT + brand: Future Mobile Technology model: Tomcat os_family: Android browser_family: Chrome @@ -9991,7 +9991,7 @@ engine_version: 79.0.3945.79 device: type: smartphone - brand: FMT + brand: Future Mobile Technology model: Viper os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-30.yml b/Tests/fixtures/smartphone-30.yml index c5821299d4..8c448835cb 100644 --- a/Tests/fixtures/smartphone-30.yml +++ b/Tests/fixtures/smartphone-30.yml @@ -6219,7 +6219,7 @@ engine_version: 80.0.3987.149 device: type: smartphone - brand: FiGi + brand: FIGI Mobile model: Nopal os_family: Android browser_family: Chrome @@ -6687,7 +6687,7 @@ engine_version: 85.0.4183.81 device: type: smartphone - brand: FiGi + brand: FIGI Mobile model: Mtwo os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-31.yml b/Tests/fixtures/smartphone-31.yml index cdc24c7772..bca2a8cd02 100644 --- a/Tests/fixtures/smartphone-31.yml +++ b/Tests/fixtures/smartphone-31.yml @@ -5391,7 +5391,7 @@ engine_version: 81.0.4044.138 device: type: smartphone - brand: FiGi + brand: FIGI Mobile model: Fj os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-32.yml b/Tests/fixtures/smartphone-32.yml index 880f4f6e0b..e4d64f276c 100644 --- a/Tests/fixtures/smartphone-32.yml +++ b/Tests/fixtures/smartphone-32.yml @@ -139,7 +139,7 @@ engine_version: 84.0.4147.89 device: type: smartphone - brand: FiGi + brand: FIGI Mobile model: Gtwo os_family: Android browser_family: Chrome @@ -715,7 +715,7 @@ engine_version: 76.0.3809.89 device: type: smartphone - brand: FiGi + brand: FIGI Mobile model: Ftwo os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-34.yml b/Tests/fixtures/smartphone-34.yml index d7b49bc532..5f042f20b7 100644 --- a/Tests/fixtures/smartphone-34.yml +++ b/Tests/fixtures/smartphone-34.yml @@ -2167,7 +2167,7 @@ engine_version: 108.0.0.0 device: type: smartphone - brand: FiGi + brand: FIGI Mobile model: Note 1C os_family: Android browser_family: Chrome @@ -9283,7 +9283,7 @@ engine_version: 68.0.3440.106 device: type: smartphone - brand: FMT + brand: Future Mobile Technology model: Global3 B01 os_family: Android browser_family: Safari diff --git a/Tests/fixtures/smartphone-35.yml b/Tests/fixtures/smartphone-35.yml index 2350900af8..762424408c 100644 --- a/Tests/fixtures/smartphone-35.yml +++ b/Tests/fixtures/smartphone-35.yml @@ -7993,7 +7993,7 @@ engine_version: 79.0.3945.93 device: type: smartphone - brand: FiGi + brand: FIGI Mobile model: Hola os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-36.yml b/Tests/fixtures/smartphone-36.yml index fcab798efb..bc06f1b529 100644 --- a/Tests/fixtures/smartphone-36.yml +++ b/Tests/fixtures/smartphone-36.yml @@ -3937,7 +3937,7 @@ engine_version: 112.0.0.0 device: type: smartphone - brand: FiGi + brand: FIGI Mobile model: Note 5 os_family: Android browser_family: Unknown @@ -6233,7 +6233,7 @@ engine_version: 77.0.3865.120 device: type: smartphone - brand: FiGi + brand: FIGI Mobile model: P40 Max os_family: Android browser_family: Unknown @@ -6251,7 +6251,7 @@ engine_version: 77.0.3865.120 device: type: smartphone - brand: FiGi + brand: FIGI Mobile model: P40 os_family: Android browser_family: Unknown @@ -6269,7 +6269,7 @@ engine_version: 62.0.3202.84 device: type: smartphone - brand: FiGi + brand: FIGI Mobile model: FSE1020 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-12.yml b/Tests/fixtures/tablet-12.yml index a57bdad899..6043e2a892 100644 --- a/Tests/fixtures/tablet-12.yml +++ b/Tests/fixtures/tablet-12.yml @@ -5215,7 +5215,7 @@ engine_version: 86.0.4240.198 device: type: tablet - brand: FMT + brand: Future Mobile Technology model: FunPad 8 Max os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-8.yml b/Tests/fixtures/tablet-8.yml index 8ad7e62125..7db2359492 100644 --- a/Tests/fixtures/tablet-8.yml +++ b/Tests/fixtures/tablet-8.yml @@ -8179,7 +8179,7 @@ engine_version: 81.0.4044.117 device: type: tablet - brand: FMT + brand: Future Mobile Technology model: FXT113R os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 20b03a0faf..07f521fbba 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -38430,8 +38430,8 @@ WIWA: model: 'Dream Player TV' # FMT OR Future Mobile Technology -FMT: - regex: '(?:16M4HI105024|FMT-NM7058-02|FXT113R|176HS1050(?:232|531)|175WT1050231|175HS1050231|175FT1050241|Global3 B01|FunPad-8Max)(?:[);/ ]|$)' +Future Mobile Technology: + regex: '(?:16M4HI105024|FMT-NM7058-02|FXT810R|FXT113R|176HS1050(?:232|531)|175WT1050231|175HS1050231|175FT1050241|Global3 B01|FunPad-8Max)(?:[);/ ]|$)' device: 'smartphone' models: - regex: '16M4HI105024' @@ -38450,6 +38450,8 @@ FMT: model: 'Tomcat' - regex: '175FT1050241' model: 'Viper' + - regex: '(FXT810R)(?:[);/ ]|$)' + model: '$1' - regex: '(FXT113R)' device: 'tablet' model: '$1' @@ -39836,8 +39838,8 @@ VEON: device: 'tv' model: '$1' -# FiGi (figi-mobile.com) -FiGi: +# FIGI Mobile (figi-mobile.com, but it's defunct) +FIGI Mobile: regex: 'FIGI[_ ]|(?:Note_(?:[37]|11)_Pro|Note_(?:1C|5)|Note_1_Lite|Nopal|[MGF]two|Hola)(?:[);/ ]|$)|Android 8(?:[\d.]*);(?: [\w-]+;)? Fj(?: Build|[;)])' device: 'smartphone' models: @@ -40399,12 +40401,6 @@ AYYA: - regex: 'Ayat101' model: 'Ayat 101' -# Future Mobile Technology -Future Mobile Technology: - regex: '(FXT810R)(?:[);/ ]|$)' - device: 'smartphone' - model: '$1' - # MBK (byterg.com) MBK: regex: '(MBK-T2101)(?:[);/ ]|$)' From 9004a89278d42970d591f4932adc35152a4ae209 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sun, 14 Sep 2025 11:09:55 +0300 Subject: [PATCH 64/77] Gemini to Gemini Devices --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/tablet-1.yml | 10 +++++----- regexes/device/mobiles.yml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index a20606f62f..5759ea21d4 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -714,7 +714,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'GAL' => 'Gazal', 'GEA' => 'Geanee', 'GEN' => 'Geant', - 'GD' => 'Gemini', + 'GD' => 'Gemini Devices', 'GN' => 'General Mobile', '2G' => 'Genesis', 'GEP' => 'Geo Phone', diff --git a/Tests/fixtures/tablet-1.yml b/Tests/fixtures/tablet-1.yml index f14582162b..5767ce6b9d 100644 --- a/Tests/fixtures/tablet-1.yml +++ b/Tests/fixtures/tablet-1.yml @@ -7499,7 +7499,7 @@ engine_version: "534.30" device: type: tablet - brand: Gemini + brand: Gemini Devices model: GEM10313BK os_family: Android browser_family: Android Browser @@ -7517,7 +7517,7 @@ engine_version: "534.30" device: type: tablet - brand: Gemini + brand: Gemini Devices model: GEM10313S os_family: Android browser_family: Android Browser @@ -7535,7 +7535,7 @@ engine_version: "534.30" device: type: tablet - brand: Gemini + brand: Gemini Devices model: GEM7008 os_family: Android browser_family: Android Browser @@ -7553,7 +7553,7 @@ engine_version: "534.30" device: type: tablet - brand: Gemini + brand: Gemini Devices model: GEM7020 os_family: Android browser_family: Android Browser @@ -7571,7 +7571,7 @@ engine_version: "535.19" device: type: tablet - brand: Gemini + brand: Gemini Devices model: GEM7032G os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 07f521fbba..ea653c792e 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -9659,8 +9659,8 @@ G-TiDE: device: 'tablet' model: '$1' -# Gemini -Gemini: +# Gemini Devices +Gemini Devices: regex: '(GEM[0-9]+[a-z]*)' device: 'tablet' model: '$1' From b0cecd5024ce9cbafb912b32d042665b2cf22833 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sun, 14 Sep 2025 11:39:19 +0300 Subject: [PATCH 65/77] =?UTF-8?q?GroBerwert=20to=20Gro=C3=9Ferwert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/tablet-9.yml | 2 +- regexes/device/mobiles.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 5759ea21d4..c207677e1b 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -767,7 +767,7 @@ abstract class AbstractDeviceParser extends AbstractParser '3G' => 'Greentel', 'GRO' => 'Green Orange', 'GRL' => 'Green Lion', - 'GR1' => 'GroBerwert', + 'GR1' => 'Großerwert', 'GF' => 'Gretel', '82' => 'Gresso', 'GRB' => 'Grünberg', diff --git a/Tests/fixtures/tablet-9.yml b/Tests/fixtures/tablet-9.yml index 96857ddb65..3820fa806d 100644 --- a/Tests/fixtures/tablet-9.yml +++ b/Tests/fixtures/tablet-9.yml @@ -9623,7 +9623,7 @@ engine_version: 91.0.4472.101 device: type: tablet - brand: GroBerwert + brand: Großerwert model: HD7 os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index ea653c792e..e232947158 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -42973,8 +42973,8 @@ BAFF: - regex: '(?:BAFF)?(\d{2})Y-?(STV(?:-R)?|HD-R)' model: '$1Y $2' -# GroBerwert -GroBerwert: +# Großerwert (http://groberwert.sistemairis.net/) +Großerwert: regex: 'GroBerwert[ _]?(HD7)(?:[);/ ]|$)' device: 'tablet' model: '$1' From 00a55e05b8efc9be3a4b594c3c3204dbf202c47e Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sun, 14 Sep 2025 11:43:36 +0300 Subject: [PATCH 66/77] H96 to H96 Max --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/tv-1.yml | 28 +++++++++++++------------- Tests/fixtures/tv-2.yml | 2 +- Tests/fixtures/tv-4.yml | 4 ++-- regexes/device/mobiles.yml | 14 ++++++------- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index c207677e1b..78da50a848 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -777,7 +777,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'CUD' => 'CUD', 'GVC' => 'GVC Pro', 'H13' => 'H133', - '9Z' => 'H96', + '9Z' => 'H96 Max', 'HF' => 'Hafury', '9F' => 'HAOVM', 'HAQ' => 'HAOQIN', diff --git a/Tests/fixtures/tv-1.yml b/Tests/fixtures/tv-1.yml index 7f37fb05d7..18aab2d279 100644 --- a/Tests/fixtures/tv-1.yml +++ b/Tests/fixtures/tv-1.yml @@ -3335,8 +3335,8 @@ engine_version: 96.0.4664.104 device: type: tv - brand: H96 - model: Max + brand: H96 Max + model: '' os_family: Android browser_family: Chrome - @@ -3353,8 +3353,8 @@ engine_version: 78.0.3904.108 device: type: tv - brand: H96 - model: Max RK3318 + brand: H96 Max + model: RK3318 os_family: Android browser_family: Unknown - @@ -4962,8 +4962,8 @@ engine_version: 92.0.4515.166 device: type: tv - brand: H96 - model: Max X2 + brand: H96 Max + model: X2 os_family: Android browser_family: Opera - @@ -6850,8 +6850,8 @@ engine_version: 100.0.4896.127 device: type: tv - brand: H96 - model: Max RK3318 + brand: H96 Max + model: RK3318 os_family: Android browser_family: Chrome - @@ -8908,8 +8908,8 @@ engine_version: 106.0.0.0 device: type: tv - brand: H96 - model: Max RK3566 + brand: H96 Max + model: RK3566 os_family: Android browser_family: Chrome - @@ -8926,8 +8926,8 @@ engine_version: 106.0.0.0 device: type: tv - brand: H96 - model: Max RK3318 + brand: H96 Max + model: RK3318 os_family: Android browser_family: Chrome - @@ -8944,8 +8944,8 @@ engine_version: 106.0.0.0 device: type: tv - brand: H96 - model: Max V11 + brand: H96 Max + model: V11 os_family: Android browser_family: Chrome - diff --git a/Tests/fixtures/tv-2.yml b/Tests/fixtures/tv-2.yml index 600275d29e..ed8c566e10 100644 --- a/Tests/fixtures/tv-2.yml +++ b/Tests/fixtures/tv-2.yml @@ -6591,7 +6591,7 @@ version: "20.2" device: type: tv - brand: H96 + brand: H96 Max model: Pro+ os_family: Android browser_family: Unknown diff --git a/Tests/fixtures/tv-4.yml b/Tests/fixtures/tv-4.yml index 7c74b486a1..7b8deaaca8 100644 --- a/Tests/fixtures/tv-4.yml +++ b/Tests/fixtures/tv-4.yml @@ -2699,7 +2699,7 @@ engine_version: 112.0.0.0 device: type: tv - brand: H96 + brand: H96 Max model: Mini H8 os_family: Android browser_family: Chrome @@ -2717,7 +2717,7 @@ engine_version: 95.0.4638.74 device: type: tv - brand: H96 + brand: H96 Max model: Plus os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index e232947158..4c34778af0 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -10362,19 +10362,19 @@ H133: - regex: 'Betacrux(?:[);/ ]|$)' model: 'Betacrux' -# H96 (https://www.h96tvbox.com/) -H96: +# H96 Max (https://www.h96tvbox.com/) +H96 Max: regex: 'H96[ _]?(?:Max|mini H8|plus|PRO\+)' device: 'tv' models: - regex: '(?:H96[_ ]?)?Max[ _]RK(\d{4})(?:[);/ ]|$)' - model: 'Max RK$1' - - regex: 'Max X2(?:[);/ ]|$)' - model: 'Max X2' + model: 'RK$1' + - regex: 'X2(?:[);/ ]|$)' + model: 'X2' - regex: 'H96[_ ]Max[ _]V11(?:[);/ ]|$)' - model: 'Max V11' + model: 'V11' - regex: 'Max(?:[);/ ]|$)' - model: 'Max' + model: '' - regex: 'mini H8(?:[);/ ]|$)' model: 'Mini H8' - regex: 'H96plus(?:[);/ ]|$)' From d9c75b6342f242091c1433fcefce6c605cc53dea Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sun, 21 Sep 2025 20:37:37 +0300 Subject: [PATCH 67/77] Regex adjustments --- regexes/device/mobiles.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 4c34778af0..9c7fc4db94 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -17423,7 +17423,7 @@ Sagem: Coby: regex: '(MID(?:1024|112[56]|1045|1048|106[05]|4331|701[26]|7015A?|70[32]2|703[56]|704[278]|7052|7065|7120|8024|80[47]2|8048|8065|8125|812[78]|9724|974[02])|CTB761)(?:[);/ ]|$)' device: 'tablet' - model: '$1' + model: 'Kyros $1' # Mpman (mpmaneurope.com) Mpman: @@ -21882,14 +21882,14 @@ PCBOX: device: 'tablet' model: 'Kova Plus T735' -# PCD or PCD Argentina (https://pcdlatam.com/) +# PCD (https://pcdlatam.com/) PCD: - regex: '(?:PCD[ _])?(?:PL5507|PL571US|PH3501|PH400[12]|E400)(?:[);/ ]|$)' + regex: '(?:PCD[ _])?(?:PL5507|PL571US|PH3501|PH400[12]|E400|PL620)(?:[);/ ]|$)' device: 'smartphone' models: - regex: 'PL571US' model: 'Jaguar Pro II' - - regex: '(?:PCD[ _])?(P[HL]\d{4}|E400)' + - regex: '(?:PCD[ _])?(P[HL]\d{4}|E400|PL620)' model: '$1' # PCD Argentina @@ -33960,8 +33960,6 @@ Positivo BGH: model: 'Mini I' - regex: 'JOY X2' model: 'Joy X2' - - regex: 'BGH ([^/;)]+)(?: Build|[;)])' - model: '$1' - regex: '(T1060B|KC770|G1101T)(?:[);/ ]|$)' device: 'tablet' @@ -33981,6 +33979,8 @@ Positivo BGH: - regex: 'Y710 KIDS' device: 'tablet' model: 'Y710 Kids' + - regex: 'BGH ([^/;)]+)(?: Build|[;)])' + model: '$1' # Maxtron Maxtron: From 1bc3dddf1e46fd78dc6689f5ef7aa31d713576c4 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sun, 21 Sep 2025 20:55:29 +0300 Subject: [PATCH 68/77] Regex correction --- regexes/device/mobiles.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 9c7fc4db94..3cfe4647b0 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -21894,12 +21894,12 @@ PCD: # PCD Argentina PCD Argentina: - regex: 'PCD[ ]?50[689]|(?:PL620|P63L)(?:[);/ ]|$)' + regex: 'PCD[ ]?50[689]|(?:P63L)(?:[);/ ]|$)' device: 'smartphone' models: - regex: 'PCD[ ]?(50[689])' model: '$1' - - regex: '(PL620|P63L)' + - regex: '(P63L)' model: '$1' # ArmPhone From 6ea9333b7109077d60b5e1f06e19ea55b72b34a9 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Sun, 21 Sep 2025 22:14:58 +0300 Subject: [PATCH 69/77] Fixing tests --- Parser/Device/AbstractDeviceParser.php | 12 ++++++------ regexes/device/mobiles.yml | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 78da50a848..c8e2cc7397 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -630,7 +630,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'UF' => 'EYU', 'EYE' => 'Eyemoo', 'UE1' => 'UE', - '5F' => 'F150', + '5F' => 'IIIF150', 'FPS' => 'F+', 'F6' => 'Facebook', 'FAC' => 'Facetel', @@ -1162,7 +1162,7 @@ abstract class AbstractDeviceParser extends AbstractParser '28' => 'MBOX', 'FK' => 'MBI International', 'MBK' => 'MBK', - '3D' => 'MDC Store', + '3D' => 'MDC', '1Y' => 'MDTV', '09' => 'meanIT', 'M3' => 'Mecer', @@ -1234,7 +1234,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'MOX' => 'Moxee', 'MM' => 'Mpman', 'MZ' => 'MSI', - '3R' => 'MStar', + '3R' => 'MStar Semiconductor', 'M9' => 'MTC', 'N4' => 'MTN', '72' => 'M-Tech', @@ -1417,7 +1417,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'PRA' => 'Pacific Research Alliance', 'PAG' => 'PAGRAER', 'PAD' => 'Padpro', - 'YP' => 'Paladin', + 'YP' => 'Paladin TV', 'PM' => 'Palm', 'PN' => 'Panacom', 'PA' => 'Panasonic', @@ -1716,7 +1716,7 @@ abstract class AbstractDeviceParser extends AbstractParser '6S' => 'Spectrum', '43' => 'Spectralink', 'SP' => 'Spice', - 'SPD' => 'Spider', + 'SPD' => 'Spider Receiver', '84' => 'Sprint', 'SPU' => 'SPURT', 'QS' => 'SQOOL', @@ -1767,7 +1767,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'SSK' => 'SSKY', 'SYC' => 'Syco', 'SM' => 'Symphony', - '4S' => 'Syrox', + '4S' => 'Syrox Technologies', 'SYS' => 'System76', 'TM' => 'T-Mobile', 'T96' => 'T96', diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 3cfe4647b0..e2ea5edd37 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -21882,24 +21882,24 @@ PCBOX: device: 'tablet' model: 'Kova Plus T735' -# PCD (https://pcdlatam.com/) +# PCD or PCD Argentina (https://pcdlatam.com/) PCD: - regex: '(?:PCD[ _])?(?:PL5507|PL571US|PH3501|PH400[12]|E400|PL620)(?:[);/ ]|$)' + regex: '(?:PCD[ _])?(?:PL5507|PL571US|PH3501|PH400[12]|E400)(?:[);/ ]|$)' device: 'smartphone' models: - regex: 'PL571US' model: 'Jaguar Pro II' - - regex: '(?:PCD[ _])?(P[HL]\d{4}|E400|PL620)' + - regex: '(?:PCD[ _])?(P[HL]\d{4}|E400)' model: '$1' # PCD Argentina PCD Argentina: - regex: 'PCD[ ]?50[689]|(?:P63L)(?:[);/ ]|$)' + regex: 'PCD[ ]?50[689]|(?:PL620|P63L)(?:[);/ ]|$)' device: 'smartphone' models: - regex: 'PCD[ ]?(50[689])' model: '$1' - - regex: '(P63L)' + - regex: '(PL620|P63L)' model: '$1' # ArmPhone @@ -35854,7 +35854,7 @@ Play: device: 'tv' models: - regex: 'PLAY NOW TV BOX 2(?:[);/ ]|$)' - model: 'Now TV Box 2' + model: 'TV Box 2' # Reach Mobiletech (https://www.reachmobile.in/) Reach Mobiletech: From b1406c58be4233a94242ccff7200edccb969243f Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Wed, 21 Jan 2026 09:06:10 +0200 Subject: [PATCH 70/77] Rinno links --- regexes/device/mobiles.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index e2ea5edd37..7289fdd217 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -8450,7 +8450,7 @@ Rikomagic: device: 'tv' model: 'MK$1' -# Rinno Telecom +# Rinno Telecom (http://www.rinnotelecom.com or https://www.facebook.com/Rinno.Telecom/) Rinno Telecom: regex: 'Rinno (R(?:400|505))' device: 'smartphone' From bd5f61c59f071eb70557cb55b670abddd699f1c9 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Wed, 21 Jan 2026 09:07:35 +0200 Subject: [PATCH 71/77] Jumper Tech to Jumper --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/tablet-11.yml | 2 +- Tests/fixtures/tablet-7.yml | 6 +++--- Tests/fixtures/tablet-9.yml | 2 +- regexes/device/mobiles.yml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index c8e2cc7397..c3174a5987 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -982,7 +982,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'UJ' => 'Juniper Systems', 'J5' => 'Just5', 'JUS' => 'JUSYEA', - '7J' => 'Jumper Tech', + '7J' => 'Jumper', 'JPA' => 'JPay', 'JV' => 'JVC', 'JXD' => 'JXD', diff --git a/Tests/fixtures/tablet-11.yml b/Tests/fixtures/tablet-11.yml index af04f5d8c5..4028cf4c91 100644 --- a/Tests/fixtures/tablet-11.yml +++ b/Tests/fixtures/tablet-11.yml @@ -4853,7 +4853,7 @@ engine_version: 122.0.6261.96 device: type: tablet - brand: Jumper Tech + brand: Jumper model: EZpad M11 os_family: Android browser_family: Unknown diff --git a/Tests/fixtures/tablet-7.yml b/Tests/fixtures/tablet-7.yml index 1f3e9597de..e426edfc16 100644 --- a/Tests/fixtures/tablet-7.yml +++ b/Tests/fixtures/tablet-7.yml @@ -589,7 +589,7 @@ engine_version: 43.0.2357.121 device: type: tablet - brand: Jumper Tech + brand: Jumper model: EZpad 4SE os_family: Android browser_family: Chrome @@ -607,7 +607,7 @@ engine_version: 96.0.4664.104 device: type: tablet - brand: Jumper Tech + brand: Jumper model: EZpad M10 os_family: Android browser_family: Chrome @@ -625,7 +625,7 @@ engine_version: 39.0.2171.93 device: type: tablet - brand: Jumper Tech + brand: Jumper model: EZpad 5SE os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-9.yml b/Tests/fixtures/tablet-9.yml index 3820fa806d..0ac98781cc 100644 --- a/Tests/fixtures/tablet-9.yml +++ b/Tests/fixtures/tablet-9.yml @@ -8039,7 +8039,7 @@ engine_version: 112.0.0.0 device: type: tablet - brand: Jumper Tech + brand: Jumper model: EZpad M10S os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 7289fdd217..b4940a2680 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -9354,8 +9354,8 @@ Extrem: - regex: 'ROCK_X11' model: 'Rock X11' -# Jumper Tech (https://en.jumper.com.cn/en/index.aspx or https://jumper.com.ru) -Jumper Tech: +# Jumper or Jumper Tech (https://en.jumper.com.cn/en/index.aspx or https://jumper.com.ru) +Jumper: regex: 'EZpad ([^;/)]+)(?: Build|[;)])' device: 'tablet' model: 'EZpad $1' From 58ab8c84848ad71e79efd9f4a81896cb59b9c23e Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Wed, 21 Jan 2026 09:10:50 +0200 Subject: [PATCH 72/77] Gemini Devices URL --- regexes/device/mobiles.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index b4940a2680..96a2f39355 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -9659,7 +9659,7 @@ G-TiDE: device: 'tablet' model: '$1' -# Gemini Devices +# Gemini Devices (https://geminidevices.com/) Gemini Devices: regex: '(GEM[0-9]+[a-z]*)' device: 'tablet' From ac0a8a46256587eaa71f6633f84d1bbac3b3393b Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Wed, 21 Jan 2026 09:34:39 +0200 Subject: [PATCH 73/77] Added URLs --- regexes/device/mobiles.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 96a2f39355..ceab1299fc 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -14103,7 +14103,7 @@ iView: - regex: '((?:733|730|766|930)TPC|769TPC(?:II)?)(?:[);/ ]|$)' model: '$1' -# Impression Electronics +# Impression Electronics(https://impression.ua/) Impression Electronics: regex: '(?:Impression[ _-]?([^/;]+)|A502|I10\-LE|ImPad[ _]?(.*)|ImSmart[ _]?(.*))(?:[);/ ]|$)' device: 'tablet' @@ -26427,7 +26427,7 @@ HERO: - regex: 'SP-001(?:[);/ ]|$)' model: 'SP-001' -# Syrox Technologies +# Syrox Technologies (https://syrox.com.tr/) Syrox Technologies: regex: '(SYX-(?:T70[04]|T10[12]))(?:[);/ ]|$)' device: 'tablet' From 8528d7f6fe5c5a12a89357a770442282809afe2a Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Tue, 10 Feb 2026 17:41:03 +0200 Subject: [PATCH 74/77] Shortnames in legacy array --- Parser/Device/AbstractDeviceParser.php | 132 +++++++++++++++++++++++++ 1 file changed, 132 insertions(+) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index d3df577c8c..22e3536659 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -2215,6 +2215,138 @@ abstract class AbstractDeviceParser extends AbstractParser 'LPX' => 'LPX-G', // Is now 'Newman' 'UE1' => 'UE', + // Is now 'Brave Techs' + 'BRV' => 'BRAVE', + // Is now 'Bubblegum Tablets' + 'Y8' => 'Bubblegum', + // Is now 'Coby' + 'CY' => 'Coby Kyros', + // Is now 'Connex Devices' + '8C' => 'Connex', + // Is now 'Cricket Wireless' + 'CK' => 'Cricket', + // Is now 'Crown Micro' + '4W' => 'Crown', + // Is now 'NTT DOCOMO' + 'DC' => 'DoCoMo', + // Is now 'Elitegroup Computer Systems' + 'ES' => 'ECS', + // Is now 'EFT Group' + 'EFT' => 'EFT', + // Is now 'IIIF150' + '5F' => 'F150', + // Is now 'Famous Fones' + 'FAM' => 'Famous', + // Is now 'FIGI Mobile' + 'J9' => 'FiGi', + // Is now 'Figgers Communication' + 'FIG' => 'Figgers', + // Is now 'Future Mobile Technology' + '1F' => 'FMT', + // Is now 'FFF Smart Life Connected' + 'FFF' => 'FFF SmartLife', + // Is now 'Gemini Devices' + 'GD' => 'Gemini', + // Is now 'Großerwert' + 'GR1' => 'GroBerwert', + // Is now 'H96 Max' + '9Z' => 'H96', + // Is now 'Impression Electronics' + 'I3' => 'Impression', + // Is now 'Inco Electronics' + '6I' => 'Inco', + // Is now 'iNavi Systems' + 'INA' => 'iNavi', + // Is now 'iVOOMi Energy' + '0J' => 'iVooMi', + // Is now 'Krono Digital' + 'K2' => 'KRONO', + // Is now 'MAG InnoVision' + 'MAG' => 'MAG', + // Is now 'Manhattan TV' + 'NH' => 'Manhattan', + // Is now 'Marshal Electronic' + 'MAR' => 'Marshal', + // Is now 'MBI International' + 'FK' => 'MBI', + // Is now 'TJ Maxx' + 'XZ' => 'MAXX', + // Is now 'MBI International' + 'FK' => 'MBI', + // Is now 'MDC' + '3D' => 'MDC Store', + // Is now 'MINT Connect' + 'MIN' => 'Mint', + // Is now 'MITO Electronic' + '8M' => 'Mito', + // Is now 'The MixC' + 'M5' => 'MIXC', + // Is now 'MLS Innovation' + 'LS' => 'MLS', + // Is now 'MStar Semiconductor' + '3R' => 'MStar', + // Is now 'National Electronic Corporation' + 'N7' => 'National', + // Is now 'NASCO Electronics' + 'NAS' => 'NASCO', + // Is now 'O+ USA' + 'O3' => 'O+', + // Is now 'OASYS Cybernetics' + 'OC' => 'OASYS', + // Is now 'Obi Worldphone' + 'OB' => 'Obi', + // Is now 'Oceanic Solar' + 'OCE' => 'OCEANIC', + // Is now 'Paladin TV' + 'YP' => 'Paladin', + // Is now 'Play' + 'PLA' => 'Play Now', + // Is now 'Raylan' + 'RAY' => 'Raylandz', + // Is now 'RCA' + 'RC' => 'RCA Tablets', + // Is now 'Reach Mobiletech' + '2R' => 'Reach', + // Is now 'RED Digital Cinema' + 'R8' => 'RED', + // Is now 'Rhino Mobility' + 'RHI' => 'Rhino', + // Is now 'Research In Motion' + 'RM' => 'RIM', + // Is now 'Rinno Telecom' + 'RN' => 'Rinno', + // Is now 'Sansui Electric' + '12' => 'Sansui', + // Is now 'Schneider Consumer' + 'CZ' => 'Schneider', + // Is now 'Smart Axiata' + '49' => 'Smart', + // Is now 'Spider Receiver' + 'SPD' => 'Spider', + // Is now 'Suzuki Corporation' + 'ZS' => 'Suzuki', + // Is now 'Syrox Technologies' + '4S' => 'Syrox', + // Is now 'Takara Multimédia' + 'TK' => 'Takara', + // Is now 'TTK' + 'TTK' => 'TTK-TV', + // Is now 'Valtech Mobility' + 'VAT' => 'VALTECH', + // Is now 'Versus Mobility' + 'VER' => 'Versus', + // Is now 'Vityas' + 'VIT' => 'Vityaz', + // Is now 'VUE' + 'VUE' => 'Vue Micro', + // Is now 'Zebra Technologies' + 'PZ' => 'Zebra', + // Is now 'ZIK Computers' + 'ZIK' => 'ZIK', + // Is now 'Zuum México' + 'ZU' => 'Zuum', + // Is now 'WS Education Electronics' + 'WSS' => 'WS', ]; /** From 8e0898b2bfd27fdb7b1461bc4938efc20efff9ad Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Tue, 10 Feb 2026 18:16:35 +0200 Subject: [PATCH 75/77] Shortnames in legacy array (missing from #8109) --- Parser/Device/AbstractDeviceParser.php | 48 ++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 22e3536659..214103e1f7 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -2271,8 +2271,6 @@ abstract class AbstractDeviceParser extends AbstractParser 'FK' => 'MBI', // Is now 'TJ Maxx' 'XZ' => 'MAXX', - // Is now 'MBI International' - 'FK' => 'MBI', // Is now 'MDC' '3D' => 'MDC Store', // Is now 'MINT Connect' @@ -2347,6 +2345,52 @@ abstract class AbstractDeviceParser extends AbstractParser 'ZU' => 'Zuum', // Is now 'WS Education Electronics' 'WSS' => 'WS', + // Is now 'Unikalne Smartphones' + 'BAS' => 'BASE', + // Is now 'Cloud Mobile' + '1J' => 'Cloud', + // Is now 'Digit' + 'DIG' => 'Digit4G', + // Is now 'Dream Multimedia' + 'DM' => 'DMM', + // Is now 'Powerway' + 'DRE' => 'DreamTab', + // Is now 'EPIK Learning' + 'Q1' => 'High Q', + // Is now 'Hotel TV Company' + 'H3' => 'Hotel', + // Is now 'KAP' + 'ROI' => 'ROiK', + // Is now 'Kingelon' + 'S4' => 'Star', + // Is now 'OTT' + '1Y' => 'MDTV', + // Is now 'Microlab' + 'MLA' => 'MLAB', + // Is now 'Mode 1' + '7P' => 'P-UP', + // Is now '7Ke tree' + 'PAD' => 'Padpro', + // Is now 'Quanta Computer' + '84' => 'Sprint', + // Is now 'Rover Computers' + 'R6' => 'RoverPad', + // Is now 'Spark NZ' + 'PK' => 'Spark', + // Is now 'StreamSystem' + 'STR' => 'Stream', + // Is now 'SZ TPS' + 'TPS' => 'TPS', + // Is now 'Techmade' + 'TE1' => 'TechSmart', + // Is now 'Terra' + 'WR' => 'Wortmann', + // Is now 'TWZ Corporation' + 'Z1' => 'TWZ', + // Is now 'VOX Electronics' + 'Z7' => 'VOX', + // Is now 'Zhongyu Display' + 'WAN' => 'Wanmukang', ]; /** From f9abb2d941eb1ed7f76ea3b73c6ed3990fe9054a Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Tue, 10 Feb 2026 18:25:29 +0200 Subject: [PATCH 76/77] Correct names after wrong conflict resolution --- Parser/Device/AbstractDeviceParser.php | 2 +- Tests/fixtures/tv-5.yml | 2 +- regexes/device/televisions.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 214103e1f7..70f6e5f8e8 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -630,7 +630,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'EZ' => 'Ezze', 'UF' => 'EYU', 'EYE' => 'Eyemoo', - '5F' => 'F150', + '5F' => 'IIIF150', 'FPS' => 'F+', 'F6' => 'Facebook', 'FAC' => 'Facetel', diff --git a/Tests/fixtures/tv-5.yml b/Tests/fixtures/tv-5.yml index f9d5764cff..252ff37d77 100644 --- a/Tests/fixtures/tv-5.yml +++ b/Tests/fixtures/tv-5.yml @@ -4151,7 +4151,7 @@ engine_version: 68.0.3440.106 device: type: tv - brand: Schneider + brand: Schneider Consumer model: LED58-SC680K os_family: Other Mobile browser_family: Chrome diff --git a/regexes/device/televisions.yml b/regexes/device/televisions.yml index e848f25cc5..aba3ac73ab 100644 --- a/regexes/device/televisions.yml +++ b/regexes/device/televisions.yml @@ -1314,8 +1314,8 @@ Smart Electronic: - regex: '([A-Z]{2}[0-9]{2}|ZAPPIX)' model: '$1' -# Schneider (https://www.schneiderconsumer.com/) -Schneider: +# Schneider Consumer (https://www.schneiderconsumer.com/) +Schneider Consumer: regex: 'SCHNEIDER[;,)]' device: 'tv' models: From 025910b2a57f4d81f1e0fc7fc89613c837c007e5 Mon Sep 17 00:00:00 2001 From: Dmitrii Kustov Date: Tue, 10 Feb 2026 18:43:31 +0200 Subject: [PATCH 77/77] Correct brand name --- Tests/fixtures/smartphone-42.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Tests/fixtures/smartphone-42.yml b/Tests/fixtures/smartphone-42.yml index b11b2302c2..60b30c7ffa 100644 --- a/Tests/fixtures/smartphone-42.yml +++ b/Tests/fixtures/smartphone-42.yml @@ -5065,7 +5065,7 @@ model: Zeus 4G Pro os_family: Android browser_family: Chrome -- +- user_agent: Mozilla/5.0 (iPhone; CPU iPhone OS 19_0 like Mac OS X) AppleWebKit/19601.1.17.1 (KHTML, like Gecko) Mobile/23A344 Instagram 335.0.8.11.121 (iPhone18,1; iOS 19_0; ru_RU; ru; scale=3.00; 1170x2532; 320361397) NW/3 os: name: iOS @@ -5081,7 +5081,7 @@ model: iPhone 17 Pro os_family: iOS browser_family: Unknown -- +- user_agent: Mozilla/5.0 (iPhone; CPU iPhone OS 19_0 like Mac OS X) WebKit/8612 (KHTML, like Gecko) Mobile/23A344 [FBAN/FBIOS;FBDV/iPhone18,2;FBMD/iPhone;FBSN/iOS;FBSV/19.0;FBSS/3;FBID/phone;FBLC/it_IT;FBOP/5] os: name: iOS @@ -5097,7 +5097,7 @@ model: iPhone 17 Pro Max os_family: iOS browser_family: Unknown -- +- user_agent: Mozilla/5.0 (iPhone; CPU iPhone OS 19_0 like Mac OS X) WebKit/8612 (KHTML, like Gecko) Mobile/23A344 [FBAN/FBIOS;FBDV/iPhone18,3;FBMD/iPhone;FBSN/iOS;FBSV/19.0;FBSS/3;FBID/phone;FBLC/it_IT;FBOP/5] os: name: iOS @@ -5113,7 +5113,7 @@ model: iPhone 17 os_family: iOS browser_family: Unknown -- +- user_agent: Mozilla/5.0 (iPhone; CPU iPhone OS 19_0 like Mac OS X) WebKit/8612 (KHTML, like Gecko) Mobile/23A344 [FBAN/FBIOS;FBDV/iPhone18,4;FBMD/iPhone;FBSN/iOS;FBSV/19.0;FBSS/3;FBID/phone;FBLC/ru_RU;FBOP/5] os: name: iOS @@ -9217,7 +9217,7 @@ engine_version: 142.0.7444.964 device: type: smartphone - brand: F150 + brand: IIIF150 model: Action 15 Pro os_family: Android browser_family: Unknown @@ -9235,7 +9235,7 @@ engine_version: 142.0.7444.964 device: type: smartphone - brand: F150 + brand: IIIF150 model: Action 15 os_family: Android browser_family: Unknown