Split Firefox into Firefox and Firefox Mobile (#5625)

* split Firefox in Firefox and Firefox Mobile * Firefox on iOS is also Firefox Mobile * add Firefox Mobile to mobileOnlyBrowsers
matomo-org · Jun 5, 2017 · 0d158ac · 0d158ac
1 parent 2e3082f
commit 0d158ac
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 17 deletions.
diff --git a/Parser/Client/Browser.php b/Parser/Client/Browser.php
@@ -77,6 +77,7 @@ class Browser extends ClientParserAbstract
         'FE' => 'Fennec',
         'FF' => 'Firefox',
         'FL' => 'Flock',
+        'FM' => 'Firefox Mobile',
         'FW' => 'Fireweb',
         'FN' => 'Fireweb Navigator',
         'GA' => 'Galeon',
@@ -182,7 +183,7 @@ class Browser extends ClientParserAbstract
         'Baidu'              => array('BD', 'BS'),
         'Amiga'              => array('AV', 'AW'),
         'Chrome'             => array('CH', 'BR', 'CC', 'CD', 'CM', 'CI', 'CF', 'CN', 'CR', 'CP', 'IR', 'RM', 'AO', 'TS', 'VI'),
-        'Firefox'            => array('FF', 'FE', 'SX', 'FB', 'PX', 'MB'),
+        'Firefox'            => array('FF', 'FE', 'FM', 'SX', 'FB', 'PX', 'MB'),
         'Internet Explorer'  => array('IE', 'IM', 'PS'),
         'Konqueror'          => array('KO'),
         'NetFront'           => array('NF'),
@@ -198,7 +199,7 @@ class Browser extends ClientParserAbstract
      * @var array
      */
     protected static $mobileOnlyBrowsers = array(
-        '36', 'PU', 'SK', 'OI', 'DB', 'ST', 'BL', 'IV'
+        '36', 'PU', 'SK', 'OI', 'DB', 'ST', 'BL', 'IV', 'FM'
     );
 
     /**

diff --git a/Tests/Parser/Client/fixtures/browser.yml b/Tests/Parser/Client/fixtures/browser.yml
@@ -552,8 +552,8 @@
   user_agent: Mozilla/5.0 (iPhone; CPU iPhone OS 8_3 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) FxiOS/1.0 Mobile/12F69 Safari/600.1.4
   client:
     type: browser
-    name: Firefox
-    short_name: FF
+    name: Firefox Mobile
+    short_name: FM
     version: "iOS 1.0"
     engine: WebKit
     engine_version: "600.1.4"

diff --git a/Tests/fixtures/smartphone.yml b/Tests/fixtures/smartphone.yml
@@ -8,8 +8,8 @@
     platform:
   client:
     type: browser
-    name: Firefox
-    short_name: FF
+    name: Firefox Mobile
+    short_name: FM
     version: "22.0"
     engine: Gecko
     engine_version: "22.0"
@@ -28,8 +28,8 @@
     platform:
   client:
     type: browser
-    name: Firefox
-    short_name: FF
+    name: Firefox Mobile
+    short_name: FM
     version: "26.0"
     engine: Gecko
     engine_version: "26.0"
@@ -585,8 +585,8 @@
     platform:
   client:
     type: browser
-    name: Firefox
-    short_name: FF
+    name: Firefox Mobile
+    short_name: FM
     version: "18.1"
     engine: Gecko
     engine_version: "18.1"
@@ -1181,8 +1181,8 @@
     platform:
   client:
     type: browser
-    name: Firefox
-    short_name: FF
+    name: Firefox Mobile
+    short_name: FM
     version: "18.1"
     engine: Gecko
     engine_version: "18.1"

diff --git a/Tests/fixtures/tablet.yml b/Tests/fixtures/tablet.yml
@@ -8,8 +8,8 @@
     platform:
   client:
     type: browser
-    name: Firefox
-    short_name: FF
+    name: Firefox Mobile
+    short_name: FM
     version: "20.0"
     engine: Gecko
     engine_version: "20.0"
@@ -28,8 +28,8 @@
     platform:
   client:
     type: browser
-    name: Firefox
-    short_name: FF
+    name: Firefox Mobile
+    short_name: FM
     version: "26.0"
     engine: Gecko
     engine_version: "26.0"

diff --git a/regexes/client/browsers.yml b/regexes/client/browsers.yml
@@ -174,6 +174,13 @@
   engine:
     default: 'Gecko'
 
+#Firefox Mobile
+- regex: '(Mobile|Tablet).*Firefox(?:/(\d+[\.\d]+))?'
+  name: 'Firefox Mobile'
+  version: '$2'
+  engine:
+    default: 'Gecko'
+
 #Firefox
 - regex: 'Firefox(?:/(\d+[\.\d]+))?'
   name: 'Firefox'
@@ -186,7 +193,7 @@
   engine:
     default: 'Gecko'
 - regex: 'FxiOS/(\d+[\.\d]+)'
-  name: 'Firefox'
+  name: 'Firefox Mobile'
   version: 'iOS $1'
   engine:
     default: 'WebKit'