Changeset 5962

Timestamp:

09/25/2017 04:24:26 PM (22 months ago)

Author:

coffee2code

Message:

Browse Happy API: Add data field to indicate if a given browser is running on a mobile platform.

• Adds 'mobile' field to data array
• If no platform is discernible for a mobile browser, generically sets platform as 'Mobile'
• Adds unit test

Location:

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

Files:

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

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

@@ -22 +22 @@
  *     @type bool   $upgrade         Is there an update available for the browser?
  *     @type bool   $insecure        Is the browser insecure?
+ *     @type bool   $mobile          Is the browser on a mobile platform?
  * }
  */
@@ -35 +36 @@
         'upgrade'         => false,
         'insecure'        => false,
+        'mobile'          => false,
     );
 
@@ -48 +50 @@
     if ( 'Linux' === $data['platform'] && false !== strpos( $user_agent, 'Android' ) ) {
         $data['platform'] = 'Android';
+    }
+
+    if ( in_array( $data['platform'], array( 'Android', 'iPad', 'iPhone', 'PlayBook', 'RIM Tablet OS' ) ) ) {
+        $data['mobile'] = true;
     }
 
@@ -115 +121 @@
     }
 
-    // Don't fetch additional browser data for mobile platform browsers.
-    if ( in_array( $data['platform'], array( 'Android', 'iPad', 'iPhone' ) ) ) {
+    if ( $data['mobile'] ) {
+        // Generically set "Mobile" as the platform if a platform hasn't been set.
+        if ( ! $data['platform'] ) {
+            $data['platform'] = 'Mobile';
+        }
+
+        // Don't fetch additional browser data for mobile platform browsers at this time.
         return $data;
     }

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

@@ -252 +252 @@
     }
 
+    /**
+     * @dataProvider data_browse_happy
+     *
+     * @param string $header 'User-Agent' header value.
+     */
+    function test_mobile_browsers( $header ) {
+        $parsed = browsehappy_parse_user_agent( $header );
+
+        if ( in_array( $parsed['platform'], array( 'Android', 'iPad', 'iPhone', 'Mobile', 'PlayBook', 'RIM Tablet OS' ) ) ) {
+            $this->assertTrue( $parsed['mobile'] );
+        } else {
+            $this->assertFalse( $parsed['mobile'] );
+        }
+    }
+
 }
-