<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[5984] sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0: Browse Happy API: Add support for Amazon Silk as a browser and Fire OS as a platform.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/5984">5984</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/5984","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>coffee2code</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-10-02 15:53:11 +0000 (Mon, 02 Oct 2017)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Browse Happy API: Add support for Amazon Silk as a browser and Fire OS as a platform.
* Adds Amazon Silk as a recognized browser
* Changes existing "Kindle" to "Kindle Browser"
* Removes hacky override that set Kindle's platform to "Kindle"
* Attributes Amazon Silk and Kindle Browser to Fire OS platform
* Omits version number from Kindle Browser
* Updates existing Kindle unit tests to reflect these changes</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkapiwordpressorgpublic_htmlcorebrowsehappy10parsephp">sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/parse.php</a></li>
<li><a href="#sitestrunkapiwordpressorgpublic_htmlcorebrowsehappy10testsphpunittestsbrowsehappyphp">sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/tests/phpunit/tests/browse-happy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkapiwordpressorgpublic_htmlcorebrowsehappy10parsephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/parse.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/parse.php 2017-10-02 09:51:36 UTC (rev 5983)
+++ sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/parse.php 2017-10-02 15:53:11 UTC (rev 5984)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,17 +48,21 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Properly set platform if Android is actually being reported.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'Linux' === $data['platform'] && false !== strpos( $user_agent, 'Android' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data['platform'] = 'Android';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( strpos( $user_agent, 'Kindle' ) ) {
+ $data['platform'] = 'Fire OS';
+ } else {
+ $data['platform'] = 'Android';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'Windows Phone' === $data['platform'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $data['platform'] = 'Windows Phone OS';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $data['platform'], array( 'Android', 'iPad', 'iPhone', 'PlayBook', 'RIM Tablet OS', 'Windows Phone OS' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $data['platform'], array( 'Android', 'Fire OS', 'iPad', 'iPhone', 'PlayBook', 'RIM Tablet OS', 'Windows Phone OS' ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data['mobile'] = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> preg_match_all(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '%(?P<name>Opera Mini|Opera|OPR|Edge|Trident|Camino|Kindle|Firefox|(?:Mobile )?Safari|NokiaBrowser|MSIE|RockMelt|AppleWebKit|Chrome|IEMobile|Version)(?:[/ ])(?P<version>[0-9.]+)%im',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '%(?P<name>Opera Mini|Opera|OPR|Edge|Trident|Silk|Camino|Kindle|Firefox|(?:Mobile )?Safari|NokiaBrowser|MSIE|RockMelt|AppleWebKit|Chrome|IEMobile|Version)(?:[/ ])(?P<version>[0-9.]+)%im',
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_agent,
</span><span class="cx" style="display: block; padding: 0 10px"> $result,
</span><span class="cx" style="display: block; padding: 0 10px"> PREG_PATTERN_ORDER
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,11 +96,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $data['version'] = $result['version'][ $key ];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> // Nokia Browser
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- elseif ( $key = array_search( 'NokiaBrowser', $result['name'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ elseif ( false !== ( $key = array_search( 'NokiaBrowser', $result['name'] ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data['name'] = 'Nokia Browser';
</span><span class="cx" style="display: block; padding: 0 10px"> $data['version'] = $result['version'][ $key ];
</span><span class="cx" style="display: block; padding: 0 10px"> $data['mobile'] = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'AppleWebKit' == $result['name'][0] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+ // Amazon Silk
+ elseif ( false !== ( $key = array_search( 'Silk', $result['name'] ) ) ) {
+ $data['name'] = 'Amazon Silk';
+ $data['version'] = $result['version'][ $key ];
+ $version = '';
+ }
+ // Kindle Browser
+ elseif ( false !== ( $key = array_search( 'Kindle', $result['name'] ) ) ) {
+ $data['name'] = 'Kindle Browser';
+ $data['version'] = $result['version'][ $key ];
+ }
+ // AppleWebKit-emulating browsers
+ elseif ( 'AppleWebKit' == $result['name'][0] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $key = array_search( 'Edge', $result['name'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $data['name'] = 'Microsoft Edge';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $key = array_search( 'Mobile Safari', $result['name'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,6 +122,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $version = $result['version'][ $key2 ];
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'Android' === $data['platform'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $data['name'] = 'Android Browser';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'Fire OS' === $data['platform'] ) {
+ $data['name'] = 'Kindle Browser';
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $data['name'] = 'Mobile Safari';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,8 +135,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $version = '';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $data['platform'] ) && 'PlayBook' == $data['platform'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $data['name'] = 'PlayBook';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $key = array_search( 'Kindle', $result['name'] ) ) {
- $data['name'] = 'Kindle';
</del><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $key = array_search( 'Safari', $result['name'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'Android' === $data['platform'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $data['name'] = 'Android Browser';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,8 +171,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $data['version'] = $result['version'][0];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $data['name'], array( 'Kindle' ) ) ) {
- $data['platform'] = $data['name'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Set the platform for Amazon-related browsers.
+ if ( in_array( $data['name'], array( 'Amazon Silk', 'Kindle Browser' ) ) ) {
+ $data['platform'] = 'Fire OS';
+ $data['mobile'] = true;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If Version/x.x.x was specified in UA string
</span></span></pre></div>
<a id="sitestrunkapiwordpressorgpublic_htmlcorebrowsehappy10testsphpunittestsbrowsehappyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/tests/phpunit/tests/browse-happy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/tests/phpunit/tests/browse-happy.php 2017-10-02 09:51:36 UTC (rev 5983)
+++ sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/tests/phpunit/tests/browse-happy.php 2017-10-02 15:53:11 UTC (rev 5984)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,6 +21,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function data_browse_happy() {
</span><span class="cx" style="display: block; padding: 0 10px"> return [
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Amazon Silk
+
+ [
+ 'Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Silk/1.0.146.3-Gen4_12000410) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 Silk-Accelerated=true',
+ 'Fire OS Amazon Silk 1.0.146.3',
+ ],
+ [
+ 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_3; en-us; Silk/1.0.146.3-Gen4_12000410) AppleWebKit/533.16 (KHTML, like Gecko) Version/5.0 Safari/533.16 Silk-Accelerated=true',
+ 'Fire OS Amazon Silk 1.0.146.3',
+ ],
+ [
+ 'Mozilla/5.0 (Linux; U; Android 4.0.3; en-us; KFTT Build/IML74K) AppleWebKit/537.36 (KHTML, like Gecko) Silk/3.68 like Chrome/39.0.2171.93 Safari/537.36',
+ 'Fire OS Amazon Silk 3.68',
+ ],
+ [
+ 'Mozilla/5.0 (Linux; Android 4.0.3; KFTT Build/IML74K) AppleWebKit/537.36 (KHTML, like Gecko) Silk/51.2.1 like Chrome/51.0.2704.81 Safari/537.36',
+ 'Fire OS Amazon Silk 51.2.1',
+ ],
+ [
+ 'Mozilla/5.0 (Linux; Android 5.1.1; KFDOWI Build/LVY48F) AppleWebKit/537.36 (KHTML, like Gecko) Silk/58.2.6 like Chrome/58.0.3029.83 Safari/537.36',
+ 'Fire OS Amazon Silk 58.2.6',
+ ],
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Android Browser
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> [
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -268,6 +291,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'Windows Phone OS Internet Explorer Mobile 11',
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Kindle Browser
+
+ [
+ 'Mozilla/4.0 (compatible; Linux 2.6.10) NetFront/3.3 Kindle/1.0 (screen 600x800)',
+ 'Fire OS Kindle Browser 1.0',
+ ],
+ [
+ 'Mozilla/5.0 (Linux; U; en-US) AppleWebKit/528.5+ (KHTML, like Gecko, Safari/528.5+) Version/4.0 Kindle/3.0 (screen 600x800; rotate)',
+ 'Fire OS Kindle Browser 4.0',
+ ],
+ [
+ 'Mozilla/5.0 (Linux; U; en-US) AppleWebKit/528.5+ (KHTML, like Gecko, Safari/538.5+) Version/4.0 Kindle/3.0 (screen 600x800; rotate)',
+ 'Fire OS Kindle Browser 4.0',
+ ],
+ [
+ 'Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Kindle Fire Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1',
+ 'Fire OS Kindle Browser 4.0',
+ ],
+ [
+ 'Mozilla/5.0 (X11; U; Linux armv7l like Android; en-us) AppleWebKit/531.2+ (KHTML, like Gecko) Version/5.0 Safari/533.2+ Kindle/3.0+',
+ 'Fire OS Kindle Browser 5.0',
+ ],
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Microsoft Edge
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> [
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -442,18 +488,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Miscellaneous
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Mozilla/4.0 (compatible; Linux 2.6.10) NetFront/3.3 Kindle/1.0 (screen 600x800)',
- 'Kindle Kindle 1.0',
- ],
- [
- 'Mozilla/5.0 (Linux; U; en-US) AppleWebKit/528.5+ (KHTML, like Gecko, Safari/528.5+) Version/4.0 Kindle/3.0 (screen 600x800; rotate)',
- 'Kindle Kindle 4.0',
- ],
- [
- 'Mozilla/5.0 (Linux; U; en-US) AppleWebKit/528.5+ (KHTML, like Gecko, Safari/538.5+) Version/4.0 Kindle/3.0 (screen 600x800; rotate)',
- 'Kindle Kindle 4.0',
- ],
- [
</del><span class="cx" style="display: block; padding: 0 10px"> 'Mozilla/5.0 (PlayBook; U; RIM Tablet OS 1.0.0; en-US) AppleWebKit/534.8 (KHTML, like Gecko) Version/0.0.1 Safari/534.8',
</span><span class="cx" style="display: block; padding: 0 10px"> 'PlayBook PlayBook 0.0.1',
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -555,7 +589,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_mobile_browsers( $header ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed = browsehappy_parse_user_agent( $header );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $parsed['platform'], array( 'Android', 'iPad', 'iPhone', 'Mobile', 'PlayBook', 'RIM Tablet OS', 'Windows Phone OS' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $parsed['platform'], array( 'Android', 'Fire OS', 'iPad', 'iPhone', 'Mobile', 'PlayBook', 'RIM Tablet OS', 'Windows Phone OS' ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $parsed['mobile'] );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $parsed['mobile'] );
</span></span></pre>
</div>
</div>
</body>
</html>