Changeset 5977

Timestamp:

09/29/2017 04:47:56 PM (8 years ago)

Author:

coffee2code

Message:

Browse Happy API: Add support for Android Browser.

• Also fixes a misidentification of certain user-agents for Chrome on Android as being Mobile Safari.
• Also fixes misidentifications in a few existing unit tests which were actually Android Browser user-agents and not Mobile Safari or Safari.

Location:

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

Files:

• parse.php (modified) (2 diffs)
• tests/phpunit/tests/browse-happy.php (modified) (3 diffs)

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

@@ -91 +91 @@
             $data['name'] = 'Microsoft Edge';
         } elseif ( $key = array_search( 'Mobile Safari', $result['name'] ) ) {
-            $data['name'] = 'Mobile Safari';
+            if ( $key2 = array_search( 'Chrome', $result['name'] ) ) {
+                $data['name'] = 'Chrome';
+                $version = $result['version'][ $key2 ];
+            } elseif ( 'Android' === $data['platform'] ) {
+                $data['name'] = 'Android Browser';
+            } else {
+                $data['name'] = 'Mobile Safari';
+            }
         // } elseif ( ( 'Android' == $data['platform'] && !($key = 0) ) || $key = array_search( 'Chrome', $result['name'] ) ) {
         } elseif ( $key = array_search( 'RockMelt', $result['name'] ) ) {
@@ -103 +110 @@
             $data['name'] = 'Kindle';
         } elseif ( $key = array_search( 'Safari', $result['name'] ) ) {
-            $data['name'] = 'Safari';
+            if ( 'Android' === $data['platform'] ) {
+                $data['name'] = 'Android Browser';
+            } else {
+                $data['name'] = 'Safari';
+            }
         } else {
             $key = 0;

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

@@ -22 +22 @@
         return [
 
+            // Android Browser
+            [
+                'Mozilla/5.0 (Linux; U; Android 2.2; en-us; SGH-T959 Build/FROYO) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1',
+                'Android Android Browser 4.0',
+            ],
+            [
+                'Mozilla/5.0 (Linux; U; Android 3.1; en-us; GT-P7510 Build/HMJ37) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13',
+                'Android Android Browser 4.0',
+            ],
+            [
+                'Mozilla/5.0 (Linux; U; Android 4.0.4; pt-br; MZ608 Build/7.7.1-141-7-FLEM-UMTS-LA) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30',
+                'Android Android Browser 4.0',
+            ],
+
             // Camino
 
@@ -46 +60 @@
                 'Mozilla/5.0 (Linux; Android 4.4.2; ASUS_T00J Build/KVT49L) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Safari/537.36',
                 'Android Chrome 30.0.0.0',
+            ],
+            [ // #1323
+                'Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58K; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/45.0.2454.95 Mobile Safari/537.36',
+                'Android Chrome 45.0.2454.95',
             ],
             [
@@ -364 +382 @@
                 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/603.3.8 (KHTML, like Gecko) Version/10.1.2 Safari/603.3.8',
                 'Macintosh Safari 10.1.2',
-            ],
-            [
-                'Mozilla/5.0 (Linux; U; Android 2.2; en-us; SGH-T959 Build/FROYO) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1',
-                'Android Mobile Safari 4.0',
-            ],
-            [ // #1323
-                'Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58K; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/45.0.2454.95 Mobile Safari/537.36',
-                'Android Mobile Safari 4.0',
-            ],
-            [
-                'Mozilla/5.0 (Linux; U; Android 3.1; en-us; GT-P7510 Build/HMJ37) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13',
-                'Android Safari 4.0',
             ],
             [