Browse Source

Mega work on structure.

Taylor Otwell 9 years ago
parent
commit
177d1ebb7a

+ 1 - 1
app/Console/InspireCommand.php

@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Console;
 
 use Illuminate\Console\Command;
 use Illuminate\Foundation\Inspiring;

+ 3 - 3
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');
 	}
 
 }

+ 2 - 1
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 {
 

+ 3 - 1
app/Http/Filters/BasicAuthFilter.php

@@ -1,4 +1,6 @@
-<?php
+<?php namespace App\Http\Filters;
+
+use Auth;
 
 class BasicAuthFilter {
 

+ 4 - 2
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;
 		}
 	}
 

+ 3 - 1
app/Http/Filters/GuestFilter.php

@@ -1,4 +1,6 @@
-<?php
+<?php namespace App\Http\Filters;
+
+use Auth, Redirect;
 
 class GuestFilter {
 

+ 3 - 1
app/Http/Filters/MaintenanceFilter.php

@@ -1,4 +1,6 @@
-<?php
+<?php namespace App\Http\Filters;
+
+use App, Response;
 
 class MaintenanceFilter {
 

+ 0 - 0
app/routes.php → app/Http/routes.php


+ 1 - 1
app/Providers/AppServiceProvider.php

@@ -1,4 +1,4 @@
-<?php namespace Providers;
+<?php namespace App\Providers;
 
 use Illuminate\Support\ServiceProvider;
 

+ 1 - 1
app/Providers/ArtisanServiceProvider.php

@@ -1,4 +1,4 @@
-<?php namespace Providers;
+<?php namespace App\Providers;
 
 use InspireCommand;
 use Illuminate\Support\ServiceProvider;

+ 1 - 1
app/Providers/ErrorServiceProvider.php

@@ -1,4 +1,4 @@
-<?php namespace Providers;
+<?php namespace App\Providers;
 
 use Illuminate\Support\ServiceProvider;
 

+ 1 - 1
app/Providers/EventServiceProvider.php

@@ -1,4 +1,4 @@
-<?php namespace Providers;
+<?php namespace App\Providers;
 
 use Illuminate\Foundation\Providers\EventServiceProvider as ServiceProvider;
 

+ 6 - 6
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',
 	];
 
 }

+ 1 - 1
app/Providers/LogServiceProvider.php

@@ -1,4 +1,4 @@
-<?php namespace Providers;
+<?php namespace App\Providers;
 
 use Illuminate\Support\ServiceProvider;
 

+ 5 - 2
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';
+			});
 		});
 	}
 

+ 0 - 0
app/Core/User.php → app/User.php


+ 1 - 7
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": {

+ 7 - 7
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...

+ 31 - 0
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',
+
+);