From 41bac954bfd4d83a70a612269bc3f143e2466132 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Mon, 12 Aug 2024 12:00:55 +0200 Subject: [PATCH] Adds detection for myPhone (PL) and rename MyPhone to MyPhone (PH) (#7770) * Adds detection for myPhone (PL) * migrate models for MyPhone brand to MyPhone (PH) * migrate models for MyPhone brand to MyPhone (PH) --- Parser/Device/AbstractDeviceParser.php | 3 +- Tests/fixtures/smartphone-1.yml | 2 +- Tests/fixtures/smartphone-10.yml | 8 +- Tests/fixtures/smartphone-18.yml | 10 +- Tests/fixtures/smartphone-19.yml | 2 +- Tests/fixtures/smartphone-20.yml | 4 +- Tests/fixtures/smartphone-21.yml | 12 +-- Tests/fixtures/smartphone-22.yml | 4 +- Tests/fixtures/smartphone-25.yml | 14 +-- Tests/fixtures/smartphone-26.yml | 8 +- Tests/fixtures/smartphone-27.yml | 2 +- Tests/fixtures/smartphone-28.yml | 2 +- Tests/fixtures/smartphone-29.yml | 2 +- Tests/fixtures/smartphone-30.yml | 44 ++++---- Tests/fixtures/smartphone-32.yml | 10 +- Tests/fixtures/smartphone-33.yml | 2 +- Tests/fixtures/smartphone-34.yml | 12 +-- Tests/fixtures/smartphone-35.yml | 2 +- Tests/fixtures/smartphone-36.yml | 2 +- Tests/fixtures/smartphone-38.yml | 2 +- Tests/fixtures/smartphone-40.yml | 18 ++++ Tests/fixtures/smartphone-5.yml | 2 +- Tests/fixtures/smartphone-8.yml | 2 +- Tests/fixtures/smartphone-9.yml | 24 ++--- Tests/fixtures/tablet-10.yml | 6 +- Tests/fixtures/tablet-3.yml | 14 +-- Tests/fixtures/tablet-6.yml | 6 +- Tests/fixtures/tablet-7.yml | 4 +- Tests/fixtures/tablet-9.yml | 2 +- regexes/device/mobiles.yml | 143 ++++++++++++++----------- 30 files changed, 201 insertions(+), 167 deletions(-) diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index 110a00dde0..f025f50b47 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -1122,7 +1122,8 @@ abstract class AbstractDeviceParser extends AbstractParser '1R' => 'Multilaser', 'MPS' => 'MultiPOS', '1M' => 'MYFON', - 'MY' => 'MyPhone', + 'MY1' => 'myPhone (PL)', + 'MY' => 'MyPhone (PH)', '51' => 'Myros', 'M8' => 'Myria', '6M' => 'Mystery', diff --git a/Tests/fixtures/smartphone-1.yml b/Tests/fixtures/smartphone-1.yml index 9eb5ee4bce..48feefd1f3 100644 --- a/Tests/fixtures/smartphone-1.yml +++ b/Tests/fixtures/smartphone-1.yml @@ -9310,7 +9310,7 @@ engine_version: "" device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: my27 os_family: Android browser_family: Android Browser diff --git a/Tests/fixtures/smartphone-10.yml b/Tests/fixtures/smartphone-10.yml index 575cbf9971..26802cf0d0 100644 --- a/Tests/fixtures/smartphone-10.yml +++ b/Tests/fixtures/smartphone-10.yml @@ -31,7 +31,7 @@ engine_version: 39.0.0.0 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: INFINITY II LTE os_family: Android browser_family: Chrome @@ -49,7 +49,7 @@ engine_version: 74.0.3729.136 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: myA17 os_family: Android browser_family: Chrome @@ -67,7 +67,7 @@ engine_version: 75.0.3770.143 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: Pocket 18x9 os_family: Android browser_family: Chrome @@ -85,7 +85,7 @@ engine_version: 75.0.3770.101 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: Q-Smart III os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-18.yml b/Tests/fixtures/smartphone-18.yml index 0abb8fef6e..452a47c0dc 100644 --- a/Tests/fixtures/smartphone-18.yml +++ b/Tests/fixtures/smartphone-18.yml @@ -2189,7 +2189,7 @@ engine_version: 79.0.3945.93 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: Pocket 2 os_family: Android browser_family: Chrome @@ -2441,7 +2441,7 @@ engine_version: 84.0.4147.111 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: myX12 os_family: Android browser_family: Chrome @@ -2459,7 +2459,7 @@ engine_version: 85.0.4183.81 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: myXI1 Plus os_family: Android browser_family: Chrome @@ -2477,7 +2477,7 @@ engine_version: 85.0.4183.101 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: myXI1 Pro os_family: Android browser_family: Chrome @@ -2495,7 +2495,7 @@ engine_version: 84.0.4147.89 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: myXI3 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-19.yml b/Tests/fixtures/smartphone-19.yml index 41c1ff02b2..18ca00c9cc 100644 --- a/Tests/fixtures/smartphone-19.yml +++ b/Tests/fixtures/smartphone-19.yml @@ -1957,7 +1957,7 @@ engine_version: 86.0.4240.99 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: Prime 4 Lite os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-20.yml b/Tests/fixtures/smartphone-20.yml index 38f37e954f..c0cfacfa0c 100644 --- a/Tests/fixtures/smartphone-20.yml +++ b/Tests/fixtures/smartphone-20.yml @@ -5095,7 +5095,7 @@ engine_version: 85.0.4183.81 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: Q-Smart BE os_family: Android browser_family: Chrome @@ -6841,7 +6841,7 @@ engine_version: 85.0.4183.81 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: Prime 18x9 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-21.yml b/Tests/fixtures/smartphone-21.yml index 99617ccf8e..02b2b91941 100644 --- a/Tests/fixtures/smartphone-21.yml +++ b/Tests/fixtures/smartphone-21.yml @@ -13,7 +13,7 @@ engine_version: 85.0.4183.101 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: Prime 3 Lite os_family: Android browser_family: Chrome @@ -31,7 +31,7 @@ engine_version: 85.0.4183.127 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: Prime 18x9 LTE os_family: Android browser_family: Chrome @@ -7789,7 +7789,7 @@ engine_version: 81.0.4044.138 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: Agua Rio os_family: Android browser_family: Chrome @@ -7807,7 +7807,7 @@ engine_version: 76.0.3809.132 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: Agua Rio Lite os_family: Android browser_family: Chrome @@ -7825,7 +7825,7 @@ engine_version: 30.0.0.0 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: Agua Rio Fun os_family: Android browser_family: Chrome @@ -7843,7 +7843,7 @@ engine_version: 81.0.4044.138 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: Agua Infinity os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-22.yml b/Tests/fixtures/smartphone-22.yml index e9c2e26c50..5d675ae8ca 100644 --- a/Tests/fixtures/smartphone-22.yml +++ b/Tests/fixtures/smartphone-22.yml @@ -6591,7 +6591,7 @@ engine_version: 89.0.4389.105 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: FUN 18x9 os_family: Android browser_family: Chrome @@ -8967,7 +8967,7 @@ engine_version: 88.0.4324.182 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: Brown 1 os_family: Android browser_family: Unknown diff --git a/Tests/fixtures/smartphone-25.yml b/Tests/fixtures/smartphone-25.yml index 11ef6f4dec..89e3d2c1ca 100644 --- a/Tests/fixtures/smartphone-25.yml +++ b/Tests/fixtures/smartphone-25.yml @@ -3055,7 +3055,7 @@ engine_version: 90.0.4430.210 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: Pocket Pro os_family: Android browser_family: Opera @@ -3667,7 +3667,7 @@ engine_version: 90.0.4430.91 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: FUN 4 os_family: Android browser_family: Chrome @@ -6819,7 +6819,7 @@ engine_version: 90.0.4430.210 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: Pocket Pro os_family: Android browser_family: Opera @@ -6873,7 +6873,7 @@ engine_version: 90.0.4430.91 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: FUN 4 os_family: Android browser_family: Chrome @@ -8079,7 +8079,7 @@ engine_version: 91.0.4472.120 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: FUN 6 Lite os_family: Android browser_family: Chrome @@ -8097,7 +8097,7 @@ engine_version: 91.0.4472.164 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: FUN 7 LTE os_family: Android browser_family: Chrome @@ -8115,7 +8115,7 @@ engine_version: 91.0.4472.77 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: FUN 18x9 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-26.yml b/Tests/fixtures/smartphone-26.yml index 2c3032cdee..f32b938605 100644 --- a/Tests/fixtures/smartphone-26.yml +++ b/Tests/fixtures/smartphone-26.yml @@ -1937,7 +1937,7 @@ engine_version: 92.0.4515.159 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: Prime 3 os_family: Android browser_family: Chrome @@ -5653,7 +5653,7 @@ engine_version: 83.0.4103.106 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: Luna II os_family: Android browser_family: Chrome @@ -8817,7 +8817,7 @@ engine_version: 93.0.4577.62 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: City 2 os_family: Android browser_family: Chrome @@ -8835,7 +8835,7 @@ engine_version: 93.0.4577.62 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: Fun 6 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-27.yml b/Tests/fixtures/smartphone-27.yml index cd4789343a..bdea784338 100644 --- a/Tests/fixtures/smartphone-27.yml +++ b/Tests/fixtures/smartphone-27.yml @@ -4633,7 +4633,7 @@ engine_version: 93.0.4577.82 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: Prime 5 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-28.yml b/Tests/fixtures/smartphone-28.yml index d1e4fce964..f60de7792c 100644 --- a/Tests/fixtures/smartphone-28.yml +++ b/Tests/fixtures/smartphone-28.yml @@ -5353,7 +5353,7 @@ engine_version: 94.0.4606.61 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: Now eSIM os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-29.yml b/Tests/fixtures/smartphone-29.yml index c85825f7dd..7977dcd76b 100644 --- a/Tests/fixtures/smartphone-29.yml +++ b/Tests/fixtures/smartphone-29.yml @@ -5893,7 +5893,7 @@ engine_version: 88.0.4324.181 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: Hammer Axe M LTE os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-30.yml b/Tests/fixtures/smartphone-30.yml index b26f8174b9..2f55184262 100644 --- a/Tests/fixtures/smartphone-30.yml +++ b/Tests/fixtures/smartphone-30.yml @@ -1017,7 +1017,7 @@ engine_version: 100.0.4896.127 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: Fun 9 os_family: Android browser_family: Chrome @@ -5373,7 +5373,7 @@ engine_version: 86.0.4240.99 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: myG1 os_family: Android browser_family: Chrome @@ -5391,7 +5391,7 @@ engine_version: 84.0.4147.89 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: myA18 os_family: Android browser_family: Chrome @@ -5967,7 +5967,7 @@ engine_version: 81.0.4044.117 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: Hammer Axe 3G os_family: Android browser_family: Chrome @@ -5985,7 +5985,7 @@ engine_version: 77.0.3865.92 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: Infinity LTE os_family: Android browser_family: Chrome @@ -6003,7 +6003,7 @@ engine_version: 76.0.3809.89 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: Infinity 3G os_family: Android browser_family: Chrome @@ -6021,7 +6021,7 @@ engine_version: 75.0.3770.143 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: Cube LTE os_family: Android browser_family: Chrome @@ -6399,7 +6399,7 @@ engine_version: 84.0.4147.125 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: myXI1 os_family: Android browser_family: Chrome @@ -6417,7 +6417,7 @@ engine_version: 86.0.4240.99 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: myX9 os_family: Android browser_family: Chrome @@ -6435,7 +6435,7 @@ engine_version: 84.0.4147.125 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: myX8 os_family: Android browser_family: Chrome @@ -6453,7 +6453,7 @@ engine_version: 86.0.4240.110 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: myX5 os_family: Android browser_family: Chrome @@ -6471,7 +6471,7 @@ engine_version: 84.0.4147.89 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: myX3 os_family: Android browser_family: Chrome @@ -6489,7 +6489,7 @@ engine_version: 86.0.4240.185 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: myX2 os_family: Android browser_family: Chrome @@ -6543,7 +6543,7 @@ engine_version: 84.0.4147.111 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: myNX1 os_family: Android browser_family: Chrome @@ -6561,7 +6561,7 @@ engine_version: 86.0.4240.110 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: myA16 os_family: Android browser_family: Chrome @@ -6579,7 +6579,7 @@ engine_version: 85.0.4183.127 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: myA15 os_family: Android browser_family: Chrome @@ -6597,7 +6597,7 @@ engine_version: 81.0.4044.117 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: myA13 os_family: Android browser_family: Chrome @@ -6615,7 +6615,7 @@ engine_version: 84.0.4147.89 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: myA12 os_family: Android browser_family: Chrome @@ -6633,7 +6633,7 @@ engine_version: 79.0.3945.93 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: myA11i os_family: Android browser_family: Chrome @@ -6651,7 +6651,7 @@ engine_version: 80.0.3987.132 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: myA11 os_family: Android browser_family: Chrome @@ -6669,7 +6669,7 @@ engine_version: 86.0.4240.99 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: my29S os_family: Android browser_family: Chrome @@ -10053,7 +10053,7 @@ engine_version: 81.0.4044.138 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: Q-Smart Plus os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-32.yml b/Tests/fixtures/smartphone-32.yml index 6f9e80d1ad..3a17732689 100644 --- a/Tests/fixtures/smartphone-32.yml +++ b/Tests/fixtures/smartphone-32.yml @@ -3775,7 +3775,7 @@ engine_version: 80.0.3987.162 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: Rio 2 Lite os_family: Android browser_family: Chrome @@ -3793,7 +3793,7 @@ engine_version: 83.0.4103.101 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: Rio 2 os_family: Android browser_family: Chrome @@ -3811,7 +3811,7 @@ engine_version: 83.0.4103.106 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: Rio Pixie os_family: Android browser_family: Chrome @@ -3829,7 +3829,7 @@ engine_version: 85.0.4183.81 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: Rio 2 Fun os_family: Android browser_family: Chrome @@ -6259,7 +6259,7 @@ engine_version: 80.0.3987.132 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: Pocket os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-33.yml b/Tests/fixtures/smartphone-33.yml index dc1f7db11c..48a976b440 100644 --- a/Tests/fixtures/smartphone-33.yml +++ b/Tests/fixtures/smartphone-33.yml @@ -2047,7 +2047,7 @@ engine_version: 57.0.2987.132 device: type: smartphone - brand: MyPhone + brand: Timovi model: Infinit 2 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-34.yml b/Tests/fixtures/smartphone-34.yml index 918de8a640..10111ef9aa 100644 --- a/Tests/fixtures/smartphone-34.yml +++ b/Tests/fixtures/smartphone-34.yml @@ -511,7 +511,7 @@ engine_version: 76.0.3809.132 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: myA9 DTV os_family: Android browser_family: Chrome @@ -529,7 +529,7 @@ engine_version: 78.0.3904.62 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: myA8 DTV os_family: Android browser_family: Chrome @@ -547,7 +547,7 @@ engine_version: 83.0.4103.106 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: myA7 DTV os_family: Android browser_family: Chrome @@ -565,7 +565,7 @@ engine_version: 79.0.3945.93 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: myA10 os_family: Android browser_family: Chrome @@ -583,7 +583,7 @@ engine_version: 84.0.4147.125 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: myX1 os_family: Android browser_family: Chrome @@ -9797,7 +9797,7 @@ engine_version: 102.0.5005.78 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: Brown 2 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-35.yml b/Tests/fixtures/smartphone-35.yml index 5d5cd69289..14eebccb26 100644 --- a/Tests/fixtures/smartphone-35.yml +++ b/Tests/fixtures/smartphone-35.yml @@ -1937,7 +1937,7 @@ engine_version: 75.0.3770.101 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: UNO os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-36.yml b/Tests/fixtures/smartphone-36.yml index aee05c0533..06805dda9b 100644 --- a/Tests/fixtures/smartphone-36.yml +++ b/Tests/fixtures/smartphone-36.yml @@ -8693,7 +8693,7 @@ engine_version: "534.30" device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: A898 Duo os_family: Android browser_family: Android Browser diff --git a/Tests/fixtures/smartphone-38.yml b/Tests/fixtures/smartphone-38.yml index 14418963fc..4f9a57fd24 100644 --- a/Tests/fixtures/smartphone-38.yml +++ b/Tests/fixtures/smartphone-38.yml @@ -3099,7 +3099,7 @@ engine_version: 120.0.6099.323 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: N23 os_family: Android browser_family: Unknown diff --git a/Tests/fixtures/smartphone-40.yml b/Tests/fixtures/smartphone-40.yml index e72dc87ae5..5ecdd945f2 100644 --- a/Tests/fixtures/smartphone-40.yml +++ b/Tests/fixtures/smartphone-40.yml @@ -2553,3 +2553,21 @@ model: X7 os_family: Android browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 8.1.0; Pocket_18x9) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Mobile Safari/537.36 + os: + name: Android + version: 8.1.0 + platform: "" + client: + type: browser + name: Chrome Mobile + version: 100.0.4896.127 + engine: Blink + engine_version: 100.0.4896.127 + device: + type: smartphone + brand: myPhone (PL) + model: Pocket 18x9 + os_family: Android + browser_family: Chrome diff --git a/Tests/fixtures/smartphone-5.yml b/Tests/fixtures/smartphone-5.yml index faa387998e..678d49f3b3 100644 --- a/Tests/fixtures/smartphone-5.yml +++ b/Tests/fixtures/smartphone-5.yml @@ -9322,7 +9322,7 @@ engine_version: 93.0.4577.75 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: myWX1 Plus os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-8.yml b/Tests/fixtures/smartphone-8.yml index 40ae41afd5..9391c82c3a 100644 --- a/Tests/fixtures/smartphone-8.yml +++ b/Tests/fixtures/smartphone-8.yml @@ -9159,7 +9159,7 @@ engine_version: 91.0.4472.120 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: Q-Smart III Plus os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-9.yml b/Tests/fixtures/smartphone-9.yml index 81afa0a987..ba30dab786 100644 --- a/Tests/fixtures/smartphone-9.yml +++ b/Tests/fixtures/smartphone-9.yml @@ -8613,7 +8613,7 @@ engine_version: 33.0.1750.170 device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: a888 os_family: Android browser_family: Chrome @@ -8631,7 +8631,7 @@ engine_version: "537.22" device: type: smartphone - brand: MyPhone + brand: MyPhone (PH) model: A919 Duo os_family: Android browser_family: Chrome @@ -8649,7 +8649,7 @@ engine_version: 33.0.0.0 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: AXE LTE os_family: Android browser_family: Chrome @@ -8667,7 +8667,7 @@ engine_version: 75.0.3770.143 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: C-Smart 4 os_family: Android browser_family: Chrome @@ -8685,7 +8685,7 @@ engine_version: 68.0.3440.91 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: C-Smart Pix os_family: Android browser_family: Chrome @@ -8703,7 +8703,7 @@ engine_version: 75.0.3770.101 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: CityXL os_family: Android browser_family: Chrome @@ -8721,7 +8721,7 @@ engine_version: 51.0.2704.81 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: Cube os_family: Android browser_family: Chrome @@ -8739,7 +8739,7 @@ engine_version: 51.0.2704.81 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: Cube LTE os_family: Android browser_family: Chrome @@ -8757,7 +8757,7 @@ engine_version: 78.0.3904.96 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: FUN 8 os_family: Android browser_family: Chrome @@ -8775,7 +8775,7 @@ engine_version: 75.0.3770.143 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: Fun LTE os_family: Android browser_family: Chrome @@ -8847,7 +8847,7 @@ engine_version: 58.0.3029.83 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: Hammer Axe M LTE os_family: Android browser_family: Chrome @@ -8865,7 +8865,7 @@ engine_version: 75.0.3770.101 device: type: smartphone - brand: MyPhone + brand: myPhone (PL) model: Hammer Axe Pro os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-10.yml b/Tests/fixtures/tablet-10.yml index 15a421de05..221efa8269 100644 --- a/Tests/fixtures/tablet-10.yml +++ b/Tests/fixtures/tablet-10.yml @@ -5399,8 +5399,8 @@ engine_version: 83.0.4103.106 device: type: tablet - brand: MyPhone - model: MyTab 10 III + brand: myPhone (PL) + model: myTab 10 III os_family: Android browser_family: Chrome - @@ -7829,7 +7829,7 @@ engine_version: 84.0.4147.89 device: type: tablet - brand: MyPhone + brand: MyPhone (PH) model: myT6 DTV os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-3.yml b/Tests/fixtures/tablet-3.yml index 2e70b99eb7..f16b95e035 100644 --- a/Tests/fixtures/tablet-3.yml +++ b/Tests/fixtures/tablet-3.yml @@ -3893,7 +3893,7 @@ engine_version: "534.30" device: type: tablet - brand: MyPhone + brand: MyPhone (PH) model: MyPad 1000 HD os_family: Android browser_family: Android Browser @@ -3911,7 +3911,7 @@ engine_version: "533.1" device: type: tablet - brand: MyPhone + brand: MyPhone (PH) model: MyPad 2 os_family: Android browser_family: Unknown @@ -3929,7 +3929,7 @@ engine_version: 34.0.1847.114 device: type: tablet - brand: MyPhone + brand: MyPhone (PH) model: MyPad 750HD os_family: Android browser_family: Chrome @@ -3947,8 +3947,8 @@ engine_version: 52.0.2743.98 device: type: tablet - brand: MyPhone - model: MyTab 10 II + brand: myPhone (PL) + model: myTab 10 II os_family: Android browser_family: Chrome - @@ -3965,8 +3965,8 @@ engine_version: 30.0.0.0 device: type: tablet - brand: MyPhone - model: MyTab 10 Q + brand: myPhone (PL) + model: myTab 10 Q os_family: Android browser_family: Chrome - diff --git a/Tests/fixtures/tablet-6.yml b/Tests/fixtures/tablet-6.yml index 5913ab1d06..ab900a93a0 100644 --- a/Tests/fixtures/tablet-6.yml +++ b/Tests/fixtures/tablet-6.yml @@ -6596,7 +6596,7 @@ engine_version: 94.0.4606.85 device: type: tablet - brand: MyPhone + brand: myPhone (PL) model: SmartView 7" 3G os_family: Android browser_family: Chrome @@ -6614,7 +6614,7 @@ engine_version: 95.0.4638.74 device: type: tablet - brand: MyPhone + brand: myPhone (PL) model: SmartView 8" LTE os_family: Android browser_family: Chrome @@ -6632,7 +6632,7 @@ engine_version: 94.0.4606.85 device: type: tablet - brand: MyPhone + brand: myPhone (PL) model: SmartView 9.6" 3G os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-7.yml b/Tests/fixtures/tablet-7.yml index 5b85940954..0d455ce08f 100644 --- a/Tests/fixtures/tablet-7.yml +++ b/Tests/fixtures/tablet-7.yml @@ -7675,7 +7675,7 @@ engine_version: 81.0.4044.138 device: type: tablet - brand: MyPhone + brand: MyPhone (PH) model: myT5 DTV os_family: Android browser_family: Chrome @@ -7693,7 +7693,7 @@ engine_version: 76.0.3809.89 device: type: tablet - brand: MyPhone + brand: MyPhone (PH) model: myT3 DTV os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-9.yml b/Tests/fixtures/tablet-9.yml index bfd4dbe649..7aebc77551 100644 --- a/Tests/fixtures/tablet-9.yml +++ b/Tests/fixtures/tablet-9.yml @@ -7553,7 +7553,7 @@ engine_version: 71.0.3578.99 device: type: tablet - brand: MyPhone + brand: myPhone (PL) model: SmartView 9.6" 3G os_family: Android browser_family: Chrome diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 6269193870..e15dd7806b 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -9272,9 +9272,9 @@ Vizio: device: 'tablet' model: '$1' -# Timovi +# Timovi (https://web.archive.org/web/20181129055129/https://www.timovi.mx/) Timovi: - regex: 'Tmovi[ _]|(?:Infinit[ _](?:Lite[_ ]2|X[_ ]CAM)|Infinit MX(?: Pro)?|Vision_PRO|VISION ULTRA|Epix|Yeah_Go|Insignia Delta 2|Insignia_(?:Delta3|Lab))(?:[);/ ]|$)' + regex: 'Tmovi[ _]|(?:Infinit[ _](?:Lite[_ ]2|X[_ ]CAM)|Infinit (?:MX(?: Pro)?|2)|Vision_PRO|VISION ULTRA|Epix|Yeah_Go|Insignia Delta 2|Insignia_(?:Delta3|Lab))(?:[);/ ]|$)' device: 'smartphone' models: - regex: 'Tmovi[ _]Prime' @@ -9289,6 +9289,8 @@ Timovi: model: 'Infinit MX Pro' - regex: 'Infinit MX' model: 'Infinit MX' + - regex: 'Infinit 2' + model: 'Infinit 2' - regex: 'Infinit[_ ]Lite([_ ]2)?' model: 'Infinit Lite$1' - regex: 'Vision_PRO' @@ -17785,7 +17787,7 @@ MTN: - regex: 'MTN-([a-z0-9_\-]+)' model: 'MTN-$1' -# Hammer (hammerphones.com) sub brand MyPhone +# Hammer (hammerphones.com) sub brand myPhone (PL) Hammer: regex: '(?:Hammer[_ ](?:Construction|Explorer[_ ](?:Plus|Pro)|FORCE|Blade_[34]|Blade2_PRO|Blade_5G|IRON_[234](?:[_ ]LTE)?|IRON|Explorer|ENERGY(?:_18x9|_2_2022|_[2X])?|Titan 2|Active2?(?:_LTE)?)|Iron[_ ]2)(?:[);/ ]|$)' device: 'smartphone' @@ -17840,62 +17842,21 @@ Rombica: - regex: '(55MT-UDG54G|Infinity K8|Smart Box (?:Q1|v00[3-9]|Quad|Ultra HD v002|4K V001|[ABCDXYZ]1|[AGDFQL]2|[AFG]3|H4)|TV (?:Ultima|Fly)|Smart Stick Pro|TV Mercury|TV Air)(?:[);/ ]|$)' model: '$1' -# myphone (myphone.com.ph) -MyPhone: - regex: '(?:MyPhone|MyPad|MyTab)[ _][^;/)]+( Build|[);])|(?:HAMMER_)?AXE[_ ]M[_ ]LTE|Hammer[_ ](?:Axe)|Cube_LTE|myTab10II|LUNA_II|C-Smart_pix|myPhone_Fun_8|FUN_18x9|MyPhoneMY27|Prime_4_Lite|myA1[78]|myX12|Pocket_2|Prime_18x9|Prime3Lite|myG1|myA10|myA(10|[789]) DTV|myT[356] DTV|myWX1 Plus|myXI1(?:[ _](?:Plus|Pro))?|my(?:XI[3]|NX1|X[23589]|A1[12356]|29S|807)|Q_Smart_BE|Brown [12]|Q-Smart_Plus|Q-Smart_III_Plus|SmartView_(?:[78]|9_6)_(?:LTE|[34]G)|Android 6(?:[\d.]*);(?: [\w-]+;)? Pocket|Infinit 2|SmartView_9\.6_3G|A898 DUO' +# MyPhone or my|phone, or MyPhone Pilipinas (myphone.com.ph) +MyPhone (PH): + regex: 'MyPad[ _][^;/)]+( Build|[);])|MyPhone ?(?:A888|A919 Duo|Agua (?:Infinity|Rio ?(?:Fun|Lite)?)|MY27|Rio (?:2 ?(?:Fun|Lite)?|Pixie)|UNO)|my(?:A(?:10|[789])|T[356]) DTV|myWX1 Plus|myXI1(?:[ _](?:Plus|Pro))?|my(?:G1|XI3|NX1|X12|X[23589]|A1[0-35-8]|29S|807)|Brown [12]|A898 DUO' device: 'smartphone' models: # explicit table models - - regex: 'myTab_10III' - model: 'MyTab 10 III' - device: 'tablet' - - regex: 'myTab10II' - model: 'MyTab 10 II' - device: 'tablet' - regex: 'myT([356]) DTV' model: 'myT$1 DTV' device: 'tablet' - - regex: 'SmartView_7_3G' - model: 'SmartView 7" 3G' - device: 'tablet' - - regex: 'SmartView_8_LTE' - model: 'SmartView 8" LTE' - device: 'tablet' - - regex: 'SmartView_9[_.]6_3G' - model: 'SmartView 9.6" 3G' - device: 'tablet' # explicit smartphones models - regex: 'myA([789]|10) DTV' model: 'myA$1 DTV' - regex: 'A898 DUO' model: 'A898 Duo' - - regex: 'Cube_LTE|Cube 16GB' - model: 'Cube LTE' - - regex: 'INFINITY (LTE|3G)' - model: 'Infinity $1' - - regex: 'Infinit 2' - model: 'Infinit 2' - - regex: 'Prime_4_Lite' - model: 'Prime 4 Lite' - - regex: 'C-Smart_pix' - model: 'C-Smart Pix' - - regex: 'Pocket_2(?:[);/ ]|$)' - model: 'Pocket 2' - - regex: 'Pocket(?:[);/ ]|$)' - model: 'Pocket' - - regex: '(?:myPhone_)?Fun[_ ]?(\d)[_ ]?Lite' - model: 'FUN $1 Lite' - - regex: '(?:myPhone_)?Fun[_ ]?(\d)[_ ]?LTE' - model: 'FUN $1 LTE' - - regex: '(?:myPhone_)?Fun_?([48]|18x9)' - model: 'FUN $1' - - regex: 'Hammer AXE Pro' - model: 'Hammer Axe Pro' - - regex: 'myPhone AXE 3G' - model: 'Hammer Axe 3G' - - regex: '(?:HAMMER_)?AXE[_ ]M[_ ]LTE' - model: 'Hammer Axe M LTE' - regex: 'MyPhoneMY27' model: 'my27' - regex: 'MY807' @@ -17906,28 +17867,14 @@ MyPhone: model: 'myXI1 Pro' - regex: 'myXI([13])(?:[);/ ]|$)' model: 'myXI$1' - - regex: 'my(X[23589]|NX1|A1[12356]i?|29S|G1|X12|A1[078])(?:[);/ ]|$)' + - regex: 'my(A1[0-35-8]i?|G1|NX1|X[23589]|X12|29S)(?:[);/ ]|$)' model: 'my$1' - regex: 'myWX1 Plus(?:[);/ ]|$)' model: 'myWX1 Plus' - - regex: 'Q_Smart_BE(?:[);/ ]|$)' - model: 'Q-Smart BE' - - regex: 'Q-Smart_Plus(?:[);/ ]|$)' - model: 'Q-Smart Plus' - - regex: 'Prime_18x9(_LTE)?(?:[);/ ]|$)' - model: 'Prime 18x9$1' - - regex: 'Prime3Lite(?:[);/ ]|$)' - model: 'Prime 3 Lite' - regex: 'Brown 1(?:[);/ ]|$)' # ARK Brown 1 model: 'Brown 1' - regex: 'brown 2(?:[);/ ]|$)' # ARK Brown 1 model: 'Brown 2' - - regex: 'myPhone[_ ]Pocket[_ ]Pro' - model: 'Pocket Pro' - - regex: 'Q-Smart_III_Plus' - model: 'Q-Smart III Plus' - - regex: 'LUNA_II' - model: 'Luna II' # general detections - regex: 'MyPhone[ _]([^;/)]+)( Build|[;)])' @@ -17935,8 +17882,76 @@ MyPhone: - regex: 'MyPad[ _]([^;/(]+)(?: Build|[;)])' model: 'MyPad $1' device: 'tablet' - - regex: 'MyTab[ _]([^;/]+)(?: Build|[;)])' - model: 'MyTab $1' + +# myPhone (https://www.myphone.pl/) +myPhone (PL): + regex: '(?:myPhone|myTab)_?[^;/)]+( Build|[);])|(?:FUN|Pocket|Prime)_18x9|Prime3Lite|Prime_4_Lite|Q-Smart_Plus|Q-Smart_III_Plus|Q_Smart_BE|(?:HAMMER_)?AXE[_ ]M[_ ]LTE|Hammer[_ ](?:Axe)|Cube_LTE|C-Smart_pix|SmartView_9\.6_3G|SmartView_(?:[78]|9_6)_(?:LTE|[34]G)|Android 6(?:[\d.]*);(?: [\w-]+;)? Pocket|Pocket_2|LUNA_II' + device: 'smartphone' + models: + # explicit smartphones models + - regex: 'C-Smart_pix' + model: 'C-Smart Pix' + - regex: 'Cube_LTE|Cube 16GB' + model: 'Cube LTE' + - regex: '(?:myPhone_)?Fun[_ ]?(\d)[_ ]?Lite' + model: 'FUN $1 Lite' + - regex: '(?:myPhone_)?Fun[_ ]?(\d)[_ ]?LTE' + model: 'FUN $1 LTE' + - regex: '(?:myPhone_)?Fun_?([48]|18x9)' + model: 'FUN $1' + - regex: 'Hammer AXE Pro' + model: 'Hammer Axe Pro' + - regex: 'myPhone AXE 3G' + model: 'Hammer Axe 3G' + - regex: '(?:HAMMER_)?AXE[_ ]M[_ ]LTE' + model: 'Hammer Axe M LTE' + - regex: 'INFINITY (LTE|3G)' + model: 'Infinity $1' + - regex: 'LUNA_II' + model: 'Luna II' + - regex: 'Pocket_2(?:[);/ ]|$)' + model: 'Pocket 2' + - regex: 'Pocket(?:[);/ ]|$)' + model: 'Pocket' + - regex: 'myPhone[_ ]Pocket[_ ]Pro' + model: 'Pocket Pro' + - regex: 'Pocket_18x9' + model: 'Pocket 18x9' + - regex: 'Prime3Lite(?:[);/ ]|$)' + model: 'Prime 3 Lite' + - regex: 'Prime_4_Lite' + model: 'Prime 4 Lite' + - regex: 'Prime_18x9(_LTE)?(?:[);/ ]|$)' + model: 'Prime 18x9$1' + - regex: 'Q_Smart_BE(?:[);/ ]|$)' + model: 'Q-Smart BE' + - regex: 'Q-Smart_Plus(?:[);/ ]|$)' + model: 'Q-Smart Plus' + - regex: 'Q-Smart_III_Plus' + model: 'Q-Smart III Plus' + + # explicit table models + - regex: 'myTab10II' + model: 'myTab 10 II' + device: 'tablet' + - regex: 'myTab_10III' + model: 'myTab 10 III' + device: 'tablet' + - regex: 'SmartView_7_3G' + model: 'SmartView 7" 3G' + device: 'tablet' + - regex: 'SmartView_8_LTE' + model: 'SmartView 8" LTE' + device: 'tablet' + - regex: 'SmartView_9[_.]6_3G' + model: 'SmartView 9.6" 3G' + device: 'tablet' + + # general detections + - regex: 'myPhone[ _]([^;/)]+)( Build|[;)])' + model: '$1' + - regex: 'myTab[ _]?([^;/]+)(?: Build|[;)])' + model: 'myTab $1' device: 'tablet' # MyWigo