From d68b248fd70774b95695e0afea70422ea401e4ef Mon Sep 17 00:00:00 2001 From: Joseph Cohen Date: Wed, 5 Aug 2015 17:18:51 -0500 Subject: [PATCH] Remove AbstractController from remaining and rename BaseController to Controller --- app/Http/Controllers/Admin/ApiController.php | 4 ++-- app/Http/Controllers/Admin/ComponentController.php | 4 ++-- app/Http/Controllers/Admin/DashboardController.php | 4 ++-- app/Http/Controllers/Admin/IncidentController.php | 4 ++-- app/Http/Controllers/Admin/MetricController.php | 4 ++-- app/Http/Controllers/Admin/ScheduleController.php | 4 ++-- app/Http/Controllers/Admin/SettingsController.php | 4 ++-- app/Http/Controllers/Admin/SubscriberController.php | 4 ++-- app/Http/Controllers/Admin/TeamController.php | 4 ++-- app/Http/Controllers/Admin/UserController.php | 4 ++-- app/Http/Controllers/Api/AbstractApiController.php | 4 ++-- app/Http/Controllers/AtomController.php | 4 ++-- app/Http/Controllers/AuthController.php | 4 ++-- app/Http/Controllers/HomeController.php | 4 ++-- app/Http/Controllers/RssController.php | 4 ++-- app/Http/Controllers/SetupController.php | 4 ++-- app/Http/Controllers/SubscribeController.php | 4 ++-- 17 files changed, 34 insertions(+), 34 deletions(-) diff --git a/app/Http/Controllers/Admin/ApiController.php b/app/Http/Controllers/Admin/ApiController.php index 94420db1..39ad28cc 100644 --- a/app/Http/Controllers/Admin/ApiController.php +++ b/app/Http/Controllers/Admin/ApiController.php @@ -11,15 +11,15 @@ namespace CachetHQ\Cachet\Http\Controllers\Admin; -use CachetHQ\Cachet\Http\Controllers\AbstractController; use CachetHQ\Cachet\Models\Component; use CachetHQ\Cachet\Models\ComponentGroup; use CachetHQ\Cachet\Models\IncidentTemplate; use Exception; use GrahamCampbell\Binput\Facades\Binput; use Illuminate\Database\Eloquent\ModelNotFoundException; +use Illuminate\Routing\Controller; -class ApiController extends AbstractController +class ApiController extends Controller { /** * Updates a component with the entered info. diff --git a/app/Http/Controllers/Admin/ComponentController.php b/app/Http/Controllers/Admin/ComponentController.php index 568209cc..fc44308e 100644 --- a/app/Http/Controllers/Admin/ComponentController.php +++ b/app/Http/Controllers/Admin/ComponentController.php @@ -12,15 +12,15 @@ namespace CachetHQ\Cachet\Http\Controllers\Admin; use AltThree\Validator\ValidationException; -use CachetHQ\Cachet\Http\Controllers\AbstractController; use CachetHQ\Cachet\Models\Component; use CachetHQ\Cachet\Models\ComponentGroup; use CachetHQ\Cachet\Models\Tag; use GrahamCampbell\Binput\Facades\Binput; +use Illuminate\Routing\Controller; use Illuminate\Support\Facades\Redirect; use Illuminate\Support\Facades\View; -class ComponentController extends AbstractController +class ComponentController extends Controller { protected $subMenu = []; diff --git a/app/Http/Controllers/Admin/DashboardController.php b/app/Http/Controllers/Admin/DashboardController.php index d903a132..d12407c5 100644 --- a/app/Http/Controllers/Admin/DashboardController.php +++ b/app/Http/Controllers/Admin/DashboardController.php @@ -11,11 +11,11 @@ namespace CachetHQ\Cachet\Http\Controllers\Admin; -use CachetHQ\Cachet\Http\Controllers\AbstractController; use CachetHQ\Cachet\Models\Component; +use Illuminate\Routing\Controller; use Illuminate\Support\Facades\View; -class DashboardController extends AbstractController +class DashboardController extends Controller { /** * Shows the dashboard view. diff --git a/app/Http/Controllers/Admin/IncidentController.php b/app/Http/Controllers/Admin/IncidentController.php index 84a4184a..a17826ae 100644 --- a/app/Http/Controllers/Admin/IncidentController.php +++ b/app/Http/Controllers/Admin/IncidentController.php @@ -14,18 +14,18 @@ namespace CachetHQ\Cachet\Http\Controllers\Admin; use AltThree\Validator\ValidationException; use CachetHQ\Cachet\Events\IncidentHasReportedEvent; use CachetHQ\Cachet\Facades\Setting; -use CachetHQ\Cachet\Http\Controllers\AbstractController; use CachetHQ\Cachet\Models\Component; use CachetHQ\Cachet\Models\ComponentGroup; use CachetHQ\Cachet\Models\Incident; use CachetHQ\Cachet\Models\IncidentTemplate; use GrahamCampbell\Binput\Facades\Binput; +use Illuminate\Routing\Controller; use Illuminate\Support\Facades\Config; use Illuminate\Support\Facades\Redirect; use Illuminate\Support\Facades\View; use Jenssegers\Date\Date; -class IncidentController extends AbstractController +class IncidentController extends Controller { /** * Stores the sub-sidebar tree list. diff --git a/app/Http/Controllers/Admin/MetricController.php b/app/Http/Controllers/Admin/MetricController.php index e51319e9..e1caafbb 100644 --- a/app/Http/Controllers/Admin/MetricController.php +++ b/app/Http/Controllers/Admin/MetricController.php @@ -12,14 +12,14 @@ namespace CachetHQ\Cachet\Http\Controllers\Admin; use AltThree\Validator\ValidationException; -use CachetHQ\Cachet\Http\Controllers\AbstractController; use CachetHQ\Cachet\Models\Metric; use CachetHQ\Cachet\Models\MetricPoint; use GrahamCampbell\Binput\Facades\Binput; +use Illuminate\Routing\Controller; use Illuminate\Support\Facades\Redirect; use Illuminate\Support\Facades\View; -class MetricController extends AbstractController +class MetricController extends Controller { /** * Shows the metrics view. diff --git a/app/Http/Controllers/Admin/ScheduleController.php b/app/Http/Controllers/Admin/ScheduleController.php index afb178f0..eb35b40d 100644 --- a/app/Http/Controllers/Admin/ScheduleController.php +++ b/app/Http/Controllers/Admin/ScheduleController.php @@ -14,17 +14,17 @@ namespace CachetHQ\Cachet\Http\Controllers\Admin; use AltThree\Validator\ValidationException; use CachetHQ\Cachet\Events\MaintenanceHasScheduledEvent; use CachetHQ\Cachet\Facades\Setting; -use CachetHQ\Cachet\Http\Controllers\AbstractController; use CachetHQ\Cachet\Models\Incident; use CachetHQ\Cachet\Models\IncidentTemplate; use GrahamCampbell\Binput\Facades\Binput; +use Illuminate\Routing\Controller; use Illuminate\Support\Facades\Config; use Illuminate\Support\Facades\Redirect; use Illuminate\Support\Facades\View; use Illuminate\Support\MessageBag; use Jenssegers\Date\Date; -class ScheduleController extends AbstractController +class ScheduleController extends Controller { /** * Stores the sub-sidebar tree list. diff --git a/app/Http/Controllers/Admin/SettingsController.php b/app/Http/Controllers/Admin/SettingsController.php index 777ef306..b1ff6ad1 100644 --- a/app/Http/Controllers/Admin/SettingsController.php +++ b/app/Http/Controllers/Admin/SettingsController.php @@ -11,16 +11,16 @@ namespace CachetHQ\Cachet\Http\Controllers\Admin; -use CachetHQ\Cachet\Http\Controllers\AbstractController; use CachetHQ\Cachet\Models\Setting; use CachetHQ\Cachet\Models\User; use Exception; use GrahamCampbell\Binput\Facades\Binput; +use Illuminate\Routing\Controller; use Illuminate\Support\Facades\Lang; use Illuminate\Support\Facades\Redirect; use Illuminate\Support\Facades\View; -class SettingsController extends AbstractController +class SettingsController extends Controller { protected $subMenu = []; protected $subTitle = 'Settings'; diff --git a/app/Http/Controllers/Admin/SubscriberController.php b/app/Http/Controllers/Admin/SubscriberController.php index 5b06e8fb..15aa6197 100644 --- a/app/Http/Controllers/Admin/SubscriberController.php +++ b/app/Http/Controllers/Admin/SubscriberController.php @@ -13,13 +13,13 @@ namespace CachetHQ\Cachet\Http\Controllers\Admin; use AltThree\Validator\ValidationException; use CachetHQ\Cachet\Events\CustomerHasSubscribedEvent; -use CachetHQ\Cachet\Http\Controllers\AbstractController; use CachetHQ\Cachet\Models\Subscriber; use GrahamCampbell\Binput\Facades\Binput; +use Illuminate\Routing\Controller; use Illuminate\Support\Facades\Redirect; use Illuminate\Support\Facades\View; -class SubscriberController extends AbstractController +class SubscriberController extends Controller { /** * Shows the subscribers view. diff --git a/app/Http/Controllers/Admin/TeamController.php b/app/Http/Controllers/Admin/TeamController.php index 617c90d8..4bc94648 100644 --- a/app/Http/Controllers/Admin/TeamController.php +++ b/app/Http/Controllers/Admin/TeamController.php @@ -12,13 +12,13 @@ namespace CachetHQ\Cachet\Http\Controllers\Admin; use AltThree\Validator\ValidationException; -use CachetHQ\Cachet\Http\Controllers\AbstractController; use CachetHQ\Cachet\Models\User; use GrahamCampbell\Binput\Facades\Binput; +use Illuminate\Routing\Controller; use Illuminate\Support\Facades\Redirect; use Illuminate\Support\Facades\View; -class TeamController extends AbstractController +class TeamController extends Controller { /** * Shows the team members view. diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 75a32a4c..f2ed21a7 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -12,15 +12,15 @@ namespace CachetHQ\Cachet\Http\Controllers\Admin; use AltThree\Validator\ValidationException; -use CachetHQ\Cachet\Http\Controllers\AbstractController; use CachetHQ\Cachet\Models\User; use GrahamCampbell\Binput\Facades\Binput; +use Illuminate\Routing\Controller; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Redirect; use Illuminate\Support\Facades\View; use PragmaRX\Google2FA\Vendor\Laravel\Facade as Google2FA; -class UserController extends AbstractController +class UserController extends Controller { /** * Shows the user view. diff --git a/app/Http/Controllers/Api/AbstractApiController.php b/app/Http/Controllers/Api/AbstractApiController.php index ca1126ff..75bd5d05 100644 --- a/app/Http/Controllers/Api/AbstractApiController.php +++ b/app/Http/Controllers/Api/AbstractApiController.php @@ -14,12 +14,12 @@ namespace CachetHQ\Cachet\Http\Controllers\Api; use Illuminate\Contracts\Pagination\Paginator; use Illuminate\Contracts\Support\Arrayable; use Illuminate\Http\Request; -use Illuminate\Routing\Controller as BaseController; +use Illuminate\Routing\Controller; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Response; use McCool\LaravelAutoPresenter\Facades\AutoPresenter; -abstract class AbstractApiController extends BaseController +abstract class AbstractApiController extends Controller { /** * The HTTP response headers. diff --git a/app/Http/Controllers/AtomController.php b/app/Http/Controllers/AtomController.php index 90f870aa..614082cb 100644 --- a/app/Http/Controllers/AtomController.php +++ b/app/Http/Controllers/AtomController.php @@ -15,11 +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\Routing\Controller; use Illuminate\Support\Str; use Roumen\Feed\Facades\Feed; -class AtomController extends BaseController +class AtomController extends Controller { /** * Generates an Atom feed of all incidents. diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index eb0eabc3..7b0fb074 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -12,7 +12,7 @@ namespace CachetHQ\Cachet\Http\Controllers; use GrahamCampbell\Binput\Facades\Binput; -use Illuminate\Routing\Controller as BaseController; +use Illuminate\Routing\Controller; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Redirect; use Illuminate\Support\Facades\Request; @@ -20,7 +20,7 @@ use Illuminate\Support\Facades\Session; use Illuminate\Support\Facades\View; use PragmaRX\Google2FA\Vendor\Laravel\Facade as Google2FA; -class AuthController extends BaseController +class AuthController extends Controller { /** * Shows the login view. diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 1be24c66..0eef67fb 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -19,12 +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\Routing\Controller; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\View; use Jenssegers\Date\Date; -class HomeController extends BaseController +class HomeController extends Controller { /** * Returns the rendered Blade templates. diff --git a/app/Http/Controllers/RssController.php b/app/Http/Controllers/RssController.php index 5cd3d5f7..a69d6e66 100644 --- a/app/Http/Controllers/RssController.php +++ b/app/Http/Controllers/RssController.php @@ -14,11 +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\Routing\Controller; use Illuminate\Support\Str; use Roumen\Feed\Facades\Feed; -class RssController extends BaseController +class RssController extends Controller { /** * Generates an Atom feed of all incidents. diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php index 0f9ad5e6..43724bd2 100644 --- a/app/Http/Controllers/SetupController.php +++ b/app/Http/Controllers/SetupController.php @@ -14,7 +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\Routing\Controller; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Config; use Illuminate\Support\Facades\Redirect; @@ -24,7 +24,7 @@ use Illuminate\Support\Facades\Session; use Illuminate\Support\Facades\Validator; use Illuminate\Support\Facades\View; -class SetupController extends BaseController +class SetupController extends Controller { /** * Array of cache drivers. diff --git a/app/Http/Controllers/SubscribeController.php b/app/Http/Controllers/SubscribeController.php index 8256c448..3d703f52 100644 --- a/app/Http/Controllers/SubscribeController.php +++ b/app/Http/Controllers/SubscribeController.php @@ -18,12 +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\Routing\Controller; use Illuminate\Support\Facades\Redirect; use Illuminate\Support\Facades\View; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -class SubscribeController extends BaseController +class SubscribeController extends Controller { /** * Show the subscribe by email page.