Adds detection for Miray devices (#5818)

matomo-org · Sep 26, 2018 · 39b20d1 · 39b20d1
1 parent 646daa2
commit 39b20d1
Show file tree

Hide file tree

Showing 8 changed files with 212 additions and 140 deletions.
diff --git a/Parser/Device/DeviceParserAbstract.php b/Parser/Device/DeviceParserAbstract.php
@@ -260,6 +260,7 @@ abstract class DeviceParserAbstract extends ParserAbstract
         'MC' => 'Mediacom',
         'MK' => 'MediaTek',
         'MO' => 'Mio',
+        'M7' => 'Miray',
         'MM' => 'Mpman',
         'M4' => 'Modecom',
         'MF' => 'Mofut',

diff --git a/Tests/fixtures/smartphone-3.yml b/Tests/fixtures/smartphone-3.yml
@@ -1397,6 +1397,46 @@
     model: Zumbo S2
   os_family: Android
   browser_family: Chrome
+- 
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.0.6; es-es; MPM_AVA758 Build/IML74K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
+  os:
+    name: Android
+    short_name: AND
+    version: "4.0.6"
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    short_name: AN
+    version: ""
+    engine: WebKit
+    engine_version: "534.30"
+  device:
+    type: smartphone
+    brand: M7
+    model: MPM AVA758
+  os_family: Android
+  browser_family: Android Browser
+- 
+  user_agent: Mozilla/5.0 (Linux; U; Android 2.3.5; en-us ; MPM-i616 Build/MocorDroid2.3.5) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1/UCBrowser/8.6.1.262/145/444
+  os:
+    name: MocorDroid
+    short_name: MCD
+    version: "2.3.5"
+    platform: ""
+  client:
+    type: browser
+    name: UC Browser
+    short_name: UC
+    version: "8.6.1.262"
+    engine: WebKit
+    engine_version: "533.1"
+  device:
+    type: smartphone
+    brand: M7
+    model: MPM i616
+  os_family: Android
+  browser_family: Unknown
 - 
   user_agent: Mozilla/5.0 (Linux; U; Android 4.1.1; fr-fr; Cynus F3 Build/JRO03C) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
   os:
@@ -9798,43 +9838,3 @@
     model: Eluga A2
   os_family: Android
   browser_family: Chrome
-- 
-  user_agent: Mozilla/5.0 (Linux; Android 5.1; ELUGA_I2 Build/LMY47D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.125 Mobile Safari/537.36
-  os:
-    name: Android
-    short_name: AND
-    version: "5.1"
-    platform: ""
-  client:
-    type: browser
-    name: Chrome Mobile
-    short_name: CM
-    version: "59.0.3071.125"
-    engine: Blink
-    engine_version: ""
-  device:
-    type: smartphone
-    brand: PA
-    model: Eluga I2
-  os_family: Android
-  browser_family: Chrome
-- 
-  user_agent: Mozilla/5.0 (Linux; Android 6.0; ELUGA Note Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.111 Mobile Safari/537.36
-  os:
-    name: Android
-    short_name: AND
-    version: "6.0"
-    platform: ""
-  client:
-    type: browser
-    name: Chrome Mobile
-    short_name: CM
-    version: "63.0.3239.111"
-    engine: Blink
-    engine_version: ""
-  device:
-    type: smartphone
-    brand: PA
-    model: Eluga Note
-  os_family: Android
-  browser_family: Chrome
diff --git a/Tests/fixtures/smartphone-4.yml b/Tests/fixtures/smartphone-4.yml
@@ -1,4 +1,44 @@
 ---
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 5.1; ELUGA_I2 Build/LMY47D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.125 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: "5.1"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    short_name: CM
+    version: "59.0.3071.125"
+    engine: Blink
+    engine_version: ""
+  device:
+    type: smartphone
+    brand: PA
+    model: Eluga I2
+  os_family: Android
+  browser_family: Chrome
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 6.0; ELUGA Note Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.111 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: "6.0"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    short_name: CM
+    version: "63.0.3239.111"
+    engine: Blink
+    engine_version: ""
+  device:
+    type: smartphone
+    brand: PA
+    model: Eluga Note
+  os_family: Android
+  browser_family: Chrome
 - 
   user_agent: Mozilla/5.0 (Linux; Android 6.0; ELUGA Ray X Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Mobile Safari/537.36
   os:
@@ -9848,43 +9888,3 @@
     model: Live with Walkman
   os_family: Android
   browser_family: Android Browser
-- 
-  user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; en-us; SonyEricssonMT25i Build/4.1.B.0.631) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
-  os:
-    name: Android
-    short_name: AND
-    version: "4.0.4"
-    platform: ""
-  client:
-    type: browser
-    name: Android Browser
-    short_name: AN
-    version: ""
-    engine: WebKit
-    engine_version: "534.30"
-  device:
-    type: smartphone
-    brand: SE
-    model: MT25i
-  os_family: Android
-  browser_family: Android Browser
-- 
-  user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; es-co; MT25i Build/4.1.B.0.631) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
-  os:
-    name: Android
-    short_name: AND
-    version: "4.0.4"
-    platform: ""
-  client:
-    type: browser
-    name: Android Browser
-    short_name: AN
-    version: ""
-    engine: WebKit
-    engine_version: "534.30"
-  device:
-    type: smartphone
-    brand: SE
-    model: MT25i
-  os_family: Android
-  browser_family: Android Browser
diff --git a/Tests/fixtures/smartphone-5.yml b/Tests/fixtures/smartphone-5.yml
@@ -1,4 +1,44 @@
 ---
+- 
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; en-us; SonyEricssonMT25i Build/4.1.B.0.631) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
+  os:
+    name: Android
+    short_name: AND
+    version: "4.0.4"
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    short_name: AN
+    version: ""
+    engine: WebKit
+    engine_version: "534.30"
+  device:
+    type: smartphone
+    brand: SE
+    model: MT25i
+  os_family: Android
+  browser_family: Android Browser
+- 
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; es-co; MT25i Build/4.1.B.0.631) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
+  os:
+    name: Android
+    short_name: AND
+    version: "4.0.4"
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    short_name: AN
+    version: ""
+    engine: WebKit
+    engine_version: "534.30"
+  device:
+    type: smartphone
+    brand: SE
+    model: MT25i
+  os_family: Android
+  browser_family: Android Browser
 - 
   user_agent: Mozilla/5.0 (Linux; U; Android 4.4.2; zh-CN; W960 Build/KOT49H) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 UCBrowser/9.8.9.457 U3/0.8.0 Mobile Safari/533.1
   os:
@@ -9872,43 +9912,3 @@
     model: Wave Pro s5021
   os_family: Android
   browser_family: Chrome
-- 
-  user_agent: Mozilla/5.0 (Linux; Android 6.0; Apollo Lite Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.126 Mobile Safari/537.36
-  os:
-    name: Android
-    short_name: AND
-    version: "6.0"
-    platform: ""
-  client:
-    type: browser
-    name: Chrome Mobile
-    short_name: CM
-    version: "66.0.3359.126"
-    engine: Blink
-    engine_version: ""
-  device:
-    type: smartphone
-    brand: VR
-    model: Apollo Lite
-  os_family: Android
-  browser_family: Chrome
-- 
-  user_agent: Mozilla/5.0 (Linux; Android 6.0; Apollo X Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.84 Mobile Safari/537.36
-  os:
-    name: Android
-    short_name: AND
-    version: "6.0"
-    platform: ""
-  client:
-    type: browser
-    name: Chrome Mobile
-    short_name: CM
-    version: "62.0.3202.84"
-    engine: Blink
-    engine_version: ""
-  device:
-    type: smartphone
-    brand: VR
-    model: Apollo X
-  os_family: Android
-  browser_family: Chrome
diff --git a/Tests/fixtures/smartphone-6.yml b/Tests/fixtures/smartphone-6.yml
@@ -1,4 +1,44 @@
 ---
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 6.0; Apollo Lite Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.126 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: "6.0"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    short_name: CM
+    version: "66.0.3359.126"
+    engine: Blink
+    engine_version: ""
+  device:
+    type: smartphone
+    brand: VR
+    model: Apollo Lite
+  os_family: Android
+  browser_family: Chrome
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 6.0; Apollo X Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.84 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: "6.0"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    short_name: CM
+    version: "62.0.3202.84"
+    engine: Blink
+    engine_version: ""
+  device:
+    type: smartphone
+    brand: VR
+    model: Apollo X
+  os_family: Android
+  browser_family: Chrome
 - 
   user_agent: Mozilla/5.0 (Linux; Android 7.0; vernee_M5 Build/vernee_M5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.53 Mobile Safari/537.36
   os:

diff --git a/Tests/fixtures/tablet-1.yml b/Tests/fixtures/tablet-1.yml
@@ -4473,6 +4473,26 @@
     model: FreeWay Tab 7.0
   os_family: Android
   browser_family: Chrome
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 4.2.1; MIDM-8803 Build/JOP40D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.114 Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: "4.2.1"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    short_name: CH
+    version: "34.0.1847.114"
+    engine: Blink
+    engine_version: ""
+  device:
+    type: tablet
+    brand: M7
+    model: MIDM 8803
+  os_family: Android
+  browser_family: Chrome
 - 
   user_agent: Mozilla/5.0 (Linux; U; Android 4.2.1; fr-fr; MID1001 Build/JOP40D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30
   os:
@@ -9967,23 +9987,3 @@
     model: i9
   os_family: Android
   browser_family: Android Browser
-- 
-  user_agent: Mozilla/5.0 (Linux; U; Android 4.1.1; fr-fr; Ramos W27Pro Build/JRO03C) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30 GSA/3.2.17.1009776.arm
-  os:
-    name: Android
-    short_name: AND
-    version: "4.1.1"
-    platform: ARM
-  client:
-    type: browser
-    name: Android Browser
-    short_name: AN
-    version: ""
-    engine: WebKit
-    engine_version: "534.30"
-  device:
-    type: tablet
-    brand: RA
-    model: W27Pro
-  os_family: Android
-  browser_family: Android Browser
diff --git a/Tests/fixtures/tablet-2.yml b/Tests/fixtures/tablet-2.yml
@@ -1,4 +1,24 @@
 ---
+- 
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.1.1; fr-fr; Ramos W27Pro Build/JRO03C) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30 GSA/3.2.17.1009776.arm
+  os:
+    name: Android
+    short_name: AND
+    version: "4.1.1"
+    platform: ARM
+  client:
+    type: browser
+    name: Android Browser
+    short_name: AN
+    version: ""
+    engine: WebKit
+    engine_version: "534.30"
+  device:
+    type: tablet
+    brand: RA
+    model: W27Pro
+  os_family: Android
+  browser_family: Android Browser
 - 
   user_agent: Mozilla/5.0 (Linux; U; Android 4.2.2; en-us; Ramos X10 PROæ—¶å°šç‰ˆ Build/JDQ39) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30
   os: