refs #5547 - adds detection for Bravis devices

matomo-org · Nov 18, 2016 · 078eb50 · 078eb50
1 parent 76c1c97
commit 078eb50
Show file tree

Hide file tree

Showing 7 changed files with 211 additions and 160 deletions.
diff --git a/Parser/Device/DeviceParserAbstract.php b/Parser/Device/DeviceParserAbstract.php
@@ -91,6 +91,7 @@ abstract class DeviceParserAbstract extends ParserAbstract
         'BU' => 'Blu',
         'BW' => 'Boway',
         'BX' => 'bq',
+        'BV' => 'Bravis',
         'BR' => 'Brondi',
         'B1' => 'Bush',
         'CB' => 'CUBOT',

diff --git a/Tests/fixtures/smartphone-1.yml b/Tests/fixtures/smartphone-1.yml
@@ -1,4 +1,44 @@
 ---
+- 
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.1.2; zh-CN; Amaze 4G Build/JZO54K) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 UCBrowser/9.5.0.360 U3/0.8.0 Mobile Safari/533.1
+  os:
+    name: Android
+    short_name: AND
+    version: "4.1.2"
+    platform:
+  client:
+    type: browser
+    name: UC Browser
+    short_name: UC
+    version: "9.5.0.360"
+    engine: WebKit
+    engine_version: "533.1"
+  device:
+    type: smartphone
+    brand: HT
+    model: Amaze 4G
+  os_family: Android
+  browser_family: Unknown
+- 
+  user_agent: Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Sprint APA7373KT Build/GRJ22) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1
+  os:
+    name: Android
+    short_name: AND
+    version: "2.3.4"
+    platform:
+  client:
+    type: browser
+    name: Android Browser
+    short_name: AN
+    version:
+    engine: WebKit
+    engine_version: "533.1"
+  device:
+    type: smartphone
+    brand: HT
+    model: APA7373KT (Sprint)
+  os_family: Android
+  browser_family: Android Browser
 - 
   user_agent: Mozilla/5.0 (Linux; U; Android 2.2; en-us; Sprint APA9292KT Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1
   os:
@@ -9917,43 +9957,3 @@
     model: F240L
   os_family: Android
   browser_family: Android Browser
-- 
-  user_agent: Mozilla/5.0 (Linux; U; Android 1.6; fr-fr; LG-GT540 ; Build/Donut) AppleWebKit/528.5+ (KHTML, like Gecko) Version/3.1.2 Mobile Safari/525.20.1 Java/Jbed/7.0 Profile/MIDP-2.1 Configuration/CLDC-1.1 MMS/LG-Android-MMS-V1.0/1.2
-  os:
-    name: Android
-    short_name: AND
-    version: "1.6"
-    platform:
-  client:
-    type: browser
-    name: Android Browser
-    short_name: AN
-    version:
-    engine: WebKit
-    engine_version: "528.5"
-  device:
-    type: smartphone
-    brand: LG
-    model: GT540
-  os_family: Android
-  browser_family: Android Browser
-- 
-  user_agent: Mozilla/5.0 (Linux; Android 4.0.4; LG-KU5400 Build/IMM76D) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.166 Mobile Safari/535.19
-  os:
-    name: Android
-    short_name: AND
-    version: "4.0.4"
-    platform:
-  client:
-    type: browser
-    name: Chrome Mobile
-    short_name: CM
-    version: "18.0.1025.166"
-    engine: WebKit
-    engine_version: "535.19"
-  device:
-    type: smartphone
-    brand: LG
-    model: KU5400
-  os_family: Android
-  browser_family: Chrome
diff --git a/Tests/fixtures/smartphone-2.yml b/Tests/fixtures/smartphone-2.yml
@@ -1,4 +1,44 @@
 ---
+- 
+  user_agent: Mozilla/5.0 (Linux; U; Android 1.6; fr-fr; LG-GT540 ; Build/Donut) AppleWebKit/528.5+ (KHTML, like Gecko) Version/3.1.2 Mobile Safari/525.20.1 Java/Jbed/7.0 Profile/MIDP-2.1 Configuration/CLDC-1.1 MMS/LG-Android-MMS-V1.0/1.2
+  os:
+    name: Android
+    short_name: AND
+    version: "1.6"
+    platform:
+  client:
+    type: browser
+    name: Android Browser
+    short_name: AN
+    version:
+    engine: WebKit
+    engine_version: "528.5"
+  device:
+    type: smartphone
+    brand: LG
+    model: GT540
+  os_family: Android
+  browser_family: Android Browser
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 4.0.4; LG-KU5400 Build/IMM76D) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.166 Mobile Safari/535.19
+  os:
+    name: Android
+    short_name: AND
+    version: "4.0.4"
+    platform:
+  client:
+    type: browser
+    name: Chrome Mobile
+    short_name: CM
+    version: "18.0.1025.166"
+    engine: WebKit
+    engine_version: "535.19"
+  device:
+    type: smartphone
+    brand: LG
+    model: KU5400
+  os_family: Android
+  browser_family: Chrome
 - 
   user_agent: Mozilla/5.0 (Linux; U; Android 2.3.6; en-us; LGL35G/V100) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1
   os:
@@ -9846,43 +9886,3 @@
     model: GALAXY ACE Plus
   os_family: Android
   browser_family: Android Browser
-- 
-  user_agent: Mozilla/5.0 (Linux; U; Android 2.2; fr-fr; GT-I5801 Build/FROYO) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1
-  os:
-    name: Android
-    short_name: AND
-    version: "2.2"
-    platform:
-  client:
-    type: browser
-    name: Android Browser
-    short_name: AN
-    version:
-    engine: WebKit
-    engine_version: "533.1"
-  device:
-    type: smartphone
-    brand: SA
-    model: GALAXY Apollo
-  os_family: Android
-  browser_family: Android Browser
-- 
-  user_agent: Mozilla/5.0 (Linux; U; Android 2.1-update1; en-US; GT-I8520 Build/ECLAIR) AppleWebKit/534.31 (KHTML, like Gecko) UCBrowser/9.1.0.297 U3/0.8.0 Mobile Safari/534.31
-  os:
-    name: Android
-    short_name: AND
-    version: "2.1"
-    platform:
-  client:
-    type: browser
-    name: UC Browser
-    short_name: UC
-    version: "9.1.0.297"
-    engine: WebKit
-    engine_version: "534.31"
-  device:
-    type: smartphone
-    brand: SA
-    model: GALAXY Beam
-  os_family: Android
-  browser_family: Unknown
diff --git a/Tests/fixtures/smartphone-3.yml b/Tests/fixtures/smartphone-3.yml
@@ -1,4 +1,44 @@
 ---
+- 
+  user_agent: Mozilla/5.0 (Linux; U; Android 2.2; fr-fr; GT-I5801 Build/FROYO) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1
+  os:
+    name: Android
+    short_name: AND
+    version: "2.2"
+    platform:
+  client:
+    type: browser
+    name: Android Browser
+    short_name: AN
+    version:
+    engine: WebKit
+    engine_version: "533.1"
+  device:
+    type: smartphone
+    brand: SA
+    model: GALAXY Apollo
+  os_family: Android
+  browser_family: Android Browser
+- 
+  user_agent: Mozilla/5.0 (Linux; U; Android 2.1-update1; en-US; GT-I8520 Build/ECLAIR) AppleWebKit/534.31 (KHTML, like Gecko) UCBrowser/9.1.0.297 U3/0.8.0 Mobile Safari/534.31
+  os:
+    name: Android
+    short_name: AND
+    version: "2.1"
+    platform:
+  client:
+    type: browser
+    name: UC Browser
+    short_name: UC
+    version: "9.1.0.297"
+    engine: WebKit
+    engine_version: "534.31"
+  device:
+    type: smartphone
+    brand: SA
+    model: GALAXY Beam
+  os_family: Android
+  browser_family: Unknown
 - 
   user_agent: Mozilla/5.0 (Linux; U; Android 4.1.2; fr-fr; GT-I8530 Build/JZO54K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
   os:
@@ -9858,43 +9898,3 @@
     model: Xperia Z
   os_family: Android
   browser_family: Android Browser
-- 
-  user_agent: Mozilla/5.0 (Linux; U; Android 4.1.2; ja-jp; SO-02E Build/10.1.D.0.343) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 GSA/3.4.16.1149292.arm
-  os:
-    name: Android
-    short_name: AND
-    version: "4.1.2"
-    platform: ARM
-  client:
-    type: browser
-    name: Android Browser
-    short_name: AN
-    version:
-    engine: WebKit
-    engine_version: "534.30"
-  device:
-    type: smartphone
-    brand: SO
-    model: Xperia Z
-  os_family: Android
-  browser_family: Android Browser
-- 
-  user_agent: Mozilla/5.0 (Linux; Android 4.1.2; C6606 Build/10.1.1.B.0.166) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.59 Mobile Safari/537.36
-  os:
-    name: Android
-    short_name: AND
-    version: "4.1.2"
-    platform:
-  client:
-    type: browser
-    name: Chrome Mobile
-    short_name: CM
-    version: "31.0.1650.59"
-    engine: Blink
-    engine_version:
-  device:
-    type: smartphone
-    brand: SO
-    model: Xperia Z
-  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; U; Android 4.1.2; ja-jp; SO-02E Build/10.1.D.0.343) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 GSA/3.4.16.1149292.arm
+  os:
+    name: Android
+    short_name: AND
+    version: "4.1.2"
+    platform: ARM
+  client:
+    type: browser
+    name: Android Browser
+    short_name: AN
+    version:
+    engine: WebKit
+    engine_version: "534.30"
+  device:
+    type: smartphone
+    brand: SO
+    model: Xperia Z
+  os_family: Android
+  browser_family: Android Browser
+- 
+  user_agent: Mozilla/5.0 (Linux; Android 4.1.2; C6606 Build/10.1.1.B.0.166) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.59 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: "4.1.2"
+    platform:
+  client:
+    type: browser
+    name: Chrome Mobile
+    short_name: CM
+    version: "31.0.1650.59"
+    engine: Blink
+    engine_version:
+  device:
+    type: smartphone
+    brand: SO
+    model: Xperia Z
+  os_family: Android
+  browser_family: Chrome
 - 
   user_agent: UCWEB/2.0 (Linux; U; Adr 4.2.2; en-US; C6603) U2/1.0.0 UCBrowser/8.2.0.242 U2/1.0.0 Mobile
   os: