Master synchronization

bestmomo · Jan 22, 2015 · 3ac49de · 3ac49de
1 parent 41cb20f
commit 3ac49de
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
@@ -1,5 +1,6 @@
 <?php namespace App\Providers;
 
+use Illuminate\Contracts\Events\Dispatcher as DispatcherContract;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
 
 class EventServiceProvider extends ServiceProvider {
@@ -15,4 +16,15 @@ class EventServiceProvider extends ServiceProvider {
 		'user.access' => ['App\Services\Statut@setStatut']
 	];
 
+	/**
+	 * Register any other events for your application.
+	 *
+	 * @param \Illuminate\Contracts\Events\Dispatcher $events
+	 * @return void
+	 */
+	public function boot(DispatcherContract $events)
+	{
+		parent::boot($events);
+	}
+
 }
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
@@ -36,7 +36,7 @@ public function boot(Router $router)
 	 */
 	public function map(Router $router)
 	{
-		$router->group(['namespace' => $this->namespace], function()
+		$router->group(['namespace' => $this->namespace], function($router)
 		{
 			require app_path('Http/routes.php');
 		});

diff --git a/config/app.php b/config/app.php
@@ -176,7 +176,6 @@
 		'Lang'      => 'Illuminate\Support\Facades\Lang',
 		'Log'       => 'Illuminate\Support\Facades\Log',
 		'Mail'      => 'Illuminate\Support\Facades\Mail',
-		'Paginator' => 'Illuminate\Support\Facades\Paginator',
 		'Password'  => 'Illuminate\Support\Facades\Password',
 		'Queue'     => 'Illuminate\Support\Facades\Queue',
 		'Redirect'  => 'Illuminate\Support\Facades\Redirect',