From a82f1ce09a95319852bf633f4f2199e8fb164d32 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Sun, 31 Jan 2016 16:38:08 +0000 Subject: [PATCH 1/3] Remove unused Config facade --- app/Foundation/Providers/ConfigServiceProvider.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Foundation/Providers/ConfigServiceProvider.php b/app/Foundation/Providers/ConfigServiceProvider.php index 866742eb..3297f03a 100644 --- a/app/Foundation/Providers/ConfigServiceProvider.php +++ b/app/Foundation/Providers/ConfigServiceProvider.php @@ -14,7 +14,6 @@ namespace CachetHQ\Cachet\Foundation\Providers; use CachetHQ\Cachet\Config\Repository; use CachetHQ\Cachet\Models\Setting as SettingModel; use Exception; -use Illuminate\Support\Facades\Config; use Illuminate\Support\ServiceProvider; class ConfigServiceProvider extends ServiceProvider From 9c4c3d3843159ccd0b0775c0cc87a43060642e96 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Sun, 31 Jan 2016 16:38:15 +0000 Subject: [PATCH 2/3] Fix AlreadySubscribedException import --- app/Http/Controllers/SubscribeController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/SubscribeController.php b/app/Http/Controllers/SubscribeController.php index 3a68fc43..3e417cf1 100644 --- a/app/Http/Controllers/SubscribeController.php +++ b/app/Http/Controllers/SubscribeController.php @@ -16,7 +16,7 @@ use CachetHQ\Cachet\Bus\Commands\Subscriber\SubscribeSubscriberCommand; use CachetHQ\Cachet\Bus\Commands\Subscriber\UnsubscribeSubscriberCommand; use CachetHQ\Cachet\Bus\Commands\Subscriber\UnsubscribeSubscriptionCommand; use CachetHQ\Cachet\Bus\Commands\Subscriber\VerifySubscriberCommand; -use CachetHQ\Cachet\Exceptions\AlreadySubscribedException; +use CachetHQ\Cachet\Bus\Exceptions\Subscriber\AlreadySubscribedException; use CachetHQ\Cachet\Models\Subscriber; use CachetHQ\Cachet\Models\Subscription; use GrahamCampbell\Binput\Facades\Binput; From a1206af764e77b0cd86074813b7ba436d98e9871 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Sun, 31 Jan 2016 16:46:30 +0000 Subject: [PATCH 3/3] Initialize the response array --- app/Http/Controllers/Api/AbstractApiController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Http/Controllers/Api/AbstractApiController.php b/app/Http/Controllers/Api/AbstractApiController.php index f7978b93..cbfb0686 100644 --- a/app/Http/Controllers/Api/AbstractApiController.php +++ b/app/Http/Controllers/Api/AbstractApiController.php @@ -187,6 +187,8 @@ abstract class AbstractApiController extends Controller */ protected function respond() { + $response = []; + if (!empty($this->meta)) { $response['meta'] = $this->meta; }