Changeset 5963

Timestamp:

09/25/2017 07:09:46 PM (4 years ago)

Author:

coffee2code

Message:

Browse Happy API: Improve detection of Opera and add detection of Opera Mini.

• Detects modern desktop Opera user-agents (previously misidentified as Chrome)
• Detects Opera Mini user-agents
• Fix to identify Linux as platform for Linux Opera
• Adds more Opera-related user-agents for unit testing

TODO: Separately notify about the 12.x branch and desktop versions of Opera (the latest of which is 47), and maybe eventually Opera Mini.

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) (3 diffs)

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)*(?: [ix]?[0-9._]+)*(;|\))/im',
+        '/^.+?(?P<platform>Android|iPhone|iPad|Windows|Linux|Macintosh|Windows Phone OS|RIM Tablet OS|PlayBook)(?: (NT|zvav))*(?: [ix]?[0-9._]+)*(;|\))/im',
         $user_agent,
         $regs
@@ -57 +57 @@
 
     preg_match_all(
-        '%(?P<name>Trident|Camino|Kindle|Firefox|(?:Mobile )?Safari|MSIE|RockMelt|AppleWebKit|Chrome|IEMobile|Opera|Version)(?:[/ ])(?P<version>[0-9.]+)%im',
+        '%(?P<name>Opera Mini|Opera|OPR|Trident|Camino|Kindle|Firefox|(?:Mobile )?Safari|MSIE|RockMelt|AppleWebKit|Chrome|IEMobile|Version)(?:[/ ])(?P<version>[0-9.]+)%im',
         $user_agent,
         $result,
@@ -70 +70 @@
     }
 
-    if ( 'AppleWebKit' == $result['name'][0] ) {
+    // Opera
+    if (
+        false !== ( $key = array_search( 'Opera Mini', $result['name'] ) )
+    ||
+        false !== ( $key = array_search( 'Opera', $result['name'] ) )
+    ||
+        false !== ( $key = array_search( 'OPR', $result['name'] ) )
+    ) {
+        $data['name'] = $result['name'][ $key ];
+        if ( 'OPR' === $data['name'] ) {
+            $data['name'] = 'Opera';
+        } elseif ( 'Opera Mini' === $data['name'] ) {
+            $data['mobile'] = true;
+        }
+        $data['version'] = $result['version'][ $key ];
+    } elseif ( 'AppleWebKit' == $result['name'][0] ) {
         if ( $key = array_search( 'Mobile Safari', $result['name'] ) ) {
             $data['name'] = 'Mobile Safari';
@@ -88 +103 @@
             $data['name'] = 'webkit';
         }
-        $data['version'] = $result['version'][ $key ];
-    } elseif ( $key = array_search( 'Opera', $result['name'] ) ) {
-        $data['name'] = $result['name'][ $key ];
         $data['version'] = $result['version'][ $key ];
     } elseif ( 'MSIE' == $result['name'][0] ) {

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

@@ -91 +91 @@
                 'Windows Chrome 7.0.517.41',
             ],
+
+            // Opera
+
             [
                 'Opera/9.80 (Windows NT 6.0; U; en) Presto/2.8.99 Version/11.10',
@@ -115 +118 @@
                 'Windows Opera 11.01',
             ],
+            [
+                'Mozilla/5.0 (Windows NT 5.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/49.0.2623.112 Safari/537.36 OPR/36.0.2130.80',
+                'Windows Opera 36.0.2130.80',
+            ],
+            [
+                'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36 OPR/43.0.2442.991',
+                'Windows Opera 43.0.2442.991',
+            ],
+            [
+                'Opera/9.80 (X11; Linux zvav; U; en) Presto/2.8.119 Version/11.10',
+                'Linux Opera 11.10',
+            ],
+            [
+                'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.87 Safari/537.36 OPR/37.0.2178.31 (Edition beta)',
+                'Linux Opera 37.0.2178.31',
+            ],
+            [
+                'Opera/9.80 (Macintosh; Intel Mac OS X 10.10.5) Presto/2.12.388 Version/12.16',
+                'Macintosh Opera 12.16',
+            ],
             // #3161
             [
@@ -120 +143 @@
                 'Windows Opera 12.18',
             ],
+
+            // Opera Mini
+
+            [
+                'Opera/9.80 (Android; Opera Mini/24.0.2254/62.178; U; en) Presto/2.12.423 Version/12.16',
+                'Android Opera Mini 12.16',
+            ],
+            [
+                'Opera/9.80 (J2ME/MIDP; Opera Mini/4.2/28.3590; U; en) Presto/2.8.119 Version/11.10',
+                'Mobile Opera Mini 11.10',
+            ],
+            [
+                'Opera/9.80 (SpreadTrum; Opera Mini/4.4.31492/66.299; U; en) Presto/2.12.423 Version/12.16',
+                'Mobile Opera Mini 12.16',
+            ],
+
             [
                 'Mozilla/5.0 (Windows; U; Windows NT 6.1; tr-TR) AppleWebKit/533.20.25 (KHTML, like Gecko) Version/5.0.4 Safari/533.20.27',