Skip to content

Splits and merges #8108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Simbiat wants to merge 18 commits into
base: master
Choose a base branch
from
Open

Splits and merges #8108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
72973a9
X96 and X96Q to X96mini
Sep 10, 2025
877edcf
Sky to Sky Devices and Sky UK
Sep 12, 2025
9e4fbac
No devices seem to resolve to "Web TV" brand
Sep 12, 2025
dd04f30
Vortex to Vortex Cellular and VORTEX (RO) to Vortex
Sep 13, 2025
7ab8848
Onda to Onda Tablet and Onda TLC
Sep 13, 2025
d942421
NEXON to NEXON.UA
Sep 13, 2025
39f1675
Mystery to Mystery Tab and Mystery Electronics
Sep 13, 2025
147fcc4
Mastertech to Mastertech and Mastertech Home
Sep 13, 2025
e0c9b4b
Hi to Hi and HMR Networks
Sep 13, 2025
7389224
NEXT to Next Translator and Next & NextStar
Sep 14, 2025
c93ec68
Fixing some of the devices tests
Sep 16, 2025
5951ad5
Fixing the remaining tests
Sep 17, 2025
f1a2241
Remove Inka
Sep 21, 2025
f9621af
Fixing tests
Sep 21, 2025
71162c9
Merge branch 'master' into SplitMerge
Sep 21, 2025
e23eccd
Fixing tests
Sep 21, 2025
4ab02bf
Merge branch 'SplitMerge' of https://github.com/Simbiat/device-detect…
Sep 21, 2025
c332d70
Merge branch 'master' into SplitMerge
Oct 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions Parser/Device/AbstractDeviceParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,6 +827,7 @@ abstract class AbstractDeviceParser extends AbstractParser
'HLL' => 'HLLO',
'HKC' => 'HKC',
'HMD' => 'HMD',
'HMR' => 'HMR Networks',
'8W' => 'HKPro',
'HOF' => 'HOFER',
'HOC' => 'hoco',
Expand Down Expand Up @@ -911,7 +912,6 @@ abstract class AbstractDeviceParser extends AbstractParser
'FC' => 'INCAR',
'2H' => 'Inch',
'6I' => 'Inco',
'INK' => 'Inka',
'IW' => 'iNew',
'IF' => 'Infinix',
'INF' => 'Infiniton',
Expand Down Expand Up @@ -1146,6 +1146,7 @@ abstract class AbstractDeviceParser extends AbstractParser
'MA1' => 'Mascom',
'2M' => 'Masstel',
'3X' => 'Mastertech',
'MTH' => 'Mastertech Home',
'MAS' => 'Master-G',
'50' => 'Matrix',
'MAT' => 'Matco Tools',
Expand Down Expand Up @@ -1252,7 +1253,8 @@ abstract class AbstractDeviceParser extends AbstractParser
'MY' => 'MyPhone (PH)',
'51' => 'Myros',
'M8' => 'Myria',
'6M' => 'Mystery',
'6ME' => 'Mystery Electronics',
'6M' => 'Mystery Tab',
'3T' => 'MyTab',
'MG' => 'MyWigo',
'J3' => 'Mymaga',
Expand Down Expand Up @@ -1302,12 +1304,12 @@ abstract class AbstractDeviceParser extends AbstractParser
'NX' => 'Nexian',
'7X' => 'Nexa',
'7XR' => 'Nexar',
'N8' => 'NEXON',
'N8' => 'NEXON.UA',
'N2' => 'Nextbit',
'NT' => 'NextBook',
'NTT' => 'NTT West',
'4N' => 'NextTab',
'NEX' => 'NEXT',
'NEX' => 'Next Translator',
'NST' => 'Next & NextStar',
'NJO' => 'nJoy',
'NG' => 'NGM',
Expand Down Expand Up @@ -1369,7 +1371,8 @@ abstract class AbstractDeviceParser extends AbstractParser
'OCE' => 'OCEANIC',
'OLT' => 'OLTO',
'OJ' => 'Ookee',
'OD' => 'Onda',
'OD' => 'Onda Tablet',
'ODT' => 'Onda TLC',
'ON' => 'OnePlus',
'ONC' => 'OneClick',
'ONL' => 'OneLern',
Expand Down Expand Up @@ -1670,7 +1673,8 @@ abstract class AbstractDeviceParser extends AbstractParser
'83' => 'Sirin Labs',
'5Z' => 'SK Broadband',
'GK' => 'SKG',
'SW' => 'Sky',
'SW' => 'Sky Devices',
'SKU' => 'Sky UK',
'SK' => 'Skyworth',
'SKY' => 'Skyline',
'SK1' => 'SkyStream',
Expand Down Expand Up @@ -2014,8 +2018,8 @@ abstract class AbstractDeviceParser extends AbstractParser
'VG' => 'Vorago',
'2V' => 'Vorke',
'8U' => 'Vorcom',
'JW' => 'Vortex',
'VRX' => 'VORTEX (RO)',
'JW' => 'Vortex Cellular',
'VRX' => 'Vortex',
'VOR' => 'Vormor',
'V1' => 'Voto',
'Z7' => 'VOX',
Expand Down Expand Up @@ -2090,8 +2094,7 @@ abstract class AbstractDeviceParser extends AbstractParser
'XV' => 'X-View',
'X4' => 'X.Vision',
'X88' => 'X88',
'X96' => 'X96',
'96Q' => 'X96Q',
'X96' => 'X96mini',
'A95' => 'A95X',
'XG' => 'Xgody',
'XGE' => 'XGEM',
Expand Down Expand Up @@ -2176,7 +2179,6 @@ abstract class AbstractDeviceParser extends AbstractParser
'WBF' => 'Webfleet',
'WSS' => 'WS',
// legacy brands, might be removed in future versions
'WB' => 'Web TV',
'XX' => 'Unknown',
];

Expand Down
10 changes: 5 additions & 5 deletions Tests/fixtures/clienthints.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2552,7 +2552,7 @@
engine_version: 114.0.5735.60
device:
type: smartphone
brand: Vortex
brand: Vortex Cellular
model: HD55
os_family: Android
browser_family: Chrome
Expand All @@ -2577,7 +2577,7 @@
engine_version: 121.0.6167.164
device:
type: smartphone
brand: Vortex
brand: Vortex Cellular
model: HD60
os_family: Android
browser_family: Chrome
Expand All @@ -2602,7 +2602,7 @@
engine_version: 119.0.6045.67
device:
type: smartphone
brand: Vortex
brand: Vortex Cellular
model: HD60i
os_family: Android
browser_family: Chrome
Expand All @@ -2627,7 +2627,7 @@
engine_version: 111.0.5563.116
device:
type: smartphone
brand: Vortex
brand: Vortex Cellular
model: HD60L
os_family: Android
browser_family: Chrome
Expand All @@ -2652,7 +2652,7 @@
engine_version: 125.0.6422.165
device:
type: smartphone
brand: Vortex
brand: Vortex Cellular
model: HD68
os_family: Android
browser_family: Chrome
Expand Down
12 changes: 6 additions & 6 deletions Tests/fixtures/smartphone-12.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10081,8 +10081,8 @@
engine_version: 105.0.0.0
device:
type: smartphone
brand: Hi
model: Boost Max
brand: HMR Networks
model: Hi Boost Max
os_family: Android
browser_family: Chrome
-
Expand All @@ -10099,8 +10099,8 @@
engine_version: 107.0.0.0
device:
type: smartphone
brand: Hi
model: Boost
brand: HMR Networks
model: Hi Boost
os_family: Android
browser_family: Chrome
-
Expand Down Expand Up @@ -10801,7 +10801,7 @@
engine_version: 107.0.0.0
device:
type: smartphone
brand: Sky
brand: Sky Devices
model: Elite B65
os_family: Android
browser_family: Chrome
Expand All @@ -10819,7 +10819,7 @@
engine_version: 100.0.4896.127
device:
type: smartphone
brand: Sky
brand: Sky Devices
model: Elite G55
os_family: Android
browser_family: Chrome
Expand Down
28 changes: 14 additions & 14 deletions Tests/fixtures/smartphone-15.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
engine_version: ""
device:
type: smartphone
brand: Sky
brand: Sky Devices
model: "3.5"
os_family: Android
browser_family: Unknown
Expand All @@ -31,7 +31,7 @@
engine_version: 56.0.2924.87
device:
type: smartphone
brand: Sky
brand: Sky Devices
model: 4.0D
os_family: Android
browser_family: Chrome
Expand All @@ -49,7 +49,7 @@
engine_version: 39.0.0.0
device:
type: smartphone
brand: Sky
brand: Sky Devices
model: 4.5LM
os_family: Android
browser_family: Chrome
Expand All @@ -67,7 +67,7 @@
engine_version: 64.0.3282.137
device:
type: smartphone
brand: Sky
brand: Sky Devices
model: 5.0LM
os_family: Android
browser_family: Chrome
Expand All @@ -83,7 +83,7 @@
version: 45.0.0.38.146
device:
type: smartphone
brand: Sky
brand: Sky Devices
model: 5.5Q
os_family: Android
browser_family: Unknown
Expand All @@ -101,7 +101,7 @@
engine_version: ""
device:
type: smartphone
brand: Sky
brand: Sky Devices
model: 7.0W
os_family: Android
browser_family: Unknown
Expand All @@ -119,7 +119,7 @@
engine_version: 50.0.2661.89
device:
type: smartphone
brand: Sky
brand: Sky Devices
model: Elite 5.0M
os_family: Android
browser_family: Chrome
Expand All @@ -137,7 +137,7 @@
engine_version: 55.0.2883.91
device:
type: smartphone
brand: Sky
brand: Sky Devices
model: Elite 5.5 Octa
os_family: Android
browser_family: Chrome
Expand All @@ -155,7 +155,7 @@
engine_version: 64.0.3282.123
device:
type: smartphone
brand: Sky
brand: Sky Devices
model: Elite 5.5L+
os_family: Android
browser_family: Chrome
Expand All @@ -173,7 +173,7 @@
engine_version: 59.0.3071.125
device:
type: smartphone
brand: Sky
brand: Sky Devices
model: Elite 6.0L
os_family: Android
browser_family: Chrome
Expand All @@ -191,7 +191,7 @@
engine_version: 54.0.2840.85
device:
type: smartphone
brand: Sky
brand: Sky Devices
model: Fuego 4.0T
os_family: Android
browser_family: Chrome
Expand All @@ -209,7 +209,7 @@
engine_version: 63.0.3239.111
device:
type: smartphone
brand: Sky
brand: Sky Devices
model: Fuego 5.0+
os_family: Android
browser_family: Chrome
Expand All @@ -227,7 +227,7 @@
engine_version: 71.0.3578.99
device:
type: smartphone
brand: Sky
brand: Sky Devices
model: Platinum 5.0M
os_family: Android
browser_family: Chrome
Expand All @@ -245,7 +245,7 @@
engine_version: 71.0.3578.99
device:
type: smartphone
brand: Sky
brand: Sky Devices
model: Platinum 5.0M
os_family: Android
browser_family: Chrome
Expand Down
8 changes: 4 additions & 4 deletions Tests/fixtures/smartphone-18.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3467,7 +3467,7 @@
engine_version: 94.0.4606.85
device:
type: smartphone
brand: Sky
brand: Sky Devices
model: Elite L55
os_family: Android
browser_family: Chrome
Expand All @@ -3485,7 +3485,7 @@
engine_version: 113.0.0.0
device:
type: smartphone
brand: Sky
brand: Sky Devices
model: Elite C63
os_family: Android
browser_family: Chrome
Expand All @@ -3503,7 +3503,7 @@
engine_version: 101.0.4951.41
device:
type: smartphone
brand: Sky
brand: Sky Devices
model: Elite A6
os_family: Android
browser_family: Chrome
Expand All @@ -3521,7 +3521,7 @@
engine_version: 102.0.0.0
device:
type: smartphone
brand: Sky
brand: Sky Devices
model: Elite Max
os_family: Android
browser_family: Chrome
Expand Down
Loading
Loading