Improve detection of Samsung Smart TVs

Author: NielsLeenheer

src/Analyser/Header/Useragent/Os.php

@@ -945,7 +945,7 @@ private function detectTizen($ua)
         if (preg_match('/Tizen/u', $ua)) {
             $this->data->os->name = 'Tizen';
 
-            if (preg_match('/Tizen[\/ ]([0-9.]*[0-9])/u', $ua, $match)) {
+            if (preg_match('/Tizen[\/ ]?([0-9.]*[0-9])/u', $ua, $match)) {
                 $this->data->os->version = new Version([ 'value' => $match[1] ]);
             }
 
@@ -954,6 +954,9 @@ private function detectTizen($ua)
                 if (strtoupper($match[1]) == 'SMART-TV') {
                     $falsepositive = true;
                 }
+                if ($match[1] == 'TV') {
+                    $falsepositive = true;
+                }
                 if ($match[1] == 'Linux') {
                     $falsepositive = true;
                 }
@@ -1009,7 +1012,7 @@ private function detectTizen($ua)
             }
 
 
-            if (preg_match('/\(SMART[ -]TV;/iu', $ua, $match)) {
+            if (preg_match('/\((SMART[ -])?TV;/iu', $ua, $match)) {
                 $this->data->device->type = Constants\DeviceType::TELEVISION;
                 $this->data->device->manufacturer = 'Samsung';
                 $this->data->device->series = 'Smart TV';

tests/data/mobile/os-tizen.yaml

@@ -172,8 +172,8 @@
     readable: 'Samsung Browser on a Samsung GT-I9500 prototype running Tizen 2.0'
 -
     headers: 'User-Agent: Mozilla/5.0(Linux; Tizen2.2;sdk) AppleWebKit/537.3 (KHTML, like Gecko) Version/2.2 Mobile Safari/537.3'
-    result: { browser: { name: 'Samsung Browser' }, engine: { name: Webkit, version: '537.3' }, os: { name: Tizen }, device: { type: mobile, subtype: smart } }
-    readable: 'Samsung Browser on Tizen'
+    result: { browser: { name: 'Samsung Browser' }, engine: { name: Webkit, version: '537.3' }, os: { name: Tizen, version: '2.2' }, device: { type: mobile, subtype: smart } }
+    readable: 'Samsung Browser on Tizen 2.2'
 -
     headers: 'User-Agent: Opera/9.80 (Tizen; Opera Mini/7.5.35847/35.5691; U; xx) Presto/2.8.119 Version/11.10'
     result: { browser: { name: 'Opera Mini', version: '7.5', type: browser }, engine: { name: Presto, version: 2.8.119 }, os: { name: Tizen }, device: { type: mobile, subtype: smart } }

tests/data/television/samsung.yaml

@@ -142,3 +142,7 @@
     headers: 'User-Agent: Mozilla/5.0 ( U; Linux/+2013; Maple2012) AppleWebKit/535.20+ (KHTML, like Gecko)  Safari/535.20+'
     readable: 'a Samsung Smart TV 2013'
     result: { engine: { name: Webkit, version: '535.20' }, device: { type: television, manufacturer: Samsung, series: 'Smart TV 2013' } }
+-
+    headers: 'User-Agent: Mozilla/5.0 (TV; Linux; Tizen2.3) AppleWebkit/538.1 (KHTML, like Gecko) SamsungBrowser/1.0 TV Safari/538.1'
+    readable: 'Samsung Browser 1.0 on a Samsung Smart TV running Tizen 2.3'
+    result: { browser: { name: 'Samsung Browser', version: '1.0' }, engine: { name: Webkit, version: '538.1' }, os: { name: Tizen, version: '2.3' }, device: { type: television, manufacturer: Samsung, series: 'Smart TV' } }