Changeset 5971

Timestamp:

09/28/2017 04:30:41 PM (7 years ago)

Author:

coffee2code

Message:

Browse Happy API: Improve Windows Phone OS recognition, particularly for more modern Microsoft browsers.

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

@@ -40 +40 @@
 
     if ( preg_match(
-        '/^.+?(?P<platform>Android|iPhone|iPad|Windows|Linux|Macintosh|Windows Phone OS|RIM Tablet OS|PlayBook)(?: (NT|zvav))*(?: [ix]?[0-9._]+)*(;|\))/im',
+        '/^.+?(?P<platform>Windows Phone( OS)?|Android|iPhone|iPad|Windows|Linux|Macintosh|RIM Tablet OS|PlayBook)(?: (NT|zvav))*(?: [ix]?[0-9._]+)*(;|\))/im',
         $user_agent,
         $regs
@@ -50 +50 @@
     if ( 'Linux' === $data['platform'] && false !== strpos( $user_agent, 'Android' ) ) {
         $data['platform'] = 'Android';
+    } elseif ( 'Windows Phone' === $data['platform'] ) {
+        $data['platform'] = 'Windows Phone OS';
     }
 
@@ -116 +118 @@
         // IE 11 and beyond have switched to Trident
         // http://msdn.microsoft.com/en-us/library/ie/hh869301%28v=vs.85%29.aspx
-        $data['name'] = 'Internet Explorer';
-        if( '7.0' == $result['version'][0] ) {
+        if ( $key = array_search( 'IEMobile', $result['name'] ) ) {
+            $data['name'] = 'Internet Explorer Mobile';
+        } else {
+            $data['name'] = 'Internet Explorer';
+        }
+        if ( '7.0' == $result['version'][0] ) {
             $data['version'] = '11';
         }

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

@@ -220 +220 @@
                 'Mozilla/4.0 (compatible; MSIE 7.0; Windows Phone OS 7.0; Trident/3.1; IEMobile/7.0) LG;LG-E900h)',
                 'Windows Phone OS Internet Explorer Mobile 7.0',
+            ],
+            [
+                'Mozilla/5.0 (compatible; MSIE 9.0; Windows Phone OS 7.5; Trident/5.0; IEMobile/9.0; NOKIA; Lumia 710)',
+                'Windows Phone OS Internet Explorer Mobile 9.0',
+            ],
+            [
+                'Mozilla/5.0 (compatible; MSIE 10.0; Windows Phone 8.0; Trident/6.0; IEMobile/10.0; ARM; Touch; NOKIA; Lumia 520)',
+                'Windows Phone OS Internet Explorer Mobile 10.0',
+            ],
+            [
+                'Mozilla/5.0 (Mobile; Windows Phone 8.1; Android 4.0; ARM; Trident/7.0; Touch; rv:11.0; IEMobile/11.0; Microsoft; Lumia 435) like iPhone OS 7_0_3 Mac OS X AppleWebKit/537 (KHTML, like Gecko) Mobile Safari/537',
+                'Windows Phone OS Internet Explorer Mobile 11',
+            ],
+            [
+                'Mozilla/5.0 (Windows Phone 8.1; ARM; Trident/7.0; Touch; rv:11.0; IEMobile/11.0; NOKIA; Lumia 520) like Gecko',
+                'Windows Phone OS Internet Explorer Mobile 11',
             ],