<!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>[10271] sites/trunk/api.wordpress.org/public_html/events/1.0: Events: Apply coding standards.</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 { white-space: pre-line; 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/10271">10271</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/10271","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-09-16 18:17:05 +0000 (Wed, 16 Sep 2020)</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'>Events: Apply coding standards.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkapiwordpressorgpublic_htmlevents10indexphp">sites/trunk/api.wordpress.org/public_html/events/1.0/index.php</a></li>
<li><a href="#sitestrunkapiwordpressorgpublic_htmlevents10teststestindexphp">sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkapiwordpressorgpublic_htmlevents10indexphp"></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/events/1.0/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/events/1.0/index.php 2020-09-16 18:16:57 UTC (rev 10270)
+++ sites/trunk/api.wordpress.org/public_html/events/1.0/index.php 2020-09-16 18:17:05 UTC (rev 10271)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,12 +100,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function bootstrap() {
</span><span class="cx" style="display: block; padding: 0 10px"> $base_dir = dirname( dirname( __DIR__ ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- require( $base_dir . '/init.php' );
- require( $base_dir . '/includes/hyperdb/bb-10-hyper-db.php' );
- include( $base_dir . '/includes/wp-json-encode.php' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ require $base_dir . '/init.php';
+ require $base_dir . '/includes/hyperdb/bb-10-hyper-db.php';
+ include $base_dir . '/includes/wp-json-encode.php';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! defined( 'RUNNING_TESTS' ) || ! RUNNING_TESTS ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- include( $base_dir . '/includes/object-cache.php' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ include $base_dir . '/includes/object-cache.php';
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,7 +124,7 @@
</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"> if ( isset( $_GET['country'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $location_args['country'] = $_GET['country'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $location_args['country'] = $_GET['country'];
</ins><span class="cx" style="display: block; padding: 0 10px"> $location_args['restrict_by_country'] = true;
</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">@@ -345,7 +345,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // And we sort by population desc, assuming that the biggest matching location is the most likely one.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Exact match
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $query = "
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query = '
</ins><span class="cx" style="display: block; padding: 0 10px"> SELECT name, latitude, longitude, country
</span><span class="cx" style="display: block; padding: 0 10px"> FROM geoname_summary
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE name = %s
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -354,7 +354,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> FIELD( %s, timezone ) DESC,
</span><span class="cx" style="display: block; padding: 0 10px"> population DESC,
</span><span class="cx" style="display: block; padding: 0 10px"> BINARY LOWER( %s ) = BINARY LOWER( name ) DESC
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- LIMIT 1";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ LIMIT 1';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $prepared_query = $wpdb->prepare( $query, $location_name, $country, $timezone, $location_name );
</span><span class="cx" style="display: block; padding: 0 10px"> $db_handle = $wpdb->db_connect( $prepared_query );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -365,7 +365,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Wildcard match
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $row && $wildcard && 'ASCII' !== mb_detect_encoding( $location_name ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $query = "
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query = '
</ins><span class="cx" style="display: block; padding: 0 10px"> SELECT name, latitude, longitude, country
</span><span class="cx" style="display: block; padding: 0 10px"> FROM geoname_summary
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE name LIKE %s
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -374,7 +374,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> FIELD( %s, timezone ) DESC,
</span><span class="cx" style="display: block; padding: 0 10px"> population DESC,
</span><span class="cx" style="display: block; padding: 0 10px"> BINARY LOWER( %s ) = BINARY LOWER( LEFT( name, %d ) ) DESC
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- LIMIT 1";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ LIMIT 1';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $prepared_query = $wpdb->prepare( $query, $wpdb->esc_like( $location_name ) . '%', $country, $timezone, $location_name, mb_strlen( $location_name ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $db_handle = $wpdb->db_connect( $prepared_query );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -431,10 +431,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $long_ip = ip2long( $dotted_ip );
</span><span class="cx" style="display: block; padding: 0 10px"> $from = 'ip2location';
</span><span class="cx" style="display: block; padding: 0 10px"> $where = 'ip_to >= %d';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( filter_var( $dotted_ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6 ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( filter_var( $dotted_ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $long_ip = _ip2long_v6( $dotted_ip );
</span><span class="cx" style="display: block; padding: 0 10px"> $from = 'ipv62location';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where = "ip_to >= CAST( %s AS DECIMAL( 39, 0 ) )";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where = 'ip_to >= CAST( %s AS DECIMAL( 39, 0 ) )';
</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 ( false === $long_ip || ! isset( $from, $where ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -495,7 +495,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $ipv6long = 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> while ( $bits >= 0 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $bin = sprintf( "%08b", ( ord( $int[ $bits ] ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $bin = sprintf( '%08b', ( ord( $int[ $bits ] ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $ipv6long ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $ipv6long = $bin . $ipv6long;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -540,7 +540,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $location = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => $args['latitude'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'longitude' => $args['longitude']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'longitude' => $args['longitude'],
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -684,7 +684,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $location_name_parts[ $location_word_count - 2 ],
</span><span class="cx" style="display: block; padding: 0 10px"> $location_name_parts[ $location_word_count - 1 ]
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $country = get_country_from_name( $country_name );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $country = get_country_from_name( $country_name );
</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 ( ! $country && $location_word_count >= 4 ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -695,7 +695,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $location_name_parts[ $location_word_count - 2 ],
</span><span class="cx" style="display: block; padding: 0 10px"> $location_name_parts[ $location_word_count - 1 ]
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $country = get_country_from_name( $country_name );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $country = get_country_from_name( $country_name );
</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"> wp_cache_set( $cache_key, ( $country ?: '__NOT_FOUND__' ), $cache_group, $cache_life );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -782,7 +782,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * tangible use case for that yet. We could maybe support an `online` value for the `location` parameter
</span><span class="cx" style="display: block; padding: 0 10px"> * in the future if that's desired. If we do that, the Codex documentation should be updated.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "( `meetup_url` IS NULL OR `meetup_url` <> 'https://www.meetup.com/learn-wordpress-discussions/' ) "
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "( `meetup_url` IS NULL OR `meetup_url` <> 'https://www.meetup.com/learn-wordpress-discussions/' ) ",
</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 ( ! empty( $args['type'] ) && in_array( $args['type'], array( 'meetup', 'wordcamp' ) ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -880,7 +880,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'start_unix_timestamp' => strtotime( $event->date_utc ) - $event->date_utc_offset,
</span><span class="cx" style="display: block; padding: 0 10px"> 'end_unix_timestamp' => strtotime( $event->end_date ) - $event->date_utc_offset,
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> 'location' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> // Capitalize it for use in presentation contexts, like the Events Widget.
</span><span class="cx" style="display: block; padding: 0 10px"> 'location' => 'online' === $event->location ? 'Online' : $event->location,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -887,7 +886,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'country' => $event->country,
</span><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => (float) $event->latitude,
</span><span class="cx" style="display: block; padding: 0 10px"> 'longitude' => (float) $event->longitude,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1005,8 +1004,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> `date_utc` >= %s AND
</span><span class="cx" style="display: block; padding: 0 10px"> `date_utc` <= %s
</span><span class="cx" style="display: block; padding: 0 10px"> ORDER BY `date_utc` ASC
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- LIMIT 1"
- ;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ LIMIT 1";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $values[] = gmdate( 'Y-m-d', time() - DAY_IN_SECONDS );
</span><span class="cx" style="display: block; padding: 0 10px"> $values[] = gmdate( 'Y-m-d', time() + $date_upper_bound );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1316,7 +1314,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $keywords = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp15', '15 year', '15 ano', '15 año', '15 candeline', 'wordt 15',
</span><span class="cx" style="display: block; padding: 0 10px"> 'anniversary', 'aniversário', 'aniversario', 'birthday', 'cumpleaños',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Tanti auguri'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Tanti auguri',
</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"> foreach ( $keywords as $keyword ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1387,7 +1385,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'country' => $raw_camp->country,
</span><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => (float) $raw_camp->latitude,
</span><span class="cx" style="display: block; padding: 0 10px"> 'longitude' => (float) $raw_camp->longitude,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
</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"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1467,7 +1465,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'country' => $raw_discussion_group->country,
</span><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => (float) $raw_discussion_group->latitude,
</span><span class="cx" style="display: block; padding: 0 10px"> 'longitude' => (float) $raw_discussion_group->longitude,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1567,12 +1565,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'min' => rad2deg( $minimum_lat ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'max' => rad2deg( $maximum_lat )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'max' => rad2deg( $maximum_lat ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'longitude' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'min' => rad2deg( $minimum_lon ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'max' => rad2deg( $maximum_lon )
- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'max' => rad2deg( $maximum_lon ),
+ ),
</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">
</span></span></pre></div>
<a id="sitestrunkapiwordpressorgpublic_htmlevents10teststestindexphp"></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/events/1.0/tests/test-index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php 2020-09-16 18:16:57 UTC (rev 10270)
+++ sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php 2020-09-16 18:17:05 UTC (rev 10271)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,9 +15,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'RUNNING_TESTS', true );
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'SAVEQUERIES', true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- require_once( dirname( __DIR__ ) . '/index.php' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ require_once dirname( __DIR__ ) . '/index.php';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tests_failed = 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tests_failed = 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> $tests_failed += test_get_location();
</span><span class="cx" style="display: block; padding: 0 10px"> $tests_failed += test_get_events();
</span><span class="cx" style="display: block; padding: 0 10px"> $tests_failed += test_get_events_country_restriction();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,8 +28,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $tests_failed += test_get_iso_3166_2_country_codes();
</span><span class="cx" style="display: block; padding: 0 10px"> $tests_failed += test_remove_duplicate_events();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $query_count = count( $wpdb->queries );
- $query_time = array_sum( array_column( $wpdb->queries, 1 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query_count = count( $wpdb->queries );
+ $query_time = array_sum( array_column( $wpdb->queries, 1 ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> "\n\nFinished running all tests.\n\n* %d tests failed\n* %d queries ran in %f seconds\n* Average time per query: %f seconds\n",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -183,7 +183,6 @@
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * A location couldn't be found
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,7 +189,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'city-invalid-private-ip' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'input' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'location_name' => 'Rivendell',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'ip' => '127.0.0.1'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'ip' => '127.0.0.1',
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -353,12 +352,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> 'city-with-diacritics-in-query' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'input' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'location_name' => "Doña Ana",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'location_name' => 'Doña Ana',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'locale' => 'en_US',
</span><span class="cx" style="display: block; padding: 0 10px"> 'timezone' => 'America/Denver',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => "doña ana",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => 'doña ana',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => '32.390',
</span><span class="cx" style="display: block; padding: 0 10px"> 'longitude' => '-106.814',
</span><span class="cx" style="display: block; padding: 0 10px"> 'country' => 'US',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -367,12 +366,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> 'city-with-diacritics-in-formal-name-but-not-in-query' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'input' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'location_name' => "Dona Ana",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'location_name' => 'Dona Ana',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'locale' => 'en_US',
</span><span class="cx" style="display: block; padding: 0 10px"> 'timezone' => 'America/Denver',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => "dona ana",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => 'dona ana',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => '32.390',
</span><span class="cx" style="display: block; padding: 0 10px"> 'longitude' => '-106.814',
</span><span class="cx" style="display: block; padding: 0 10px"> 'country' => 'US',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -381,12 +380,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> 'city-with-period-in-query' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'input' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'location_name' => "St. Louis",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'location_name' => 'St. Louis',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'locale' => 'en_US',
</span><span class="cx" style="display: block; padding: 0 10px"> 'timezone' => 'America/Chicago',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => "st. louis",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => 'st. louis',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => '38.627',
</span><span class="cx" style="display: block; padding: 0 10px"> 'longitude' => '-90.198',
</span><span class="cx" style="display: block; padding: 0 10px"> 'country' => 'US',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -395,12 +394,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> 'city-with-period-in-formal-name-but-not-in-query' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'input' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'location_name' => "St Louis",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'location_name' => 'St Louis',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'locale' => 'en_US',
</span><span class="cx" style="display: block; padding: 0 10px"> 'timezone' => 'America/Chicago',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => "st louis",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => 'st louis',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => '38.627',
</span><span class="cx" style="display: block; padding: 0 10px"> 'longitude' => '-90.198',
</span><span class="cx" style="display: block; padding: 0 10px"> 'country' => 'US',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1495,11 +1494,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_remove_duplicate_events() {
</span><span class="cx" style="display: block; padding: 0 10px"> $duplicate_events = array(
</span><span class="cx" style="display: block; padding: 0 10px"> // Each of these represents an event; extraneous fields have been removed for readability.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array (
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'url' => 'https://2020.us.wordcamp.org/',
</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">- array (
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'url' => 'https://2020.detroit.wordcamp.org/',
</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">@@ -1506,23 +1505,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> // Intentionally missing the trailing slash, to account for inconsistencies in data.
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => 'https://2020.us.wordcamp.org',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
</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"> printf( "\nRunning 1 remove_duplicate_events() test" );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected_result = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array (
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'url' => 'https://2020.us.wordcamp.org',
</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">- array (
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'url' => 'https://2020.detroit.wordcamp.org/',
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $actual_result = remove_duplicate_events( $duplicate_events );
- $passed = $expected_result === $actual_result;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $actual_result = remove_duplicate_events( $duplicate_events );
+ $passed = $expected_result === $actual_result;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> output_results( 'remove duplicate events', $passed, $expected_result, $actual_result );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>