From e5c90b25b24b10d92a64459510e5f54c94694c61 Mon Sep 17 00:00:00 2001 From: Joseph Cohen Date: Wed, 9 Dec 2015 17:32:18 -0600 Subject: [PATCH] Make subscribers is verified a attribute getter --- app/Http/Controllers/SubscribeController.php | 4 ++-- app/Models/Subscriber.php | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/SubscribeController.php b/app/Http/Controllers/SubscribeController.php index 21173bf2..8c4e5145 100644 --- a/app/Http/Controllers/SubscribeController.php +++ b/app/Http/Controllers/SubscribeController.php @@ -81,7 +81,7 @@ class SubscribeController extends Controller $subscriber = Subscriber::where('verify_code', '=', $code)->first(); - if (!$subscriber || $subscriber->verified()) { + if (!$subscriber || $subscriber->is_verified) { throw new BadRequestHttpException(); } @@ -106,7 +106,7 @@ class SubscribeController extends Controller $subscriber = Subscriber::where('verify_code', '=', $code)->first(); - if (!$subscriber || !$subscriber->verified()) { + if (!$subscriber || !$subscriber->is_verified) { throw new BadRequestHttpException(); } diff --git a/app/Models/Subscriber.php b/app/Models/Subscriber.php index fb86b843..8e03c55c 100644 --- a/app/Models/Subscriber.php +++ b/app/Models/Subscriber.php @@ -14,6 +14,7 @@ namespace CachetHQ\Cachet\Models; use AltThree\Validator\ValidatingTrait; use CachetHQ\Cachet\Presenters\SubscriberPresenter; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Builder; use McCool\LaravelAutoPresenter\HasPresenter; class Subscriber extends Model implements HasPresenter @@ -65,9 +66,11 @@ class Subscriber extends Model implements HasPresenter /** * Scope a query to only include verified subscribers. * + * @param \Illuminate\Database\Eloquent\Builder $query + * * @return \Illuminate\Database\Eloquent\Builder */ - public function scopeVerified($query) + public function scopeVerified(Builder $query) { return $query->whereNotNull('verified_at'); } @@ -77,7 +80,7 @@ class Subscriber extends Model implements HasPresenter * * @return bool */ - public function verified() + public function getIsVerifiedAttribute() { return $this->verified_at !== null; }