From ad9b6a9d7e425c0b74c46d14a9b49e71afcc5669 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Wed, 4 Jan 2017 19:50:17 +0000 Subject: [PATCH] Consistently use the class notation --- bootstrap/app.php | 6 +- config/app.php | 151 +++++++++++++++++++++++----------------------- 2 files changed, 78 insertions(+), 79 deletions(-) diff --git a/bootstrap/app.php b/bootstrap/app.php index 8223651a..787b5db6 100644 --- a/bootstrap/app.php +++ b/bootstrap/app.php @@ -22,11 +22,11 @@ $app = new Illuminate\Foundation\Application(realpath(__DIR__.'/../')); | */ -$app->singleton('Illuminate\Contracts\Http\Kernel', 'CachetHQ\Cachet\Http\Kernel'); +$app->singleton(Illuminate\Contracts\Http\Kernel::class, CachetHQ\Cachet\Http\Kernel::class); -$app->singleton('Illuminate\Contracts\Console\Kernel', 'CachetHQ\Cachet\Console\Kernel'); +$app->singleton(Illuminate\Contracts\Console\Kernel::class, CachetHQ\Cachet\Console\Kernel::class); -$app->singleton('Illuminate\Contracts\Debug\ExceptionHandler', 'GrahamCampbell\Exceptions\NewExceptionHandler'); +$app->singleton(Illuminate\Contracts\Debug\ExceptionHandler::class, GrahamCampbell\Exceptions\NewExceptionHandler::class); /* |-------------------------------------------------------------------------- diff --git a/config/app.php b/config/app.php index a58fd14c..b40ff7ef 100644 --- a/config/app.php +++ b/config/app.php @@ -147,59 +147,59 @@ return [ /* * Laravel Framework Service Providers... */ - 'Illuminate\Auth\AuthServiceProvider', - 'Illuminate\Broadcasting\BroadcastServiceProvider', - 'AltThree\Bus\BusServiceProvider', - 'Illuminate\Cache\CacheServiceProvider', - 'Illuminate\Foundation\Providers\ConsoleSupportServiceProvider', - 'Illuminate\Cookie\CookieServiceProvider', - 'Illuminate\Database\DatabaseServiceProvider', - 'Illuminate\Encryption\EncryptionServiceProvider', - 'Illuminate\Filesystem\FilesystemServiceProvider', - 'Illuminate\Foundation\Providers\FoundationServiceProvider', - 'Illuminate\Hashing\HashServiceProvider', - 'Illuminate\Mail\MailServiceProvider', + Illuminate\Auth\AuthServiceProvider::class, + Illuminate\Broadcasting\BroadcastServiceProvider::class, + AltThree\Bus\BusServiceProvider::class, + Illuminate\Cache\CacheServiceProvider::class, + Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class, + Illuminate\Cookie\CookieServiceProvider::class, + Illuminate\Database\DatabaseServiceProvider::class, + Illuminate\Encryption\EncryptionServiceProvider::class, + Illuminate\Filesystem\FilesystemServiceProvider::class, + Illuminate\Foundation\Providers\FoundationServiceProvider::class, + Illuminate\Hashing\HashServiceProvider::class, + Illuminate\Mail\MailServiceProvider::class, Illuminate\Notifications\NotificationServiceProvider::class, - 'Illuminate\Pagination\PaginationServiceProvider', - 'Illuminate\Pipeline\PipelineServiceProvider', - 'Illuminate\Queue\QueueServiceProvider', - 'Illuminate\Redis\RedisServiceProvider', - 'Illuminate\Auth\Passwords\PasswordResetServiceProvider', - 'Illuminate\Session\SessionServiceProvider', - 'Illuminate\Translation\TranslationServiceProvider', - 'Illuminate\Validation\ValidationServiceProvider', - 'Illuminate\View\ViewServiceProvider', + Illuminate\Pagination\PaginationServiceProvider::class, + Illuminate\Pipeline\PipelineServiceProvider::class, + Illuminate\Queue\QueueServiceProvider::class, + Illuminate\Redis\RedisServiceProvider::class, + Illuminate\Auth\Passwords\PasswordResetServiceProvider::class, + Illuminate\Session\SessionServiceProvider::class, + Illuminate\Translation\TranslationServiceProvider::class, + Illuminate\Validation\ValidationServiceProvider::class, + Illuminate\View\ViewServiceProvider::class, /* * Packages Service Providers... */ - 'AltThree\Badger\BadgerServiceProvider', - 'AltThree\Emoji\EmojiServiceProvider', - 'BackupManager\Laravel\Laravel5ServiceProvider', - 'Barryvdh\Cors\ServiceProvider', - 'Fedeisas\LaravelMailCssInliner\LaravelMailCssInlinerServiceProvider', - 'Fideloper\Proxy\TrustedProxyServiceProvider', - 'GrahamCampbell\Binput\BinputServiceProvider', - 'GrahamCampbell\Exceptions\ExceptionsServiceProvider', - 'GrahamCampbell\Core\CoreServiceProvider', - 'GrahamCampbell\Markdown\MarkdownServiceProvider', - 'GrahamCampbell\Security\SecurityServiceProvider', - 'McCool\LaravelAutoPresenter\AutoPresenterServiceProvider', - 'PragmaRX\Google2FA\Vendor\Laravel\ServiceProvider', - 'Roumen\Feed\FeedServiceProvider', + AltThree\Badger\BadgerServiceProvider::class, + AltThree\Emoji\EmojiServiceProvider::class, + BackupManager\Laravel\Laravel5ServiceProvider::class, + Barryvdh\Cors\ServiceProvider::class, + Fedeisas\LaravelMailCssInliner\LaravelMailCssInlinerServiceProvider::class, + Fideloper\Proxy\TrustedProxyServiceProvider::class, + GrahamCampbell\Binput\BinputServiceProvider::class, + GrahamCampbell\Exceptions\ExceptionsServiceProvider::class, + GrahamCampbell\Core\CoreServiceProvider::class, + GrahamCampbell\Markdown\MarkdownServiceProvider::class, + GrahamCampbell\Security\SecurityServiceProvider::class, + McCool\LaravelAutoPresenter\AutoPresenterServiceProvider::class, + PragmaRX\Google2FA\Vendor\Laravel\ServiceProvider::class, + Roumen\Feed\FeedServiceProvider::class, /* * Application Service Providers... */ - 'CachetHQ\Cachet\Foundation\Providers\AppServiceProvider', - 'CachetHQ\Cachet\Foundation\Providers\ComposerServiceProvider', - 'CachetHQ\Cachet\Foundation\Providers\ConsoleServiceProvider', - 'CachetHQ\Cachet\Foundation\Providers\ConfigServiceProvider', - 'CachetHQ\Cachet\Foundation\Providers\EventServiceProvider', - 'CachetHQ\Cachet\Foundation\Providers\IntegrationServiceProvider', - 'CachetHQ\Cachet\Foundation\Providers\ModuleServiceProvider', - 'CachetHQ\Cachet\Foundation\Providers\RepositoryServiceProvider', - 'CachetHQ\Cachet\Foundation\Providers\RouteServiceProvider', + CachetHQ\Cachet\Foundation\Providers\AppServiceProvider::class, + CachetHQ\Cachet\Foundation\Providers\ComposerServiceProvider::class, + CachetHQ\Cachet\Foundation\Providers\ConsoleServiceProvider::class, + CachetHQ\Cachet\Foundation\Providers\ConfigServiceProvider::class, + CachetHQ\Cachet\Foundation\Providers\EventServiceProvider::class, + CachetHQ\Cachet\Foundation\Providers\IntegrationServiceProvider::class, + CachetHQ\Cachet\Foundation\Providers\ModuleServiceProvider::class, + CachetHQ\Cachet\Foundation\Providers\RepositoryServiceProvider::class, + CachetHQ\Cachet\Foundation\Providers\RouteServiceProvider::class, ]), @@ -216,39 +216,38 @@ return [ 'aliases' => [ - 'App' => 'Illuminate\Support\Facades\App', - 'Artisan' => 'Illuminate\Support\Facades\Artisan', - 'Auth' => 'Illuminate\Support\Facades\Auth', - 'Blade' => 'Illuminate\Support\Facades\Blade', - 'Cache' => 'Illuminate\Support\Facades\Cache', - 'Config' => 'Illuminate\Support\Facades\Config', - 'Cookie' => 'Illuminate\Support\Facades\Cookie', - 'Crypt' => 'Illuminate\Support\Facades\Crypt', - 'DB' => 'Illuminate\Support\Facades\DB', - 'Event' => 'Illuminate\Support\Facades\Event', - 'File' => 'Illuminate\Support\Facades\File', - 'Gate' => 'Illuminate\Support\Facades\Gate', - 'Hash' => 'Illuminate\Support\Facades\Hash', - 'Lang' => 'Illuminate\Support\Facades\Lang', - 'Log' => 'Illuminate\Support\Facades\Log', - 'Mail' => 'Illuminate\Support\Facades\Mail', + 'App' => Illuminate\Support\Facades\App::class, + 'Artisan' => Illuminate\Support\Facades\Artisan::class, + 'Auth' => Illuminate\Support\Facades\Auth::class, + 'Blade' => Illuminate\Support\Facades\Blade::class, + 'Cache' => Illuminate\Support\Facades\Cache::class, + 'Config' => Illuminate\Support\Facades\Config::class, + 'Cookie' => Illuminate\Support\Facades\Cookie::class, + 'Crypt' => Illuminate\Support\Facades\Crypt::class, + 'DB' => Illuminate\Support\Facades\DB::class, + 'Event' => Illuminate\Support\Facades\Event::class, + 'File' => Illuminate\Support\Facades\File::class, + 'Gate' => Illuminate\Support\Facades\Gate::class, + 'Hash' => Illuminate\Support\Facades\Hash::class, + 'Lang' => Illuminate\Support\Facades\Lang::class, + 'Log' => Illuminate\Support\Facades\Log::class, + 'Mail' => Illuminate\Support\Facades\Mail::class, 'Notification' => Illuminate\Support\Facades\Notification::class, - 'Password' => 'Illuminate\Support\Facades\Password', - 'Queue' => 'Illuminate\Support\Facades\Queue', - 'Redirect' => 'Illuminate\Support\Facades\Redirect', - 'Redis' => 'Illuminate\Support\Facades\Redis', - 'Request' => 'Illuminate\Support\Facades\Request', - 'Response' => 'Illuminate\Support\Facades\Response', - 'Route' => 'Illuminate\Support\Facades\Route', - 'Schema' => 'Illuminate\Support\Facades\Schema', - 'Session' => 'Illuminate\Support\Facades\Session', - 'Storage' => 'Illuminate\Support\Facades\Storage', - 'URL' => 'Illuminate\Support\Facades\URL', - 'Validator' => 'Illuminate\Support\Facades\Validator', - 'View' => 'Illuminate\Support\Facades\View', - - 'Binput' => 'GrahamCampbell\Binput\Facades\Binput', - 'Str' => 'Illuminate\Support\Str', + 'Password' => Illuminate\Support\Facades\Password::class, + 'Queue' => Illuminate\Support\Facades\Queue::class, + 'Redirect' => Illuminate\Support\Facades\Redirect::class, + 'Redis' => Illuminate\Support\Facades\Redis::class, + 'Request' => Illuminate\Support\Facades\Request::class, + 'Response' => Illuminate\Support\Facades\Response::class, + 'Route' => Illuminate\Support\Facades\Route::class, + 'Schema' => Illuminate\Support\Facades\Schema::class, + 'Session' => Illuminate\Support\Facades\Session::class, + 'Storage' => Illuminate\Support\Facades\Storage::class, + 'URL' => Illuminate\Support\Facades\URL::class, + 'Validator' => Illuminate\Support\Facades\Validator::class, + 'View' => Illuminate\Support\Facades\View::class, + 'Binput' => GrahamCampbell\Binput\Facades\Binput::class, + 'Str' => Illuminate\Support\Str::class, ],