Fixed BB10 detection

sinergi · Jul 25, 2016 · 356eb62 · 356eb62
1 parent 8d96452
commit 356eb62
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 6.0.3 (released 2016-07-25)
+
+- Fixed BB10 detection
+
 ## 6.0.2 (released 2016-06-30)
 
 - Added Comodo Dragon detection

diff --git a/src/BrowserDetector.php b/src/BrowserDetector.php
@@ -148,6 +148,14 @@ public static function checkBrowserBlackBerry()
             }
             self::$browser->setName(Browser::BLACKBERRY);
 
+            return true;
+        } elseif (stripos(self::$userAgentString, 'BB10') !== false) {
+            $aresult = explode('Version/10.', self::$userAgentString);
+            if (isset($aresult[1])) {
+                $aversion = explode(' ', $aresult[1]);
+                self::$browser->setVersion('10.' . $aversion[0]);
+            }
+            self::$browser->setName(Browser::BLACKBERRY);
             return true;
         }
 

diff --git a/src/OsDetector.php b/src/OsDetector.php
@@ -310,6 +310,18 @@ private static function checkBlackBerry(Os $os, UserAgent $userAgent)
             $os->setName($os::BLACKBERRY);
             $os->setIsMobile(true);
 
+            return true;
+        } elseif (stripos($userAgent->getUserAgentString(), 'BB10') !== false) {
+            $aresult = explode('Version/10.', $userAgent->getUserAgentString());
+            if (isset($aresult[1])) {
+                $aversion = explode(' ', $aresult[1]);
+                $os->setVersion('10.' . $aversion[0]);
+            } else {
+                $os->setVersion('10');
+            }
+            $os->setName($os::BLACKBERRY);
+            $os->setIsMobile(true);
+
             return true;
         }
 

diff --git a/tests/BrowserDetector/Tests/_files/UserAgentStrings.xml b/tests/BrowserDetector/Tests/_files/UserAgentStrings.xml
@@ -219,5 +219,16 @@
                 Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/532.5 (KHTML, like Gecko) Comodo_Dragon/4.1.1.11 Chrome/4.1.249.1042 Safari/532.5
             </field>
         </string>
+        <string>
+            <field name="browser">BlackBerry</field>
+            <field name="version">10.0.9.2372</field>
+            <field name="os">BlackBerry</field>
+            <field name="os_version">10.0.9.2372</field>
+            <field name="device">unknown</field>
+            <field name="device_version">unknown</field>
+            <field name="string">
+                Mozilla/5.0 (BB10; Touch) AppleWebKit/537.10+ (KHTML, like Gecko) Version/10.0.9.2372 Mobile Safari/537.10+
+            </field>
+        </string>
     </strings>
 </document>