Changeset 5984

Timestamp:

10/02/2017 03:53:11 PM (22 months ago)

Author:

coffee2code

Message:

Browse Happy API: Add support for Amazon Silk as a browser and Fire OS as a platform.

• Adds Amazon Silk as a recognized browser
• Changes existing "Kindle" to "Kindle Browser"
• Removes hacky override that set Kindle's platform to "Kindle"
• Attributes Amazon Silk and Kindle Browser to Fire OS platform
• Omits version number from Kindle Browser
• Updates existing Kindle unit tests to reflect these changes

Location:

sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0

Files:

• parse.php (modified) (5 diffs)
• tests/phpunit/tests/browse-happy.php (modified) (4 diffs)

sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/parse.php

@@ -49 +49 @@
     // Properly set platform if Android is actually being reported.
     if ( 'Linux' === $data['platform'] && false !== strpos( $user_agent, 'Android' ) ) {
-        $data['platform'] = 'Android';
+        if ( strpos( $user_agent, 'Kindle' ) ) {
+            $data['platform'] = 'Fire OS';
+        } else {
+            $data['platform'] = 'Android';
+        }
     } elseif ( 'Windows Phone' === $data['platform'] ) {
         $data['platform'] = 'Windows Phone OS';
     }
 
-    if ( in_array( $data['platform'], array( 'Android', 'iPad', 'iPhone', 'PlayBook', 'RIM Tablet OS', 'Windows Phone OS' ) ) ) {
+    if ( in_array( $data['platform'], array( 'Android', 'Fire OS', 'iPad', 'iPhone', 'PlayBook', 'RIM Tablet OS', 'Windows Phone OS' ) ) ) {
         $data['mobile'] = true;
     }
 
     preg_match_all(
-        '%(?P<name>Opera Mini|Opera|OPR|Edge|Trident|Camino|Kindle|Firefox|(?:Mobile )?Safari|NokiaBrowser|MSIE|RockMelt|AppleWebKit|Chrome|IEMobile|Version)(?:[/ ])(?P<version>[0-9.]+)%im',
+        '%(?P<name>Opera Mini|Opera|OPR|Edge|Trident|Silk|Camino|Kindle|Firefox|(?:Mobile )?Safari|NokiaBrowser|MSIE|RockMelt|AppleWebKit|Chrome|IEMobile|Version)(?:[/ ])(?P<version>[0-9.]+)%im',
         $user_agent,
         $result,
@@ -93 +97 @@
     }
     // Nokia Browser
-    elseif ( $key = array_search( 'NokiaBrowser', $result['name'] ) ) {
+    elseif ( false !== ( $key = array_search( 'NokiaBrowser', $result['name'] ) ) ) {
         $data['name']     = 'Nokia Browser';
         $data['version']  = $result['version'][ $key ];
         $data['mobile']   = true;
-    } elseif ( 'AppleWebKit' == $result['name'][0] ) {
+    }
+    // Amazon Silk
+    elseif ( false !== ( $key = array_search( 'Silk', $result['name'] ) ) ) {
+        $data['name']     = 'Amazon Silk';
+        $data['version']  = $result['version'][ $key ];
+        $version          = '';
+    }
+    // Kindle Browser
+    elseif ( false !== ( $key = array_search( 'Kindle', $result['name'] ) ) ) {
+        $data['name']     = 'Kindle Browser';
+        $data['version']  = $result['version'][ $key ];
+    }
+    // AppleWebKit-emulating browsers
+    elseif ( 'AppleWebKit' == $result['name'][0] ) {
         if ( $key = array_search( 'Edge', $result['name'] ) ) {
             $data['name'] = 'Microsoft Edge';
@@ -106 +123 @@
             } elseif ( 'Android' === $data['platform'] ) {
                 $data['name'] = 'Android Browser';
+            } elseif ( 'Fire OS' === $data['platform'] ) {
+                $data['name'] = 'Kindle Browser';
             } else {
                 $data['name'] = 'Mobile Safari';
@@ -117 +136 @@
         } elseif ( ! empty( $data['platform'] ) && 'PlayBook' == $data['platform'] ) {
             $data['name'] = 'PlayBook';
-        } elseif ( $key = array_search( 'Kindle', $result['name'] ) ) {
-            $data['name'] = 'Kindle';
         } elseif ( $key = array_search( 'Safari', $result['name'] ) ) {
             if ( 'Android' === $data['platform'] ) {
@@ -155 +172 @@
     }
 
-    if ( in_array( $data['name'], array( 'Kindle' ) ) ) {
-        $data['platform'] = $data['name'];
+    // Set the platform for Amazon-related browsers.
+    if ( in_array( $data['name'], array( 'Amazon Silk', 'Kindle Browser' ) ) ) {
+        $data['platform'] = 'Fire OS';
+        $data['mobile']   = true;
     }
 

sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/tests/phpunit/tests/browse-happy.php

@@ -22 +22 @@
         return [
 
+            // Amazon Silk
+
+            [
+                'Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Silk/1.0.146.3-Gen4_12000410) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 Silk-Accelerated=true',
+                'Fire OS Amazon Silk 1.0.146.3',
+            ],
+            [
+                'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_3; en-us; Silk/1.0.146.3-Gen4_12000410) AppleWebKit/533.16 (KHTML, like Gecko) Version/5.0 Safari/533.16 Silk-Accelerated=true',
+                'Fire OS Amazon Silk 1.0.146.3',
+            ],
+            [
+                'Mozilla/5.0 (Linux; U; Android 4.0.3; en-us; KFTT Build/IML74K) AppleWebKit/537.36 (KHTML, like Gecko) Silk/3.68 like Chrome/39.0.2171.93 Safari/537.36',
+                'Fire OS Amazon Silk 3.68',
+            ],
+            [
+                'Mozilla/5.0 (Linux; Android 4.0.3; KFTT Build/IML74K) AppleWebKit/537.36 (KHTML, like Gecko) Silk/51.2.1 like Chrome/51.0.2704.81 Safari/537.36',
+                'Fire OS Amazon Silk 51.2.1',
+            ],
+            [
+                'Mozilla/5.0 (Linux; Android 5.1.1; KFDOWI Build/LVY48F) AppleWebKit/537.36 (KHTML, like Gecko) Silk/58.2.6 like Chrome/58.0.3029.83 Safari/537.36',
+                'Fire OS Amazon Silk 58.2.6',
+            ],
+
             // Android Browser
 
@@ -269 +292 @@
             ],
 
+            // Kindle Browser
+
+            [
+                'Mozilla/4.0 (compatible; Linux 2.6.10) NetFront/3.3 Kindle/1.0 (screen 600x800)',
+                'Fire OS Kindle Browser 1.0',
+            ],
+            [
+                'Mozilla/5.0 (Linux; U; en-US) AppleWebKit/528.5+ (KHTML, like Gecko, Safari/528.5+) Version/4.0 Kindle/3.0 (screen 600x800; rotate)',
+                'Fire OS Kindle Browser 4.0',
+            ],
+            [
+                'Mozilla/5.0 (Linux; U; en-US) AppleWebKit/528.5+ (KHTML, like Gecko, Safari/538.5+) Version/4.0 Kindle/3.0 (screen 600x800; rotate)',
+                'Fire OS Kindle Browser 4.0',
+            ],
+            [
+                'Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Kindle Fire Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1',
+                'Fire OS Kindle Browser 4.0',
+            ],
+            [
+                'Mozilla/5.0 (X11; U; Linux armv7l like Android; en-us) AppleWebKit/531.2+ (KHTML, like Gecko) Version/5.0 Safari/533.2+ Kindle/3.0+',
+                'Fire OS Kindle Browser 5.0',
+            ],
+
             // Microsoft Edge
 
@@ -442 +488 @@
             // Miscellaneous
 
-            [
-                'Mozilla/4.0 (compatible; Linux 2.6.10) NetFront/3.3 Kindle/1.0 (screen 600x800)',
-                'Kindle Kindle 1.0',
-            ],
-            [
-                'Mozilla/5.0 (Linux; U; en-US) AppleWebKit/528.5+ (KHTML, like Gecko, Safari/528.5+) Version/4.0 Kindle/3.0 (screen 600x800; rotate)',
-                'Kindle Kindle 4.0',
-            ],
-            [
-                'Mozilla/5.0 (Linux; U; en-US) AppleWebKit/528.5+ (KHTML, like Gecko, Safari/538.5+) Version/4.0 Kindle/3.0 (screen 600x800; rotate)',
-                'Kindle Kindle 4.0',
-            ],
             [
                 'Mozilla/5.0 (PlayBook; U; RIM Tablet OS 1.0.0; en-US) AppleWebKit/534.8 (KHTML, like Gecko) Version/0.0.1 Safari/534.8',
@@ -556 +590 @@
         $parsed = browsehappy_parse_user_agent( $header );
 
-        if ( in_array( $parsed['platform'], array( 'Android', 'iPad', 'iPhone', 'Mobile', 'PlayBook', 'RIM Tablet OS', 'Windows Phone OS' ) ) ) {
+        if ( in_array( $parsed['platform'], array( 'Android', 'Fire OS', 'iPad', 'iPhone', 'Mobile', 'PlayBook', 'RIM Tablet OS', 'Windows Phone OS' ) ) ) {
             $this->assertTrue( $parsed['mobile'] );
         } else {