Changeset 5974

Timestamp:

09/28/2017 10:31:36 PM (6 years ago)

Author:

coffee2code

Message:

Browse Happy API: Add support for Microsoft Edge.

Location:

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

Files:

• browsers.php (modified) (2 diffs)
• 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/browsers.php

@@ -20 +20 @@
         'Chrome'            => '18', // Lowest version at the moment (mobile)
         'Firefox'           => '16',
+        'Microsoft Edge'    => '15.15063',
         'Opera'             => '12.18',
         'Safari'            => '5',
@@ -59 +60 @@
             'img_src'     => $http  . 'ie.png' . "?{$cache_buster}",
             'img_src_ssl' => $https . 'ie.png' . "?{$cache_buster}",
+        ),
+        'Edge' => (object) array(
+            'name'        => 'Microsoft Edge',
+            'wikipedia'   => 'Microsoft Edge',
+            'normalized'  => 1, // include second number if non-zero
+            'url'         => 'https://www.microsoft.com/en-us/windows/microsoft-edge',
+            'img_src'     => $http  . 'edge.png' . "?{$cache_buster}",
+            'img_src_ssl' => $https . 'edge.png' . "?{$cache_buster}",
         ),
         'Firefox' => (object) array(

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

@@ -59 +59 @@
 
     preg_match_all(
-        '%(?P<name>Opera Mini|Opera|OPR|Trident|Camino|Kindle|Firefox|(?:Mobile )?Safari|MSIE|RockMelt|AppleWebKit|Chrome|IEMobile|Version)(?:[/ ])(?P<version>[0-9.]+)%im',
+        '%(?P<name>Opera Mini|Opera|OPR|Edge|Trident|Camino|Kindle|Firefox|(?:Mobile )?Safari|MSIE|RockMelt|AppleWebKit|Chrome|IEMobile|Version)(?:[/ ])(?P<version>[0-9.]+)%im',
         $user_agent,
         $result,
@@ -88 +88 @@
         $data['version'] = $result['version'][ $key ];
     } elseif ( 'AppleWebKit' == $result['name'][0] ) {
-        if ( $key = array_search( 'Mobile Safari', $result['name'] ) ) {
+        if ( $key = array_search( 'Edge', $result['name'] ) ) {
+            $data['name'] = 'Microsoft Edge';
+        } elseif ( $key = array_search( 'Mobile Safari', $result['name'] ) ) {
             $data['name'] = 'Mobile Safari';
         // } elseif ( ( 'Android' == $data['platform'] && !($key = 0) ) || $key = array_search( 'Chrome', $result['name'] ) ) {

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

@@ -238 +238 @@
             ],
 
+            // Microsoft Edge
+
+            [
+                'Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.135 Safari/537.36 Edge/12.10240',
+                'Windows Microsoft Edge 12.10240',
+            ],
+            [
+                'Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2486.0 Safari/537.36 Edge/13.10586',
+                'Windows Microsoft Edge 13.10586',
+            ],
+            [
+                'Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.79 Safari/537.36 Edge/14.14393',
+                'Windows Microsoft Edge 14.14393',
+            ],
+            [
+                'Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.116 Safari/537.36 Edge/15.15063',
+                'Windows Microsoft Edge 15.15063'
+            ],
+            [
+                'Mozilla/5.0 (Windows Phone 10.0; Android 4.2.1; Microsoft; Lumia 640 LTE) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2486.0 Mobile Safari/537.36 Edge/13.10586',
+                'Windows Phone OS Microsoft Edge 13.10586',
+            ],
+            [
+                'Mozilla/5.0 (Windows Phone 10.0; Android 6.0.1; Microsoft; Lumia 950) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.79 Mobile Safari/537.36 Edge/14.14393',
+                'Windows Phone OS Microsoft Edge 14.14393',
+            ],
+            [
+                'Mozilla/5.0 (Windows Phone 10.0; Android 6.0.1; Xbox; Xbox One) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.116 Mobile Safari/537.36 Edge/15.15063',
+                'Windows Phone OS Microsoft Edge 15.15063',
+            ],
+
             // Opera