<!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>[BuddyPress][9330] trunk: Activity: Scopes with no generated SQL statement should match nothing.</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://buddypress.trac.wordpress.org/changeset/9330">9330</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/9330","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>r-a-y</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-01-09 18:47:34 +0000 (Fri, 09 Jan 2015)</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'>Activity: Scopes with no generated SQL statement should match nothing.
Commit also adds unit tests demonstrating the problem.
Props imath.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/6099">#6099</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivitybpactivityclassesphp">trunk/src/bp-activity/bp-activity-classes.php</a></li>
<li><a href="#trunktestsphpunittestcasesactivitytemplatephp">trunk/tests/phpunit/testcases/activity/template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivitybpactivityclassesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/bp-activity-classes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/bp-activity-classes.php 2015-01-09 18:34:41 UTC (rev 9329)
+++ trunk/src/bp-activity/bp-activity-classes.php 2015-01-09 18:47:34 UTC (rev 9330)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -348,8 +348,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $r['scope'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $scope_query = self::get_scope_query_sql( $r['scope'], $r );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add our SQL conditions if matches were found
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $scope_query['sql'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $where_conditions['scope_query_sql'] = $scope_query['sql'];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // No matches, so we should alter the SQL statement to match nothing
+ } else {
+ $where_conditions['scope_no_results'] = '0 = 1';
</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"> // override some arguments if needed
</span></span></pre></div>
<a id="trunktestsphpunittestcasesactivitytemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/activity/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/activity/template.php 2015-01-09 18:34:41 UTC (rev 9329)
+++ trunk/tests/phpunit/testcases/activity/template.php 2015-01-09 18:47:34 UTC (rev 9330)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -342,9 +342,141 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group scope
</ins><span class="cx" style="display: block; padding: 0 10px"> * @group filter_query
</span><span class="cx" style="display: block; padding: 0 10px"> * @group BP_Activity_Query
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function test_bp_has_activities_scope_friends_no_items() {
+ $u1 = $this->factory->user->create();
+
+ $now = time();
+
+ // Create a random activity
+ $a1 = $this->factory->activity->create( array(
+ 'user_id' => $u1,
+ 'type' => 'activity_update',
+ 'recorded_time' => date( 'Y-m-d H:i:s', $now ),
+ ) );
+
+ global $activities_template;
+ $reset_activities_template = $activities_template;
+
+ // grab activities from friends scope
+ bp_has_activities( array(
+ 'user_id' => $u1,
+ 'scope' => 'friends',
+ ) );
+
+ // assert!
+ $this->assertEmpty( $activities_template->activities, 'When a user does not have any friendship, no activities should be fetched when on friends scope' );
+
+ // clean up!
+ $activities_template = $reset_activities_template;
+ }
+
+ /**
+ * @group scope
+ * @group filter_query
+ * @group BP_Activity_Query
+ */
+ function test_bp_has_activities_scope_favorites_no_items() {
+ $u1 = $this->factory->user->create();
+
+ $now = time();
+
+ // Create a random activity
+ $a1 = $this->factory->activity->create( array(
+ 'user_id' => $u1,
+ 'type' => 'activity_update',
+ 'recorded_time' => date( 'Y-m-d H:i:s', $now ),
+ ) );
+
+ global $activities_template;
+ $reset_activities_template = $activities_template;
+
+ // grab activities from favorites scope
+ bp_has_activities( array(
+ 'user_id' => $u1,
+ 'scope' => 'favorites',
+ ) );
+
+ // assert!
+ $this->assertEmpty( $activities_template->activities, 'When a user has not favorited any activity, no activities should be fetched when on favorites scope' );
+
+ // clean up!
+ $activities_template = $reset_activities_template;
+ }
+
+ /**
+ * @group scope
+ * @group filter_query
+ * @group BP_Activity_Query
+ */
+ function test_bp_has_activities_scope_groups_no_items() {
+ $u1 = $this->factory->user->create();
+
+ $now = time();
+
+ // Create a random activity
+ $a1 = $this->factory->activity->create( array(
+ 'user_id' => $u1,
+ 'type' => 'activity_update',
+ 'recorded_time' => date( 'Y-m-d H:i:s', $now ),
+ ) );
+
+ global $activities_template;
+ $reset_activities_template = $activities_template;
+
+ // grab activities from groups scope
+ bp_has_activities( array(
+ 'user_id' => $u1,
+ 'scope' => 'groups',
+ ) );
+
+ // assert!
+ $this->assertEmpty( $activities_template->activities, 'When a user is not a member of any group, no activities should be fetched when on groups scope' );
+
+ // clean up!
+ $activities_template = $reset_activities_template;
+ }
+
+ /**
+ * @group scope
+ * @group filter_query
+ * @group BP_Activity_Query
+ */
+ function test_bp_has_activities_scope_mentions_no_items() {
+ $u1 = $this->factory->user->create();
+
+ $now = time();
+
+ // Create a random activity
+ $a1 = $this->factory->activity->create( array(
+ 'user_id' => $u1,
+ 'type' => 'activity_update',
+ 'recorded_time' => date( 'Y-m-d H:i:s', $now ),
+ ) );
+
+ global $activities_template;
+ $reset_activities_template = $activities_template;
+
+ // grab activities from mentions scope
+ bp_has_activities( array(
+ 'user_id' => $u1,
+ 'scope' => 'mentions',
+ ) );
+
+ // assert!
+ $this->assertEmpty( $activities_template->activities, 'When a user has no mention, no activities should be fetched when on the mentions scope' );
+
+ // clean up!
+ $activities_template = $reset_activities_template;
+ }
+
+ /**
+ * @group filter_query
+ * @group BP_Activity_Query
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_bp_has_activities_with_filter_query_nested_conditions() {
</span><span class="cx" style="display: block; padding: 0 10px"> $u1 = $this->factory->user->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $u2 = $this->factory->user->create();
</span></span></pre>
</div>
</div>
</body>
</html>