From 78c932f6885ccc685d66c5c14e006b3f351802f6 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Wed, 27 Aug 2014 12:49:50 +0200
Subject: [PATCH] Working on a few changes.

---
 app/Providers/ErrorServiceProvider.php | 11 ++++++----
 app/Providers/EventServiceProvider.php | 29 --------------------------
 app/Providers/LogServiceProvider.php   |  7 ++++---
 app/Providers/RouteServiceProvider.php |  3 +--
 config/app.php                         |  1 -
 config/compile.php                     |  1 -
 6 files changed, 12 insertions(+), 40 deletions(-)
 delete mode 100644 app/Providers/EventServiceProvider.php

diff --git a/app/Providers/ErrorServiceProvider.php b/app/Providers/ErrorServiceProvider.php
index 738eed7f..1c014498 100644
--- a/app/Providers/ErrorServiceProvider.php
+++ b/app/Providers/ErrorServiceProvider.php
@@ -1,17 +1,20 @@
 <?php namespace App\Providers;
 
-use App, Log;
 use Exception;
+use Illuminate\Contracts\Logging\Log;
 use Illuminate\Support\ServiceProvider;
+use Illuminate\Contracts\Exception\Handler;
 
 class ErrorServiceProvider extends ServiceProvider {
 
 	/**
 	 * Register any error handlers.
 	 *
+	 * @param  Handler  $handler
+	 * @param  Log  $log
 	 * @return void
 	 */
-	public function boot()
+	public function boot(Handler $handler, Log $log)
 	{
 		// Here you may handle any errors that occur in your application, including
 		// logging them or displaying custom views for specific errors. You may
@@ -19,9 +22,9 @@ public function boot()
 		// exceptions. If nothing is returned, the default error view is
 		// shown, which includes a detailed stack trace during debug.
 
-		App::error(function(Exception $exception, $code)
+		$handler->error(function(Exception $e, $code) use ($log)
 		{
-			Log::error($exception);
+			$log->error($e);
 		});
 	}
 
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
deleted file mode 100644
index 4aba16d7..00000000
--- a/app/Providers/EventServiceProvider.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php namespace App\Providers;
-
-use Illuminate\Foundation\Providers\EventServiceProvider as ServiceProvider;
-
-class EventServiceProvider extends ServiceProvider {
-
-	/**
-	 * Bootstrap the application events.
-	 *
-	 * @return void
-	 */
-	public function boot()
-	{
-		//
-	}
-
-	/**
-	 * Get the directories to scan for events.
-	 *
-	 * @return array
-	 */
-	public function scan()
-	{
-		return [
-			app_path(),
-		];
-	}
-
-}
\ No newline at end of file
diff --git a/app/Providers/LogServiceProvider.php b/app/Providers/LogServiceProvider.php
index acdd1c2e..cba36039 100644
--- a/app/Providers/LogServiceProvider.php
+++ b/app/Providers/LogServiceProvider.php
@@ -1,6 +1,6 @@
 <?php namespace App\Providers;
 
-use Log;
+use Illuminate\Contracts\Logging\Log;
 use Illuminate\Support\ServiceProvider;
 
 class LogServiceProvider extends ServiceProvider {
@@ -8,11 +8,12 @@ class LogServiceProvider extends ServiceProvider {
 	/**
 	 * Configure the application's logging facilities.
 	 *
+	 * @param  Log  $log
 	 * @return void
 	 */
-	public function boot()
+	public function boot(Log $log)
 	{
-		Log::useFiles(storage_path().'/logs/laravel.log');
+		$log->useFiles(storage_path().'/logs/laravel.log');
 	}
 
 	/**
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index 2e746555..8956a5ba 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -1,6 +1,5 @@
 <?php namespace App\Providers;
 
-use App;
 use Illuminate\Routing\RouteServiceProvider as ServiceProvider;
 
 class RouteServiceProvider extends ServiceProvider {
@@ -24,7 +23,7 @@ public function before()
 	 */
 	public function map()
 	{
-		App::booted(function()
+		$this->app->booted(function()
 		{
 			// Once the application has booted, we will include the default routes
 			// file. This "namespace" helper will load the routes file within a
diff --git a/config/app.php b/config/app.php
index 10721112..e9cf2538 100644
--- a/config/app.php
+++ b/config/app.php
@@ -101,7 +101,6 @@
 		'App\Providers\AppServiceProvider',
 		'App\Providers\ArtisanServiceProvider',
 		'App\Providers\ErrorServiceProvider',
-		'App\Providers\EventServiceProvider',
 		'App\Providers\FilterServiceProvider',
 		'App\Providers\LogServiceProvider',
 		'App\Providers\RouteServiceProvider',
diff --git a/config/compile.php b/config/compile.php
index 34840c7e..31a2c8b3 100644
--- a/config/compile.php
+++ b/config/compile.php
@@ -18,7 +18,6 @@
 		__DIR__.'/../app/Providers/AppServiceProvider.php',
 		__DIR__.'/../app/Providers/ArtisanServiceProvider.php',
 		__DIR__.'/../app/Providers/ErrorServiceProvider.php',
-		__DIR__.'/../app/Providers/EventServiceProvider.php',
 		__DIR__.'/../app/Providers/FilterServiceProvider.php',
 		__DIR__.'/../app/Providers/LogServiceProvider.php',
 		__DIR__.'/../app/Providers/RouteServiceProvider.php',