Changeset 5986

Timestamp:

10/02/2017 05:04:34 PM (2 years ago)

Author:

coffee2code

Message:

Browse Happy API: Check for Trident token at a higher priority than MSIE token when determining the version of IE.

Allows proper version of IE to be detected, even if browser mode is employed to emulate another version of IE.

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) (1 diff)

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

@@ -148 +148 @@
         }
         $data['version'] = $result['version'][ $key ];
-    } elseif ( 'MSIE' == $result['name'][0] ) {
+    }
+    // Trident (Internet Explorer)
+    elseif ( false !== ( $key = array_search( 'Trident', $result['name'] ) ) ) {
+        // IE 8-10 more reliably report version via Trident token than MSIE token.
+        // IE 11 uses Trident token without an MSIE token.
+        // https://msdn.microsoft.com/library/hh869301(v=vs.85).aspx
+        if ( $key2 = array_search( 'IEMobile', $result['name'] ) ) {
+            $data['name'] = 'Internet Explorer Mobile';
+            $data['version'] = $result['version'][ $key2 ];
+        } else {
+            $data['name'] = 'Internet Explorer';
+            $trident_ie_mapping = array(
+                '4.0' => '8.0',
+                '5.0' => '9.0',
+                '6.0' => '10.0',
+                '7.0' => '11.0',
+            );
+            $ver = $result['version'][ $key ];
+            $data['version'] = $trident_ie_mapping[ $ver ] ?? $ver; 
+        }
+    }
+    // Internet Explorer (pre v8.0)
+    elseif ( 'MSIE' == $result['name'][0] ) {
         if ( $key = array_search( 'IEMobile', $result['name'] ) ) {
             $data['name'] = 'Internet Explorer Mobile';
@@ -156 +178 @@
         }
         $data['version'] = $result['version'][ $key ];
-    } elseif ( 'Trident' == $result['name'][0] ) {
-        // IE 11 and beyond have switched to Trident
-        // http://msdn.microsoft.com/en-us/library/ie/hh869301%28v=vs.85%29.aspx
-        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.0';
-        }
-    } else {
+    }
+    // Fall back to whatever is being reported.
+    else {
         $data['name'] = $result['name'][0];
         $data['version'] = $result['version'][0];

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

@@ -263 +263 @@
                 'Windows Internet Explorer 11.0',
             ],
+            [ // Fictitious Trident version
+                'Mozilla/5.0 (Windows NT 6.3; Trident/34.0; rv:38.0) like Gecko',
+                'Windows Internet Explorer 34.0',
+            ],
             [
                 'Mozilla/4.0 (compatible; MSIE 7.0; Windows Phone OS 7.0; Trident/3.1; IEMobile/7.0) Asus;Galaxy6',