Merge pull request #5479 from piwik/develop

Detect Web TV as model instead of brand

DeviceDetector.php

@@ -48,7 +48,7 @@ class DeviceDetector
     /**
      * Current version number of DeviceDetector
      */
-    const VERSION = '3.6.0';
+    const VERSION = '3.6.1';
 
     /**
      * Holds all registered client types

Parser/Device/DeviceParserAbstract.php

@@ -344,7 +344,6 @@ abstract class DeviceParserAbstract extends ParserAbstract
         'VZ' => 'Vizio',
         'VW' => 'Videoweb',
         'WA' => 'Walton',
-        'WB' => 'Web TV',
         'WE' => 'WellcoM',
         'WY' => 'Wexler',
         'WI' => 'Wiko',
@@ -353,7 +352,6 @@ abstract class DeviceParserAbstract extends ParserAbstract
         'WX' => 'Woxter',
         'XI' => 'Xiaomi',
         'XO' => 'Xolo',
-        'XX' => 'Unknown',
         'YA' => 'Yarvik',
         'YU' => 'Yuandao',
         'YS' => 'Yusun',
@@ -362,6 +360,10 @@ abstract class DeviceParserAbstract extends ParserAbstract
         'ZO' => 'Zonda',
         'ZP' => 'Zopo',
         'ZT' => 'ZTE',
+
+        // legacy brands, might be removed in future versions
+        'WB' => 'Web TV',
+        'XX' => 'Unknown'
     );
 
     public function getDeviceType()
@@ -462,12 +464,14 @@ public function parse()
             return false;
         }
 
-        $brandId = array_search($brand, self::$deviceBrands);
-        if ($brandId === false) {
-            // This Exception should never be thrown. If so a defined brand name is missing in $deviceBrands
-            throw new \Exception("The brand with name '$brand' should be listed in the deviceBrands array."); // @codeCoverageIgnore
+        if ($brand != 'Unknown') {
+            $brandId = array_search($brand, self::$deviceBrands);
+            if ($brandId === false) {
+                // This Exception should never be thrown. If so a defined brand name is missing in $deviceBrands
+                throw new \Exception("The brand with name '$brand' should be listed in the deviceBrands array."); // @codeCoverageIgnore
+            }
+            $this->brand = $brandId;
         }
-        $this->brand = $brandId;
 
         if (isset($regex['device']) && in_array($regex['device'], self::$deviceTypes)) {
             $this->deviceType = self::$deviceTypes[$regex['device']];

Tests/Parser/Devices/DeviceParserAbstractTest.php

@@ -28,7 +28,7 @@ public function testGetAvailableDeviceTypeNames()
     public function testGetFullName()
     {
         $this->assertEquals('', DeviceParserAbstract::getFullName('Invalid'));
-        $this->assertEquals('Unknown', DeviceParserAbstract::getFullName('XX'));
+        $this->assertEquals('Asus', DeviceParserAbstract::getFullName('AU'));
         $this->assertEquals('Google', DeviceParserAbstract::getFullName('GO'));
     }
 }

Tests/fixtures/tv.yml

@@ -2557,7 +2557,7 @@
     engine: Trident
   device:
     type: tv
-    brand: WB
-    model:
+    brand:
+    model: Web TV
   os_family: WebTV
   browser_family: Internet Explorer

regexes/device/mobiles.yml

@@ -4673,11 +4673,11 @@ Fly:
     - regex: 'MERIDIAN-([a-z0-9]+)'
       model: '$1'
 
-# Web TV
-Web TV:
+# Devices with undectable brand, but detectable model
+Unknown:
   regex: 'WebTV/(\d+\.\d+)'
   device: 'tv'
-  model: ''
+  model: 'Web TV'
 
 # Zeemi
 Zeemi: