Changeset 9422

Timestamp:

01/23/2020 11:43:29 PM (2 years ago)

Author:

coffee2code

Message:

Browse Happy API: Simplify some code for browser token and version handling.

File:

• sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/parse.php (modified) (10 diffs)

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

@@ -180 +180 @@
     );
 
+    // Create associative array with tokens as keys and versions as values.
+    $tokens = array_combine( array_reverse( $result['name'] ), array_reverse( $result['version'] ) );
+
     // Properly set platform if Android is actually being reported.
     if ( 'Linux' === $data['platform'] && false !== strpos( $user_agent, 'Android' ) ) {
@@ -196 +199 @@
         in_array( $data['platform'], array( 'Symbian', 'SymbOS' ) )
     ||
-        false !== ( $key = array_search( 'SymbianOS', $result['name'] ) )
+        ! empty( $tokens['SymbianOS'] )
     ||
-        false !== ( $key = array_search( 'Symbian', $result['name'] ) )
+        ! empty( $tokens['Symbian'] )
     ) {
         if ( ! in_array( $data['platform'], array( 'Symbian', 'SymbOS' ) ) ) {
-            unset( $result['name'][ $key ] );
-            unset( $result['version'][ $key ] );
+            unset( $tokens['SymbianOS'] );
+            unset( $tokens['Symbian'] );
         }
         $data['platform'] = 'Symbian';
@@ -222 +225 @@
 
     // If Version/x.x.x was specified in UA string store it and ignore it
-    if ( false !== ( $key = array_search( 'Version', $result['name'] ) ) ) {
-        $version = $result['version'][ $key ];
-        unset( $result['name'][ $key ] );
-        unset( $result['version'][ $key ] );
+    if ( ! empty( $tokens['Version'] ) ) {
+        $version = $tokens['Version'];
+        unset( $tokens['Version'] );
     }
 
@@ -231 +233 @@
 
     // No indentifiers provided
-    if ( empty( $result['name'] ) ) {
+    if ( ! $tokens ) {
         if ( 'BlackBerry' === $mobile_device ) {
             $data['name'] = 'BlackBerry Browser';
@@ -239 +241 @@
     }
     // Explicitly identified browser (info defined above in $explicit_tokens).
-    elseif ( $found = array_intersect( array_keys( $explicit_tokens ), $result['name'] ) ) {
-        $tokens = array_combine( $result['name'], $result['version'] );
+    elseif ( $found = array_intersect( array_keys( $explicit_tokens ), array_keys( $tokens ) ) ) {
         $token = reset( $found );
 
@@ -256 +257 @@
     }
     // Puffin
-    elseif ( false !== ( $key = array_search( 'Puffin', $result['name'] ) ) ) {
+    elseif ( ! empty( $tokens['Puffin'] ) ) {
         $data['name']     = 'Puffin';
-        $data['version']  = $result['version'][ $key ];
+        $data['version']  = $tokens['Puffin'];
         $version          = '';
         // If not an already-identified mobile platform, set it as such.
@@ -267 +268 @@
     }
     // Trident (Internet Explorer)
-    elseif ( false !== ( $key = array_search( 'Trident', $result['name'] ) ) ) {
+    elseif ( ! empty( $tokens['Trident'] ) ) {
         // IE 8-10 more reliably report version via Trident token than MSIE token.
         // IE 11 uses Trident token without an MSIE token.
@@ -278 +279 @@
             '7.0' => '11.0',
         );
-        $ver = $result['version'][ $key ];
+        $ver = $tokens['Trident'];
         $data['version'] = $trident_ie_mapping[ $ver ] ?? $ver; 
     }
     // Internet Explorer (pre v8.0)
-    elseif ( false !== ( $key = array_search( 'MSIE', $result['name'] ) ) ) {
+    elseif ( ! empty( $tokens['MSIE'] ) ) {
         $data['name'] = 'Internet Explorer';
-        $key = 0;
-        $data['version'] = $result['version'][ $key ];
+        $data['version'] = $tokens['MSIE'];
     }
     // AppleWebKit-emulating browsers
-    elseif ( false !== ( $key = array_search( 'AppleWebKit', $result['name'] ) ) ) {
-        if ( false !== ( $key = array_search( 'Mobile Safari', $result['name'] ) ) ) {
-            if ( false !== ( $key2 = array_search( 'Chrome', $result['name'] ) ) ) {
+    elseif ( ! empty( $tokens['AppleWebKit'] ) ) {
+        if ( ! empty( $tokens['Mobile Safari'] ) ) {
+            if ( ! empty( $tokens['Chrome'] ) ) {
                 $data['name'] = 'Chrome';
-                $version = $result['version'][ $key2 ];
+                $version = $tokens['Chrome'];
             } elseif ( 'Android' === $data['platform'] ) {
                 $data['name'] = 'Android Browser';
@@ -302 +302 @@
 
                 if ( false !== stripos( $user_agent, 'BB10' ) ) {
-                    $result['version'][ $key ] = '';
+                    $tokens['Mobile Safari'] = '';
                     $version = '';
                 }
@@ -308 +308 @@
                 $data['name'] = 'Mobile Safari';
             }
-        // } elseif ( ( 'Android' == $data['platform'] && !($key = 0) ) || $key = array_search( 'Chrome', $result['name'] ) ) {
-        } elseif ( false !== ( $key = array_search( 'Chrome', $result['name'] ) ) ) {
+        } elseif ( ! empty( $tokens['Chrome'] ) ) {
             $data['name'] = 'Chrome';
             $version = '';
         } elseif ( ! empty( $data['platform'] ) && 'PlayBook' == $data['platform'] ) {
             $data['name'] = 'PlayBook';
-        } elseif ( false !== ( $key = array_search( 'Safari', $result['name'] ) ) ) {
+        } elseif ( ! empty( $tokens['Safari'] ) ) {
             if ( 'Android' === $data['platform'] ) {
                 $data['name'] = 'Android Browser';
             } elseif ( 'Symbian' === $data['platform'] ) {
                 $data['name'] = 'Nokia Browser';
-                $result['version'][ $key ] = '';
+                $tokens['Safari'] = '';
             } else {
                 $data['name'] = 'Safari';
             }
         } else {
-            $key = 0;
             $data['name'] = 'unknown';
-            $result['version'][ $key ] = '';
+            $tokens['AppleWebKit'] = '';
             $version = '';
         }
-        $data['version'] = $result['version'][ $key ];
+        $data['version'] = $tokens[ $data['name'] ] ?? '';
     }
     // Fall back to whatever is being reported.
     else {
-        $data['name'] = $result['name'][0];
-        $data['version'] = $result['version'][0];
+        $ordered_tokens = array_reverse( $tokens );
+        $data['version'] = reset( $ordered_tokens );
+        $data['name'] = key( $ordered_tokens );
     }