From 177d1ebb7a16de0c8d0187b5a64172eece404bfb Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Wed, 20 Aug 2014 00:10:30 -0500
Subject: [PATCH] Mega work on structure.

---
 app/Console/InspireCommand.php           |  2 +-
 app/Http/Controllers/HomeController.php  |  6 ++---
 app/Http/Filters/AuthFilter.php          |  3 ++-
 app/Http/Filters/BasicAuthFilter.php     |  4 ++-
 app/Http/Filters/CsrfFilter.php          |  6 +++--
 app/Http/Filters/GuestFilter.php         |  4 ++-
 app/Http/Filters/MaintenanceFilter.php   |  4 ++-
 app/{ => Http}/routes.php                |  0
 app/Providers/AppServiceProvider.php     |  2 +-
 app/Providers/ArtisanServiceProvider.php |  2 +-
 app/Providers/ErrorServiceProvider.php   |  2 +-
 app/Providers/EventServiceProvider.php   |  2 +-
 app/Providers/FilterServiceProvider.php  | 12 ++++-----
 app/Providers/LogServiceProvider.php     |  2 +-
 app/Providers/RouteServiceProvider.php   |  7 ++++--
 app/{Core => }/User.php                  |  0
 composer.json                            |  8 +-----
 config/app.php                           | 14 +++++------
 config/namespaces.php                    | 31 ++++++++++++++++++++++++
 19 files changed, 74 insertions(+), 37 deletions(-)
 rename app/{ => Http}/routes.php (100%)
 rename app/{Core => }/User.php (100%)
 create mode 100644 config/namespaces.php

diff --git a/app/Console/InspireCommand.php b/app/Console/InspireCommand.php
index 404fcdd0..777b2f4e 100644
--- a/app/Console/InspireCommand.php
+++ b/app/Console/InspireCommand.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Console;
 
 use Illuminate\Console\Command;
 use Illuminate\Foundation\Inspiring;
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index c634d2d9..ea9253ae 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -1,6 +1,6 @@
-<?php
+<?php namespace App\Http\Controllers;
 
-class HomeController extends Controller {
+class HomeController extends \Controller {
 
 	/*
 	|--------------------------------------------------------------------------
@@ -17,7 +17,7 @@ class HomeController extends Controller {
 
 	public function index()
 	{
-		return View::make('hello');
+		return view('hello');
 	}
 
 }
diff --git a/app/Http/Filters/AuthFilter.php b/app/Http/Filters/AuthFilter.php
index f790c798..bd512bb7 100644
--- a/app/Http/Filters/AuthFilter.php
+++ b/app/Http/Filters/AuthFilter.php
@@ -1,6 +1,7 @@
-<?php
+<?php namespace App\Http\Filters;
 
 use Illuminate\Http\Request;
+use Auth, Redirect, Response;
 
 class AuthFilter {
 
diff --git a/app/Http/Filters/BasicAuthFilter.php b/app/Http/Filters/BasicAuthFilter.php
index 49316e2b..fbc0a8c2 100644
--- a/app/Http/Filters/BasicAuthFilter.php
+++ b/app/Http/Filters/BasicAuthFilter.php
@@ -1,4 +1,6 @@
-<?php
+<?php namespace App\Http\Filters;
+
+use Auth;
 
 class BasicAuthFilter {
 
diff --git a/app/Http/Filters/CsrfFilter.php b/app/Http/Filters/CsrfFilter.php
index 008eaf69..c6ee7696 100644
--- a/app/Http/Filters/CsrfFilter.php
+++ b/app/Http/Filters/CsrfFilter.php
@@ -1,7 +1,9 @@
-<?php
+<?php namespace App\Http\Filters;
 
+use Session;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Route;
+use Illuminate\Session\TokenMismatchException;
 
 class CsrfFilter {
 
@@ -14,7 +16,7 @@ class CsrfFilter {
 	{
 		if (Session::token() != $request->input('_token'))
 		{
-			throw new Illuminate\Session\TokenMismatchException;
+			throw new TokenMismatchException;
 		}
 	}
 
diff --git a/app/Http/Filters/GuestFilter.php b/app/Http/Filters/GuestFilter.php
index 08cee12b..752efc2e 100644
--- a/app/Http/Filters/GuestFilter.php
+++ b/app/Http/Filters/GuestFilter.php
@@ -1,4 +1,6 @@
-<?php
+<?php namespace App\Http\Filters;
+
+use Auth, Redirect;
 
 class GuestFilter {
 
diff --git a/app/Http/Filters/MaintenanceFilter.php b/app/Http/Filters/MaintenanceFilter.php
index 940f9d2a..a495b0e2 100644
--- a/app/Http/Filters/MaintenanceFilter.php
+++ b/app/Http/Filters/MaintenanceFilter.php
@@ -1,4 +1,6 @@
-<?php
+<?php namespace App\Http\Filters;
+
+use App, Response;
 
 class MaintenanceFilter {
 
diff --git a/app/routes.php b/app/Http/routes.php
similarity index 100%
rename from app/routes.php
rename to app/Http/routes.php
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 3a511f38..fe864953 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -1,4 +1,4 @@
-<?php namespace Providers;
+<?php namespace App\Providers;
 
 use Illuminate\Support\ServiceProvider;
 
diff --git a/app/Providers/ArtisanServiceProvider.php b/app/Providers/ArtisanServiceProvider.php
index e4438ab5..afdc61ec 100644
--- a/app/Providers/ArtisanServiceProvider.php
+++ b/app/Providers/ArtisanServiceProvider.php
@@ -1,4 +1,4 @@
-<?php namespace Providers;
+<?php namespace App\Providers;
 
 use InspireCommand;
 use Illuminate\Support\ServiceProvider;
diff --git a/app/Providers/ErrorServiceProvider.php b/app/Providers/ErrorServiceProvider.php
index ad132c0d..fb1cb28a 100644
--- a/app/Providers/ErrorServiceProvider.php
+++ b/app/Providers/ErrorServiceProvider.php
@@ -1,4 +1,4 @@
-<?php namespace Providers;
+<?php namespace App\Providers;
 
 use Illuminate\Support\ServiceProvider;
 
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index a7a76cf1..d464fbe6 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -1,4 +1,4 @@
-<?php namespace Providers;
+<?php namespace App\Providers;
 
 use Illuminate\Foundation\Providers\EventServiceProvider as ServiceProvider;
 
diff --git a/app/Providers/FilterServiceProvider.php b/app/Providers/FilterServiceProvider.php
index be0d7d8c..64a611bf 100644
--- a/app/Providers/FilterServiceProvider.php
+++ b/app/Providers/FilterServiceProvider.php
@@ -1,4 +1,4 @@
-<?php namespace Providers;
+<?php namespace App\Providers;
 
 use Illuminate\Routing\FilterServiceProvider as ServiceProvider;
 
@@ -10,7 +10,7 @@ class FilterServiceProvider extends ServiceProvider {
 	 * @var array
 	 */
 	protected $before = [
-		'MaintenanceFilter',
+		'App\Http\Filters\MaintenanceFilter',
 	];
 
 	/**
@@ -28,10 +28,10 @@ class FilterServiceProvider extends ServiceProvider {
 	 * @var array
 	 */
 	protected $filters = [
-		'auth' => 'AuthFilter',
-		'auth.basic' => 'BasicAuthFilter',
-		'csrf' => 'CsrfFilter',
-		'guest' => 'GuestFilter',
+		'auth' => 'App\Http\Filters\AuthFilter',
+		'auth.basic' => 'App\Http\Filters\BasicAuthFilter',
+		'csrf' => 'App\Http\Filters\CsrfFilter',
+		'guest' => 'App\Http\Filters\GuestFilter',
 	];
 
 }
\ No newline at end of file
diff --git a/app/Providers/LogServiceProvider.php b/app/Providers/LogServiceProvider.php
index a1fb8f2d..67fa3fe1 100644
--- a/app/Providers/LogServiceProvider.php
+++ b/app/Providers/LogServiceProvider.php
@@ -1,4 +1,4 @@
-<?php namespace Providers;
+<?php namespace App\Providers;
 
 use Illuminate\Support\ServiceProvider;
 
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index 35621d20..dde5ff82 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -1,4 +1,4 @@
-<?php namespace Providers;
+<?php namespace App\Providers;
 
 use Illuminate\Routing\RouteServiceProvider as ServiceProvider;
 
@@ -25,7 +25,10 @@ class RouteServiceProvider extends ServiceProvider {
 	{
 		$this->app->booted(function()
 		{
-			require app('path').'/routes.php';
+			$this->namespaced(function()
+			{
+				require app('path').'/Http/routes.php';
+			});
 		});
 	}
 
diff --git a/app/Core/User.php b/app/User.php
similarity index 100%
rename from app/Core/User.php
rename to app/User.php
diff --git a/composer.json b/composer.json
index f4493dea..0e4084f1 100644
--- a/composer.json
+++ b/composer.json
@@ -9,17 +9,11 @@
 	},
 	"autoload": {
 		"classmap": [
-			"app/Console",
-			"app/Http/Controllers",
 			"database",
-			"app/Http/Filters",
-			"app/Providers",
-			"app/Http/Requests",
 			"tests/TestCase.php"
 		],
 		"psr-4": {
-			"App\\": "app/Core/",
-			"Providers\\": "app/Providers/"
+			"App\\": "app/"
 		}
 	},
 	"scripts": {
diff --git a/config/app.php b/config/app.php
index 230e3d87..f45aa525 100644
--- a/config/app.php
+++ b/config/app.php
@@ -98,13 +98,13 @@ return array(
 		/*
 		 * Application Service Providers...
 		 */
-		'Providers\AppServiceProvider',
-		'Providers\ArtisanServiceProvider',
-		'Providers\ErrorServiceProvider',
-		'Providers\EventServiceProvider',
-		'Providers\FilterServiceProvider',
-		'Providers\LogServiceProvider',
-		'Providers\RouteServiceProvider',
+		'App\Providers\AppServiceProvider',
+		'App\Providers\ArtisanServiceProvider',
+		'App\Providers\ErrorServiceProvider',
+		'App\Providers\EventServiceProvider',
+		'App\Providers\FilterServiceProvider',
+		'App\Providers\LogServiceProvider',
+		'App\Providers\RouteServiceProvider',
 
 		/*
 		 * Laravel Framework Service Providers...
diff --git a/config/namespaces.php b/config/namespaces.php
new file mode 100644
index 00000000..30b527c4
--- /dev/null
+++ b/config/namespaces.php
@@ -0,0 +1,31 @@
+<?php
+
+return array(
+
+	/*
+	|--------------------------------------------------------------------------
+	| Application Namespace
+	|--------------------------------------------------------------------------
+	|
+	| This is the root namespace used by the various Laravel generator tasks
+	| that are able to build controllers, console commands and many other
+	| classes for you. You may set the name via the "app:name" command.
+	|
+	*/
+
+	'root' => 'App\\',
+
+	/*
+	|--------------------------------------------------------------------------
+	| Root Controller Namespace
+	|--------------------------------------------------------------------------
+	|
+	| This namespace will be automatically prepended to URLs generated via
+	| the URL generator for controller actions, allowing for the simple
+	| and convenient referencing of your namespaced controller class.
+	|
+	*/
+
+	'controllers' => 'App\Http\Controllers',
+
+);