diff --git a/bootstrap/app.php b/bootstrap/app.php index 1304ef30b..cc0ec8d58 100644 --- a/bootstrap/app.php +++ b/bootstrap/app.php @@ -27,18 +27,18 @@ $app = new October\Rain\Foundation\Application( */ $app->singleton( - 'Illuminate\Contracts\Http\Kernel', - 'October\Rain\Foundation\Http\Kernel' + Illuminate\Contracts\Http\Kernel::class, + October\Rain\Foundation\Http\Kernel::class ); $app->singleton( - 'Illuminate\Contracts\Console\Kernel', - 'October\Rain\Foundation\Console\Kernel' + Illuminate\Contracts\Console\Kernel::class, + October\Rain\Foundation\Console\Kernel::class ); $app->singleton( - 'Illuminate\Contracts\Debug\ExceptionHandler', - 'October\Rain\Foundation\Exception\Handler' + Illuminate\Contracts\Debug\ExceptionHandler::class, + October\Rain\Foundation\Exception\Handler::class ); /* diff --git a/modules/system/aliases.php b/modules/system/aliases.php index e667169e2..a7ea636d7 100644 --- a/modules/system/aliases.php +++ b/modules/system/aliases.php @@ -5,59 +5,60 @@ return [ /* * Laravel aliases */ - 'App' => 'Illuminate\Support\Facades\App', - 'Artisan' => 'Illuminate\Support\Facades\Artisan', - 'Bus' => 'Illuminate\Support\Facades\Bus', - 'Cache' => 'Illuminate\Support\Facades\Cache', - 'Cookie' => 'Illuminate\Support\Facades\Cookie', - 'Crypt' => 'Illuminate\Support\Facades\Crypt', - 'Db' => 'Illuminate\Support\Facades\DB', // Preferred - 'DB' => 'Illuminate\Support\Facades\DB', - 'Eloquent' => 'Illuminate\Database\Eloquent\Model', - 'Event' => 'Illuminate\Support\Facades\Event', - 'Hash' => 'Illuminate\Support\Facades\Hash', - 'Input' => 'Illuminate\Support\Facades\Input', - 'Lang' => 'Illuminate\Support\Facades\Lang', - 'Log' => 'Illuminate\Support\Facades\Log', - 'Mail' => 'Illuminate\Support\Facades\Mail', - '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', // Preferred - 'URL' => 'Illuminate\Support\Facades\URL', - 'Validator' => 'Illuminate\Support\Facades\Validator', - 'View' => 'Illuminate\Support\Facades\View', + 'App' => Illuminate\Support\Facades\App::class, + 'Artisan' => Illuminate\Support\Facades\Artisan::class, + 'Bus' => Illuminate\Support\Facades\Bus::class, + 'Cache' => Illuminate\Support\Facades\Cache::class, + 'Cookie' => Illuminate\Support\Facades\Cookie::class, + 'Crypt' => Illuminate\Support\Facades\Crypt::class, + 'Db' => Illuminate\Support\Facades\DB::class, // Preferred + 'DB' => Illuminate\Support\Facades\DB::class, + 'Eloquent' => Illuminate\Database\Eloquent\Model::class, + 'Event' => Illuminate\Support\Facades\Event::class, + 'Gate' => Illuminate\Support\Facades\Gate::class, + 'Hash' => Illuminate\Support\Facades\Hash::class, + 'Input' => Illuminate\Support\Facades\Input::class, + 'Lang' => Illuminate\Support\Facades\Lang::class, + 'Log' => Illuminate\Support\Facades\Log::class, + 'Mail' => Illuminate\Support\Facades\Mail::class, + '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, // Preferred + 'URL' => Illuminate\Support\Facades\URL::class, + 'Validator' => Illuminate\Support\Facades\Validator::class, + 'View' => Illuminate\Support\Facades\View::class, /* * October aliases */ - 'Model' => 'October\Rain\Database\Model', - 'Block' => 'October\Rain\Support\Facades\Block', - 'File' => 'October\Rain\Support\Facades\File', - 'Config' => 'October\Rain\Support\Facades\Config', - 'Seeder' => 'October\Rain\Database\Updates\Seeder', - 'Flash' => 'October\Rain\Support\Facades\Flash', - 'Form' => 'October\Rain\Support\Facades\Form', - 'Html' => 'October\Rain\Support\Facades\Html', - 'Http' => 'October\Rain\Support\Facades\Http', - 'Str' => 'October\Rain\Support\Facades\Str', - 'Markdown' => 'October\Rain\Support\Facades\Markdown', - 'Yaml' => 'October\Rain\Support\Facades\Yaml', - 'Ini' => 'October\Rain\Support\Facades\Ini', - 'Twig' => 'October\Rain\Support\Facades\Twig', - 'DbDongle' => 'October\Rain\Support\Facades\DbDongle', - 'Backend' => 'Backend\Facades\Backend', - 'BackendMenu' => 'Backend\Facades\BackendMenu', - 'BackendAuth' => 'Backend\Facades\BackendAuth', - 'AjaxException' => 'October\Rain\Exception\AjaxException', - 'SystemException' => 'October\Rain\Exception\SystemException', - 'ApplicationException' => 'October\Rain\Exception\ApplicationException', - 'ValidationException' => 'October\Rain\Exception\ValidationException', + 'Model' => October\Rain\Database\Model::class, + 'Block' => October\Rain\Support\Facades\Block::class, + 'File' => October\Rain\Support\Facades\File::class, + 'Config' => October\Rain\Support\Facades\Config::class, + 'Seeder' => October\Rain\Database\Updates\Seeder::class, + 'Flash' => October\Rain\Support\Facades\Flash::class, + 'Form' => October\Rain\Support\Facades\Form::class, + 'Html' => October\Rain\Support\Facades\Html::class, + 'Http' => October\Rain\Support\Facades\Http::class, + 'Str' => October\Rain\Support\Facades\Str::class, + 'Markdown' => October\Rain\Support\Facades\Markdown::class, + 'Yaml' => October\Rain\Support\Facades\Yaml::class, + 'Ini' => October\Rain\Support\Facades\Ini::class, + 'Twig' => October\Rain\Support\Facades\Twig::class, + 'DbDongle' => October\Rain\Support\Facades\DbDongle::class, + 'Backend' => Backend\Facades\Backend::class, + 'BackendMenu' => Backend\Facades\BackendMenu::class, + 'BackendAuth' => Backend\Facades\BackendAuth::class, + 'AjaxException' => October\Rain\Exception\AjaxException::class, + 'SystemException' => October\Rain\Exception\SystemException::class, + 'ApplicationException' => October\Rain\Exception\ApplicationException::class, + 'ValidationException' => October\Rain\Exception\ValidationException::class, ]; diff --git a/modules/system/providers.php b/modules/system/providers.php index fa7636402..f95f05547 100644 --- a/modules/system/providers.php +++ b/modules/system/providers.php @@ -5,34 +5,35 @@ return [ /* * Laravel providers */ - 'Illuminate\Bus\BusServiceProvider', - 'Illuminate\Cache\CacheServiceProvider', - 'Illuminate\Foundation\Providers\ConsoleSupportServiceProvider', - 'Illuminate\Routing\ControllerServiceProvider', - 'Illuminate\Cookie\CookieServiceProvider', - 'Illuminate\Encryption\EncryptionServiceProvider', - 'Illuminate\Foundation\Providers\FoundationServiceProvider', - 'Illuminate\Hashing\HashServiceProvider', - 'Illuminate\Pagination\PaginationServiceProvider', - 'Illuminate\Pipeline\PipelineServiceProvider', - 'Illuminate\Queue\QueueServiceProvider', - 'Illuminate\Redis\RedisServiceProvider', - 'Illuminate\Session\SessionServiceProvider', - 'Illuminate\Validation\ValidationServiceProvider', - 'Illuminate\View\ViewServiceProvider', + Illuminate\Broadcasting\BroadcastServiceProvider::class, + Illuminate\Bus\BusServiceProvider::class, + Illuminate\Cache\CacheServiceProvider::class, + Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class, + Illuminate\Routing\ControllerServiceProvider::class, + Illuminate\Cookie\CookieServiceProvider::class, + Illuminate\Encryption\EncryptionServiceProvider::class, + Illuminate\Foundation\Providers\FoundationServiceProvider::class, + Illuminate\Hashing\HashServiceProvider::class, + Illuminate\Pagination\PaginationServiceProvider::class, + Illuminate\Pipeline\PipelineServiceProvider::class, + Illuminate\Queue\QueueServiceProvider::class, + Illuminate\Redis\RedisServiceProvider::class, + Illuminate\Session\SessionServiceProvider::class, + Illuminate\Validation\ValidationServiceProvider::class, + Illuminate\View\ViewServiceProvider::class, /* * October Rain providers */ - 'October\Rain\Foundation\Providers\ArtisanServiceProvider', - 'October\Rain\Database\DatabaseServiceProvider', - 'October\Rain\Filesystem\FilesystemServiceProvider', - 'October\Rain\Parse\ParseServiceProvider', - 'October\Rain\Html\HtmlServiceProvider', - 'October\Rain\Html\UrlServiceProvider', - 'October\Rain\Network\NetworkServiceProvider', - 'October\Rain\Scaffold\ScaffoldServiceProvider', - 'October\Rain\Flash\FlashServiceProvider', - 'October\Rain\Mail\MailServiceProvider', + October\Rain\Foundation\Providers\ArtisanServiceProvider::class, + October\Rain\Database\DatabaseServiceProvider::class, + October\Rain\Filesystem\FilesystemServiceProvider::class, + October\Rain\Parse\ParseServiceProvider::class, + October\Rain\Html\HtmlServiceProvider::class, + October\Rain\Html\UrlServiceProvider::class, + October\Rain\Network\NetworkServiceProvider::class, + October\Rain\Scaffold\ScaffoldServiceProvider::class, + October\Rain\Flash\FlashServiceProvider::class, + October\Rain\Mail\MailServiceProvider::class, ];