Commit 2cfc904d authored by Nicolas Widart's avatar Nicolas Widart

Updating to laravel 5.3

parent 1f95fa96
...@@ -6,9 +6,8 @@ use Illuminate\Foundation\Bus\DispatchesJobs; ...@@ -6,9 +6,8 @@ use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Routing\Controller as BaseController; use Illuminate\Routing\Controller as BaseController;
use Illuminate\Foundation\Validation\ValidatesRequests; use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests; use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Foundation\Auth\Access\AuthorizesResources;
class Controller extends BaseController class Controller extends BaseController
{ {
use AuthorizesRequests, AuthorizesResources, DispatchesJobs, ValidatesRequests; use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
} }
...@@ -16,7 +16,6 @@ class Kernel extends HttpKernel ...@@ -16,7 +16,6 @@ class Kernel extends HttpKernel
protected $middleware = [ protected $middleware = [
\Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class, \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
]; ];
/** /**
* The application's route middleware groups. * The application's route middleware groups.
* *
...@@ -29,13 +28,13 @@ class Kernel extends HttpKernel ...@@ -29,13 +28,13 @@ class Kernel extends HttpKernel
\Illuminate\Session\Middleware\StartSession::class, \Illuminate\Session\Middleware\StartSession::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class, \Illuminate\View\Middleware\ShareErrorsFromSession::class,
\App\Http\Middleware\VerifyCsrfToken::class, \App\Http\Middleware\VerifyCsrfToken::class,
\Illuminate\Routing\Middleware\SubstituteBindings::class,
], ],
'api' => [ 'api' => [
'throttle:60,1', 'throttle:60,1',
'bindings',
], ],
]; ];
/** /**
* The application's route middleware. * The application's route middleware.
* *
...@@ -44,9 +43,10 @@ class Kernel extends HttpKernel ...@@ -44,9 +43,10 @@ class Kernel extends HttpKernel
* @var array * @var array
*/ */
protected $routeMiddleware = [ protected $routeMiddleware = [
'auth' => \App\Http\Middleware\Authenticate::class, 'auth' => \Illuminate\Auth\Middleware\Authenticate::class,
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class, 'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
'can' => \Illuminate\Foundation\Http\Middleware\Authorize::class, 'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
// 'can' => \Illuminate\Auth\Middleware\Authorize::class,
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class, 'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
]; ];
......
...@@ -17,17 +17,14 @@ class EventServiceProvider extends ServiceProvider ...@@ -17,17 +17,14 @@ class EventServiceProvider extends ServiceProvider
'App\Listeners\EventListener', 'App\Listeners\EventListener',
], ],
]; ];
/** /**
* Register any other events for your application. * Register any events for your application.
* *
* @param \Illuminate\Contracts\Events\Dispatcher $events
* @return void * @return void
*/ */
public function boot(DispatcherContract $events) public function boot()
{ {
parent::boot($events); parent::boot();
// //
} }
} }
...@@ -15,47 +15,54 @@ class RouteServiceProvider extends ServiceProvider ...@@ -15,47 +15,54 @@ class RouteServiceProvider extends ServiceProvider
* @var string * @var string
*/ */
protected $namespace = 'App\Http\Controllers'; protected $namespace = 'App\Http\Controllers';
/** /**
* Define your route model bindings, pattern filters, etc. * Define your route model bindings, pattern filters, etc.
* *
* @param \Illuminate\Routing\Router $router
* @return void * @return void
*/ */
public function boot(Router $router) public function boot()
{ {
// parent::boot();
parent::boot($router);
} }
/** /**
* Define the routes for the application. * Define the routes for the application.
* *
* @param \Illuminate\Routing\Router $router
* @return void * @return void
*/ */
public function map(Router $router) public function map()
{ {
$this->mapWebRoutes($router);
//
} }
/** /**
* Define the "web" routes for the application. * Define the "web" routes for the application.
* *
* These routes all receive session state, CSRF protection, etc. * These routes all receive session state, CSRF protection, etc.
* *
* @param \Illuminate\Routing\Router $router
* @return void * @return void
*/ */
protected function mapWebRoutes(Router $router) protected function mapWebRoutes()
{
Route::group([
'middleware' => 'web',
'namespace' => $this->namespace,
], function ($router) {
require base_path('routes/web.php');
});
}
/**
* Define the "api" routes for the application.
*
* These routes are typically stateless.
*
* @return void
*/
protected function mapApiRoutes()
{ {
$router->group([ Route::group([
'namespace' => $this->namespace, 'middleware' => 'web', 'middleware' => 'api',
'namespace' => $this->namespace,
'prefix' => 'api',
], function ($router) { ], function ($router) {
require app_path('Http/routes.php'); require base_path('routes/api.php');
}); });
} }
} }
...@@ -12,9 +12,9 @@ ...@@ -12,9 +12,9 @@
"license": "MIT", "license": "MIT",
"type": "project", "type": "project",
"require": { "require": {
"php": ">=5.5.9", "php": ">=5.6.4",
"laravel/framework": "5.2.*", "laravel/framework": "5.3.*",
"nwidart/laravel-modules": "~0.2", "nwidart/laravel-modules": "~0.11",
"cartalyst/sentinel": "~2.0", "cartalyst/sentinel": "~2.0",
"asgardcms/core-module": "~2.0", "asgardcms/core-module": "~2.0",
"asgardcms/dashboard-module": "~2.0", "asgardcms/dashboard-module": "~2.0",
......
...@@ -2,6 +2,17 @@ ...@@ -2,6 +2,17 @@
return [ return [
/*
|--------------------------------------------------------------------------
| Application Name
|--------------------------------------------------------------------------
|
| This value is the name of your application. This value is used when the
| framework needs to place the application's name in a notification or
| any other location as required by the application or its packages.
*/
'name' => 'My Application',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Application Environment | Application Environment
...@@ -116,8 +127,8 @@ return [ ...@@ -116,8 +127,8 @@ return [
| Available Settings: "single", "daily", "syslog", "errorlog" | Available Settings: "single", "daily", "syslog", "errorlog"
| |
*/ */
'log' => env('APP_LOG', 'single'), 'log' => env('APP_LOG', 'single'),
'log_level' => env('APP_LOG_LEVEL', 'debug'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
...@@ -156,6 +167,7 @@ return [ ...@@ -156,6 +167,7 @@ return [
Illuminate\Translation\TranslationServiceProvider::class, Illuminate\Translation\TranslationServiceProvider::class,
Illuminate\Validation\ValidationServiceProvider::class, Illuminate\Validation\ValidationServiceProvider::class,
Illuminate\View\ViewServiceProvider::class, Illuminate\View\ViewServiceProvider::class,
Illuminate\Notifications\NotificationServiceProvider::class,
/* /*
* Application Service Providers... * Application Service Providers...
...@@ -211,7 +223,7 @@ return [ ...@@ -211,7 +223,7 @@ return [
'URL' => Illuminate\Support\Facades\URL::class, 'URL' => Illuminate\Support\Facades\URL::class,
'Validator' => Illuminate\Support\Facades\Validator::class, 'Validator' => Illuminate\Support\Facades\Validator::class,
'View' => Illuminate\Support\Facades\View::class, 'View' => Illuminate\Support\Facades\View::class,
'Notification' => Illuminate\Support\Facades\Notification::class,
], ],
]; ];
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment