@@ -231,7 +231,7 @@ |
||
| 231 | 231 | /** |
| 232 | 232 | * Get the number of friends |
| 233 | 233 | * |
| 234 | - * @return \Illuminate\Database\Eloquent\Collection |
|
| 234 | + * @return integer |
|
| 235 | 235 | */ |
| 236 | 236 | public function getFriendsCount() |
| 237 | 237 | { |
@@ -313,13 +313,13 @@ |
||
| 313 | 313 | |
| 314 | 314 | |
| 315 | 315 | $fofs = Friendship::where('status', Status::ACCEPTED) |
| 316 | - ->where(function ($query) use ($friendIds) { |
|
| 317 | - $query->where(function ($q) use ($friendIds) { |
|
| 318 | - $q->whereIn('sender_id', $friendIds); |
|
| 319 | - })->orWhere(function ($q) use ($friendIds) { |
|
| 320 | - $q->whereIn('recipient_id', $friendIds); |
|
| 321 | - }); |
|
| 322 | - })->get(['sender_id', 'recipient_id']); |
|
| 316 | + ->where(function ($query) use ($friendIds) { |
|
| 317 | + $query->where(function ($q) use ($friendIds) { |
|
| 318 | + $q->whereIn('sender_id', $friendIds); |
|
| 319 | + })->orWhere(function ($q) use ($friendIds) { |
|
| 320 | + $q->whereIn('recipient_id', $friendIds); |
|
| 321 | + }); |
|
| 322 | + })->get(['sender_id', 'recipient_id']); |
|
| 323 | 323 | |
| 324 | 324 | $fofIds = array_unique( |
| 325 | 325 | array_merge($fofs->pluck('sender_id')->all(), $fofs->lists('recipient_id')->all()) |
@@ -274,10 +274,10 @@ discard block |
||
| 274 | 274 | private function findFriendships($status = '%') |
| 275 | 275 | { |
| 276 | 276 | return Friendship::where('status', 'LIKE', $status) |
| 277 | - ->where(function ($query) { |
|
| 278 | - $query->where(function ($q) { |
|
| 277 | + ->where(function($query) { |
|
| 278 | + $query->where(function($q) { |
|
| 279 | 279 | $q->whereSender($this); |
| 280 | - })->orWhere(function ($q) { |
|
| 280 | + })->orWhere(function($q) { |
|
| 281 | 281 | $q->whereRecipient($this); |
| 282 | 282 | }); |
| 283 | 283 | }); |
@@ -313,10 +313,10 @@ discard block |
||
| 313 | 313 | |
| 314 | 314 | |
| 315 | 315 | $fofs = Friendship::where('status', Status::ACCEPTED) |
| 316 | - ->where(function ($query) use ($friendIds) { |
|
| 317 | - $query->where(function ($q) use ($friendIds) { |
|
| 316 | + ->where(function($query) use ($friendIds) { |
|
| 317 | + $query->where(function($q) use ($friendIds) { |
|
| 318 | 318 | $q->whereIn('sender_id', $friendIds); |
| 319 | - })->orWhere(function ($q) use ($friendIds) { |
|
| 319 | + })->orWhere(function($q) use ($friendIds) { |
|
| 320 | 320 | $q->whereIn('recipient_id', $friendIds); |
| 321 | 321 | }); |
| 322 | 322 | })->get(['sender_id', 'recipient_id']); |
@@ -7,7 +7,7 @@ |
||
| 7 | 7 | { |
| 8 | 8 | public function up() |
| 9 | 9 | { |
| 10 | - Schema::create('friendships', function (Blueprint $table) { |
|
| 10 | + Schema::create('friendships', function(Blueprint $table) { |
|
| 11 | 11 | $table->increments('id'); |
| 12 | 12 | $table->morphs('sender'); |
| 13 | 13 | $table->morphs('recipient'); |
@@ -75,10 +75,10 @@ |
||
| 75 | 75 | */ |
| 76 | 76 | public function scopeBetweenModels($query, $sender, $recipient) |
| 77 | 77 | { |
| 78 | - $query->where(function ($queryIn) use ($sender, $recipient) { |
|
| 79 | - $queryIn->where(function ($q) use ($sender, $recipient) { |
|
| 78 | + $query->where(function($queryIn) use ($sender, $recipient) { |
|
| 79 | + $queryIn->where(function($q) use ($sender, $recipient) { |
|
| 80 | 80 | $q->whereSender($sender)->whereRecipient($recipient); |
| 81 | - })->orWhere(function ($q) use ($sender, $recipient) { |
|
| 81 | + })->orWhere(function($q) use ($sender, $recipient) { |
|
| 82 | 82 | $q->whereSender($recipient)->whereRecipient($sender); |
| 83 | 83 | }); |
| 84 | 84 | }); |