Changeset 5988

Timestamp:

10/02/2017 07:39:32 PM (6 years ago)

Author:

coffee2code

Message:

Browse Happy API: Improve indentification of BlackBerry, Nokia, and Sony Ericsson devices generically as mobile devices if platform not otherwise known.

Location:

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

Files:

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

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

@@ -38 +38 @@
         'mobile'          => false,
     );
+    $mobile_device = '';
 
     if ( preg_match(
@@ -54 +55 @@
             $data['platform'] = 'Android';
         }
-    } elseif ( 'Windows Phone' === $data['platform'] ) {
+    }
+    // Normalize Windows Phone OS name when "OS" is omitted.
+    elseif ( 'Windows Phone' === $data['platform'] ) {
         $data['platform'] = 'Windows Phone OS';
     }
-
-    if ( in_array( $data['platform'], array( 'Android', 'Fire OS', 'iPad', 'iPhone', 'PlayBook', 'RIM Tablet OS', 'Windows Phone OS' ) ) ) {
+    // Generically detect some mobile devices.
+    elseif (
+        ! $data['platform']
+    &&
+        preg_match( '/BlackBerry|Nokia|SonyEricsson/', $user_agent, $matches )
+    ) {
+        $data['platform'] = 'Mobile';
+        $mobile_device    = $matches[0];
+    }
+
+    // Flag known mobile platforms as mobile.
+    if ( in_array( $data['platform'], array( 'Android', 'Fire OS', 'iPad', 'iPhone', 'Mobile', 'PlayBook', 'RIM Tablet OS', 'Windows Phone OS' ) ) ) {
         $data['mobile'] = true;
     }
@@ -146 +159 @@
             $data['name'] = 'unknown';
             $result['version'][ $key ] = '';
+            $version = '';
         }
         $data['version'] = $result['version'][ $key ];

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

@@ -516 +516 @@
             ],
             [
+                'BlackBerry; U; Blackberry 9900; en',
+                'Mobile unknown',
+            ],
+            [
+                'BlackBerry8520/5.0.0.592 Profile/MIDP-2.1 Configuration/CLDC-1.1 VendorID/168',
+                'Mobile unknown',
+            ],
+            [
                 'Nokia-MIT-Browser/3.0',
-                'unknown', // It's really a Nokia Browser, but not critical to recognize as such.
+                'Mobile unknown', // It's really a Nokia Browser, but not critical to recognize as such.
+            ],
+            [
+                'SonyEricssonW995a/R1GB Browser/NetFront/3.4 Profile/MIDP-2.1 Configuration/CLDC-1.1 JavaPlatform/JP-8.4.4',
+                'Mobile unknown',
             ],