From 8d0a716c2dc7b971bf4129acf195c7654d9ba188 Mon Sep 17 00:00:00 2001
From: James Brooks <james@bluebaytravel.co.uk>
Date: Wed, 5 Aug 2015 15:18:20 +0100
Subject: [PATCH] Remove AbstractController as it does nothing

---
 app/Http/Controllers/AbstractController.php   | 21 -------------------
 .../Controllers/Api/AbstractApiController.php |  2 +-
 app/Http/Controllers/AtomController.php       |  3 ++-
 app/Http/Controllers/AuthController.php       |  3 ++-
 app/Http/Controllers/HomeController.php       |  3 ++-
 app/Http/Controllers/RssController.php        |  3 ++-
 app/Http/Controllers/SetupController.php      |  3 ++-
 app/Http/Controllers/SubscribeController.php  |  3 ++-
 8 files changed, 13 insertions(+), 28 deletions(-)
 delete mode 100644 app/Http/Controllers/AbstractController.php

diff --git a/app/Http/Controllers/AbstractController.php b/app/Http/Controllers/AbstractController.php
deleted file mode 100644
index cea29d4f..00000000
--- a/app/Http/Controllers/AbstractController.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/*
- * This file is part of Cachet.
- *
- * (c) Alt Three Services Limited
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace CachetHQ\Cachet\Http\Controllers;
-
-use Illuminate\Foundation\Bus\DispatchesJobs;
-use Illuminate\Foundation\Validation\ValidatesRequests;
-use Illuminate\Routing\Controller as BaseController;
-
-abstract class AbstractController extends BaseController
-{
-    use DispatchesJobs, ValidatesRequests;
-}
diff --git a/app/Http/Controllers/Api/AbstractApiController.php b/app/Http/Controllers/Api/AbstractApiController.php
index a18612aa..ca1126ff 100644
--- a/app/Http/Controllers/Api/AbstractApiController.php
+++ b/app/Http/Controllers/Api/AbstractApiController.php
@@ -11,10 +11,10 @@
 
 namespace CachetHQ\Cachet\Http\Controllers\Api;
 
-use CachetHQ\Cachet\Http\Controllers\AbstractController as BaseController;
 use Illuminate\Contracts\Pagination\Paginator;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Http\Request;
+use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Response;
 use McCool\LaravelAutoPresenter\Facades\AutoPresenter;
diff --git a/app/Http/Controllers/AtomController.php b/app/Http/Controllers/AtomController.php
index d0cb6e06..90f870aa 100644
--- a/app/Http/Controllers/AtomController.php
+++ b/app/Http/Controllers/AtomController.php
@@ -15,10 +15,11 @@ use CachetHQ\Cachet\Facades\Setting;
 use CachetHQ\Cachet\Models\ComponentGroup;
 use CachetHQ\Cachet\Models\Incident;
 use GrahamCampbell\Markdown\Facades\Markdown;
+use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Support\Str;
 use Roumen\Feed\Facades\Feed;
 
-class AtomController extends AbstractController
+class AtomController extends BaseController
 {
     /**
      * Generates an Atom feed of all incidents.
diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
index 0debd9a1..eb0eabc3 100644
--- a/app/Http/Controllers/AuthController.php
+++ b/app/Http/Controllers/AuthController.php
@@ -12,6 +12,7 @@
 namespace CachetHQ\Cachet\Http\Controllers;
 
 use GrahamCampbell\Binput\Facades\Binput;
+use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\Request;
@@ -19,7 +20,7 @@ use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Facades\View;
 use PragmaRX\Google2FA\Vendor\Laravel\Facade as Google2FA;
 
-class AuthController extends AbstractController
+class AuthController extends BaseController
 {
     /**
      * Shows the login view.
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 7e828502..1be24c66 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -19,11 +19,12 @@ use CachetHQ\Cachet\Models\Metric;
 use Exception;
 use GrahamCampbell\Binput\Facades\Binput;
 use GrahamCampbell\Markdown\Facades\Markdown;
+use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\View;
 use Jenssegers\Date\Date;
 
-class HomeController extends AbstractController
+class HomeController extends BaseController
 {
     /**
      * Returns the rendered Blade templates.
diff --git a/app/Http/Controllers/RssController.php b/app/Http/Controllers/RssController.php
index c58b1b97..5cd3d5f7 100644
--- a/app/Http/Controllers/RssController.php
+++ b/app/Http/Controllers/RssController.php
@@ -14,10 +14,11 @@ namespace CachetHQ\Cachet\Http\Controllers;
 use CachetHQ\Cachet\Facades\Setting;
 use CachetHQ\Cachet\Models\ComponentGroup;
 use CachetHQ\Cachet\Models\Incident;
+use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Support\Str;
 use Roumen\Feed\Facades\Feed;
 
-class RssController extends AbstractController
+class RssController extends BaseController
 {
     /**
      * Generates an Atom feed of all incidents.
diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php
index 8eaab51f..0f9ad5e6 100644
--- a/app/Http/Controllers/SetupController.php
+++ b/app/Http/Controllers/SetupController.php
@@ -14,6 +14,7 @@ namespace CachetHQ\Cachet\Http\Controllers;
 use CachetHQ\Cachet\Models\Setting;
 use CachetHQ\Cachet\Models\User;
 use GrahamCampbell\Binput\Facades\Binput;
+use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Redirect;
@@ -23,7 +24,7 @@ use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Facades\View;
 
-class SetupController extends AbstractController
+class SetupController extends BaseController
 {
     /**
      * Array of cache drivers.
diff --git a/app/Http/Controllers/SubscribeController.php b/app/Http/Controllers/SubscribeController.php
index cb37f20d..8256c448 100644
--- a/app/Http/Controllers/SubscribeController.php
+++ b/app/Http/Controllers/SubscribeController.php
@@ -18,11 +18,12 @@ use CachetHQ\Cachet\Models\Subscriber;
 use Carbon\Carbon;
 use GrahamCampbell\Binput\Facades\Binput;
 use GrahamCampbell\Markdown\Facades\Markdown;
+use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\View;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-class SubscribeController extends AbstractController
+class SubscribeController extends BaseController
 {
     /**
      * Show the subscribe by email page.