Use the ::class notation, add Broadcasting service provider and Gate alias

This commit is contained in:
Pásztor Gábor 2016-01-02 16:57:57 +01:00
parent 7b174e6ce8
commit bb612f096e
3 changed files with 84 additions and 82 deletions

View File

@ -27,18 +27,18 @@ $app = new October\Rain\Foundation\Application(
*/ */
$app->singleton( $app->singleton(
'Illuminate\Contracts\Http\Kernel', Illuminate\Contracts\Http\Kernel::class,
'October\Rain\Foundation\Http\Kernel' October\Rain\Foundation\Http\Kernel::class
); );
$app->singleton( $app->singleton(
'Illuminate\Contracts\Console\Kernel', Illuminate\Contracts\Console\Kernel::class,
'October\Rain\Foundation\Console\Kernel' October\Rain\Foundation\Console\Kernel::class
); );
$app->singleton( $app->singleton(
'Illuminate\Contracts\Debug\ExceptionHandler', Illuminate\Contracts\Debug\ExceptionHandler::class,
'October\Rain\Foundation\Exception\Handler' October\Rain\Foundation\Exception\Handler::class
); );
/* /*

View File

@ -5,59 +5,60 @@ return [
/* /*
* Laravel aliases * Laravel aliases
*/ */
'App' => 'Illuminate\Support\Facades\App', 'App' => Illuminate\Support\Facades\App::class,
'Artisan' => 'Illuminate\Support\Facades\Artisan', 'Artisan' => Illuminate\Support\Facades\Artisan::class,
'Bus' => 'Illuminate\Support\Facades\Bus', 'Bus' => Illuminate\Support\Facades\Bus::class,
'Cache' => 'Illuminate\Support\Facades\Cache', 'Cache' => Illuminate\Support\Facades\Cache::class,
'Cookie' => 'Illuminate\Support\Facades\Cookie', 'Cookie' => Illuminate\Support\Facades\Cookie::class,
'Crypt' => 'Illuminate\Support\Facades\Crypt', 'Crypt' => Illuminate\Support\Facades\Crypt::class,
'Db' => 'Illuminate\Support\Facades\DB', // Preferred 'Db' => Illuminate\Support\Facades\DB::class, // Preferred
'DB' => 'Illuminate\Support\Facades\DB', 'DB' => Illuminate\Support\Facades\DB::class,
'Eloquent' => 'Illuminate\Database\Eloquent\Model', 'Eloquent' => Illuminate\Database\Eloquent\Model::class,
'Event' => 'Illuminate\Support\Facades\Event', 'Event' => Illuminate\Support\Facades\Event::class,
'Hash' => 'Illuminate\Support\Facades\Hash', 'Gate' => Illuminate\Support\Facades\Gate::class,
'Input' => 'Illuminate\Support\Facades\Input', 'Hash' => Illuminate\Support\Facades\Hash::class,
'Lang' => 'Illuminate\Support\Facades\Lang', 'Input' => Illuminate\Support\Facades\Input::class,
'Log' => 'Illuminate\Support\Facades\Log', 'Lang' => Illuminate\Support\Facades\Lang::class,
'Mail' => 'Illuminate\Support\Facades\Mail', 'Log' => Illuminate\Support\Facades\Log::class,
'Password' => 'Illuminate\Support\Facades\Password', 'Mail' => Illuminate\Support\Facades\Mail::class,
'Queue' => 'Illuminate\Support\Facades\Queue', 'Password' => Illuminate\Support\Facades\Password::class,
'Redirect' => 'Illuminate\Support\Facades\Redirect', 'Queue' => Illuminate\Support\Facades\Queue::class,
'Redis' => 'Illuminate\Support\Facades\Redis', 'Redirect' => Illuminate\Support\Facades\Redirect::class,
'Request' => 'Illuminate\Support\Facades\Request', 'Redis' => Illuminate\Support\Facades\Redis::class,
'Response' => 'Illuminate\Support\Facades\Response', 'Request' => Illuminate\Support\Facades\Request::class,
'Route' => 'Illuminate\Support\Facades\Route', 'Response' => Illuminate\Support\Facades\Response::class,
'Schema' => 'Illuminate\Support\Facades\Schema', 'Route' => Illuminate\Support\Facades\Route::class,
'Session' => 'Illuminate\Support\Facades\Session', 'Schema' => Illuminate\Support\Facades\Schema::class,
'Storage' => 'Illuminate\Support\Facades\Storage', 'Session' => Illuminate\Support\Facades\Session::class,
'Url' => 'Illuminate\Support\Facades\URL', // Preferred 'Storage' => Illuminate\Support\Facades\Storage::class,
'URL' => 'Illuminate\Support\Facades\URL', 'Url' => Illuminate\Support\Facades\URL::class, // Preferred
'Validator' => 'Illuminate\Support\Facades\Validator', 'URL' => Illuminate\Support\Facades\URL::class,
'View' => 'Illuminate\Support\Facades\View', 'Validator' => Illuminate\Support\Facades\Validator::class,
'View' => Illuminate\Support\Facades\View::class,
/* /*
* October aliases * October aliases
*/ */
'Model' => 'October\Rain\Database\Model', 'Model' => October\Rain\Database\Model::class,
'Block' => 'October\Rain\Support\Facades\Block', 'Block' => October\Rain\Support\Facades\Block::class,
'File' => 'October\Rain\Support\Facades\File', 'File' => October\Rain\Support\Facades\File::class,
'Config' => 'October\Rain\Support\Facades\Config', 'Config' => October\Rain\Support\Facades\Config::class,
'Seeder' => 'October\Rain\Database\Updates\Seeder', 'Seeder' => October\Rain\Database\Updates\Seeder::class,
'Flash' => 'October\Rain\Support\Facades\Flash', 'Flash' => October\Rain\Support\Facades\Flash::class,
'Form' => 'October\Rain\Support\Facades\Form', 'Form' => October\Rain\Support\Facades\Form::class,
'Html' => 'October\Rain\Support\Facades\Html', 'Html' => October\Rain\Support\Facades\Html::class,
'Http' => 'October\Rain\Support\Facades\Http', 'Http' => October\Rain\Support\Facades\Http::class,
'Str' => 'October\Rain\Support\Facades\Str', 'Str' => October\Rain\Support\Facades\Str::class,
'Markdown' => 'October\Rain\Support\Facades\Markdown', 'Markdown' => October\Rain\Support\Facades\Markdown::class,
'Yaml' => 'October\Rain\Support\Facades\Yaml', 'Yaml' => October\Rain\Support\Facades\Yaml::class,
'Ini' => 'October\Rain\Support\Facades\Ini', 'Ini' => October\Rain\Support\Facades\Ini::class,
'Twig' => 'October\Rain\Support\Facades\Twig', 'Twig' => October\Rain\Support\Facades\Twig::class,
'DbDongle' => 'October\Rain\Support\Facades\DbDongle', 'DbDongle' => October\Rain\Support\Facades\DbDongle::class,
'Backend' => 'Backend\Facades\Backend', 'Backend' => Backend\Facades\Backend::class,
'BackendMenu' => 'Backend\Facades\BackendMenu', 'BackendMenu' => Backend\Facades\BackendMenu::class,
'BackendAuth' => 'Backend\Facades\BackendAuth', 'BackendAuth' => Backend\Facades\BackendAuth::class,
'AjaxException' => 'October\Rain\Exception\AjaxException', 'AjaxException' => October\Rain\Exception\AjaxException::class,
'SystemException' => 'October\Rain\Exception\SystemException', 'SystemException' => October\Rain\Exception\SystemException::class,
'ApplicationException' => 'October\Rain\Exception\ApplicationException', 'ApplicationException' => October\Rain\Exception\ApplicationException::class,
'ValidationException' => 'October\Rain\Exception\ValidationException', 'ValidationException' => October\Rain\Exception\ValidationException::class,
]; ];

View File

@ -5,34 +5,35 @@ return [
/* /*
* Laravel providers * Laravel providers
*/ */
'Illuminate\Bus\BusServiceProvider', Illuminate\Broadcasting\BroadcastServiceProvider::class,
'Illuminate\Cache\CacheServiceProvider', Illuminate\Bus\BusServiceProvider::class,
'Illuminate\Foundation\Providers\ConsoleSupportServiceProvider', Illuminate\Cache\CacheServiceProvider::class,
'Illuminate\Routing\ControllerServiceProvider', Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class,
'Illuminate\Cookie\CookieServiceProvider', Illuminate\Routing\ControllerServiceProvider::class,
'Illuminate\Encryption\EncryptionServiceProvider', Illuminate\Cookie\CookieServiceProvider::class,
'Illuminate\Foundation\Providers\FoundationServiceProvider', Illuminate\Encryption\EncryptionServiceProvider::class,
'Illuminate\Hashing\HashServiceProvider', Illuminate\Foundation\Providers\FoundationServiceProvider::class,
'Illuminate\Pagination\PaginationServiceProvider', Illuminate\Hashing\HashServiceProvider::class,
'Illuminate\Pipeline\PipelineServiceProvider', Illuminate\Pagination\PaginationServiceProvider::class,
'Illuminate\Queue\QueueServiceProvider', Illuminate\Pipeline\PipelineServiceProvider::class,
'Illuminate\Redis\RedisServiceProvider', Illuminate\Queue\QueueServiceProvider::class,
'Illuminate\Session\SessionServiceProvider', Illuminate\Redis\RedisServiceProvider::class,
'Illuminate\Validation\ValidationServiceProvider', Illuminate\Session\SessionServiceProvider::class,
'Illuminate\View\ViewServiceProvider', Illuminate\Validation\ValidationServiceProvider::class,
Illuminate\View\ViewServiceProvider::class,
/* /*
* October Rain providers * October Rain providers
*/ */
'October\Rain\Foundation\Providers\ArtisanServiceProvider', October\Rain\Foundation\Providers\ArtisanServiceProvider::class,
'October\Rain\Database\DatabaseServiceProvider', October\Rain\Database\DatabaseServiceProvider::class,
'October\Rain\Filesystem\FilesystemServiceProvider', October\Rain\Filesystem\FilesystemServiceProvider::class,
'October\Rain\Parse\ParseServiceProvider', October\Rain\Parse\ParseServiceProvider::class,
'October\Rain\Html\HtmlServiceProvider', October\Rain\Html\HtmlServiceProvider::class,
'October\Rain\Html\UrlServiceProvider', October\Rain\Html\UrlServiceProvider::class,
'October\Rain\Network\NetworkServiceProvider', October\Rain\Network\NetworkServiceProvider::class,
'October\Rain\Scaffold\ScaffoldServiceProvider', October\Rain\Scaffold\ScaffoldServiceProvider::class,
'October\Rain\Flash\FlashServiceProvider', October\Rain\Flash\FlashServiceProvider::class,
'October\Rain\Mail\MailServiceProvider', October\Rain\Mail\MailServiceProvider::class,
]; ];