Few minor fixes related to L5.2 update
This commit is contained in:
parent
beab5d64a5
commit
99d71ff237
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use Illuminate\Foundation\Bus\DispatchesCommands;
|
||||
use Illuminate\Foundation\Bus\DispatchesJobs;
|
||||
use Illuminate\Foundation\Validation\ValidatesRequests;
|
||||
use Illuminate\Routing\Controller as BaseController;
|
||||
|
||||
abstract class Controller extends BaseController
|
||||
{
|
||||
use DispatchesCommands, ValidatesRequests;
|
||||
use DispatchesJobs, ValidatesRequests;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
"homepage" : "https://www.attendize.com",
|
||||
"require": {
|
||||
"laravel/framework": "5.2.*",
|
||||
"illuminate/html": "~5.0",
|
||||
"laravelcollective/html": "~5.0",
|
||||
"milon/barcode": "dev-master",
|
||||
"iron-io/iron_mq": "2.*",
|
||||
"intervention/image": "dev-master",
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -154,6 +154,8 @@ return [
|
|||
App\Providers\AuthServiceProvider::class,
|
||||
App\Providers\EventServiceProvider::class,
|
||||
App\Providers\RouteServiceProvider::class,
|
||||
App\Providers\HelpersServiceProvider::class,
|
||||
Collective\Html\HtmlServiceProvider::class,
|
||||
|
||||
/*
|
||||
* Third Party Service Providers...
|
||||
|
|
@ -168,6 +170,7 @@ return [
|
|||
MaxHoffmann\Parsedown\ParsedownServiceProvider::class,
|
||||
Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class,
|
||||
Laracasts\Utilities\JavaScript\JavaScriptServiceProvider::class,
|
||||
|
||||
],
|
||||
|
||||
/*
|
||||
|
|
@ -215,8 +218,8 @@ return [
|
|||
'URL' => Illuminate\Support\Facades\URL::class,
|
||||
'Validator' => Illuminate\Support\Facades\Validator::class,
|
||||
'View' => Illuminate\Support\Facades\View::class,
|
||||
'Form' => Illuminate\Html\FormFacade::class,
|
||||
'HTML' => Illuminate\Html\HtmlFacade::class,
|
||||
'Form' => Collective\Html\FormFacade::class,
|
||||
'HTML' => Collective\Html\HtmlFacade::class,
|
||||
'Str' => Illuminate\Support\Str::class,
|
||||
'Utils' => App\Attendize\Utils::class,
|
||||
'Carbon' => Carbon\Carbon::class,
|
||||
|
|
|
|||
Loading…
Reference in New Issue