From 0e0fd73b435d22aebb2efd2c42bf9df23d197b99 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Thu, 31 Jul 2014 15:13:50 -0500
Subject: [PATCH] Working on overall app structure.

---
 app/{console => commands}/.gitkeep           |  0
 app/commands/InspireCommand.php              | 43 +++++++++++
 app/config/app.php                           |  5 ++
 app/{ => routing}/filters.php                |  5 +-
 app/{ => routing}/routes.php                 | 13 ++++
 app/src/Providers/AppServiceProvider.php     | 27 +++++++
 app/src/Providers/ArtisanServiceProvider.php | 45 +++++++++++
 app/src/Providers/ErrorServiceProvider.php   | 46 +++++++++++
 app/src/Providers/LogServiceProvider.php     | 41 ++++++++++
 app/{models => src}/User.php                 |  0
 app/start/artisan.php                        | 13 ----
 app/start/global.php                         | 81 --------------------
 app/start/local.php                          |  3 -
 bootstrap/autoload.php                       | 13 ----
 composer.json                                |  4 +-
 15 files changed, 226 insertions(+), 113 deletions(-)
 rename app/{console => commands}/.gitkeep (100%)
 create mode 100644 app/commands/InspireCommand.php
 rename app/{ => routing}/filters.php (96%)
 rename app/{ => routing}/routes.php (51%)
 create mode 100644 app/src/Providers/AppServiceProvider.php
 create mode 100644 app/src/Providers/ArtisanServiceProvider.php
 create mode 100644 app/src/Providers/ErrorServiceProvider.php
 create mode 100644 app/src/Providers/LogServiceProvider.php
 rename app/{models => src}/User.php (100%)
 delete mode 100644 app/start/artisan.php
 delete mode 100644 app/start/global.php
 delete mode 100644 app/start/local.php

diff --git a/app/console/.gitkeep b/app/commands/.gitkeep
similarity index 100%
rename from app/console/.gitkeep
rename to app/commands/.gitkeep
diff --git a/app/commands/InspireCommand.php b/app/commands/InspireCommand.php
new file mode 100644
index 000000000..4cbd600a4
--- /dev/null
+++ b/app/commands/InspireCommand.php
@@ -0,0 +1,43 @@
+<?php
+
+use Illuminate\Console\Command;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\InputArgument;
+
+class InspireCommand extends Command {
+
+	/**
+	 * The console command name.
+	 *
+	 * @var string
+	 */
+	protected $name = 'inspire';
+
+	/**
+	 * The console command description.
+	 *
+	 * @var string
+	 */
+	protected $description = 'Display an inpiring quote..';
+
+	/**
+	 * Create a new command instance.
+	 *
+	 * @return void
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
+	/**
+	 * Execute the console command.
+	 *
+	 * @return mixed
+	 */
+	public function fire()
+	{
+		$this->comment('Inspiring Quote Here.');
+	}
+
+}
diff --git a/app/config/app.php b/app/config/app.php
index 27665c606..4e5189019 100644
--- a/app/config/app.php
+++ b/app/config/app.php
@@ -95,6 +95,11 @@ return array(
 
 	'providers' => array(
 
+		'AppServiceProvider',
+		'ArtisanServiceProvider',
+		'ErrorServiceProvider',
+		'LogServiceProvider',
+
 		'Illuminate\Foundation\Providers\ArtisanServiceProvider',
 		'Illuminate\Auth\AuthServiceProvider',
 		'Illuminate\Cache\CacheServiceProvider',
diff --git a/app/filters.php b/app/routing/filters.php
similarity index 96%
rename from app/filters.php
rename to app/routing/filters.php
index fd0b4bcb6..908b99edf 100644
--- a/app/filters.php
+++ b/app/routing/filters.php
@@ -13,7 +13,10 @@
 
 App::before(function($request)
 {
-	//
+	if (App::isDownForMaintenance())
+	{
+		return Response::make('Be right back!');
+	}
 });
 
 
diff --git a/app/routes.php b/app/routing/routes.php
similarity index 51%
rename from app/routes.php
rename to app/routing/routes.php
index 3e10dcf56..e25912273 100644
--- a/app/routes.php
+++ b/app/routing/routes.php
@@ -1,5 +1,18 @@
 <?php
 
+/*
+|--------------------------------------------------------------------------
+| Require The Filters File
+|--------------------------------------------------------------------------
+|
+| Next we will load the filters file for the application. This gives us
+| a nice separate location to store our route and application filter
+| definitions instead of putting them all in the main routes file.
+|
+*/
+
+require __DIR__.'/filters.php';
+
 /*
 |--------------------------------------------------------------------------
 | Application Routes
diff --git a/app/src/Providers/AppServiceProvider.php b/app/src/Providers/AppServiceProvider.php
new file mode 100644
index 000000000..608c50ad9
--- /dev/null
+++ b/app/src/Providers/AppServiceProvider.php
@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Support\ServiceProvider;
+
+class AppServiceProvider extends ServiceProvider {
+
+	/**
+	 * Bootstrap the application events.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		//
+	}
+
+	/**
+	 * Register the service provider.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		//
+	}
+
+}
\ No newline at end of file
diff --git a/app/src/Providers/ArtisanServiceProvider.php b/app/src/Providers/ArtisanServiceProvider.php
new file mode 100644
index 000000000..6fba4c5a7
--- /dev/null
+++ b/app/src/Providers/ArtisanServiceProvider.php
@@ -0,0 +1,45 @@
+<?php
+
+use Illuminate\Support\ServiceProvider;
+
+class ArtisanServiceProvider extends ServiceProvider {
+
+	/**
+	 * Bootstrap the application events.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		//
+	}
+
+	/**
+	 * Register the service provider.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		$this->registerInspireCommand();
+
+		$this->commands('commands.inspire');
+	}
+
+	/**
+	 * Register the Inspire Artisan command.
+	 *
+	 * @return void
+	 */
+	protected function registerInspireCommand()
+	{
+		// Each available Artisan command must be registered with the console so
+		// that it is available to be called. We'll register every command so
+		// the console gets access to each of the command object instances.
+		$this->app->bindShared('commands.inspire', function()
+		{
+			return new InspireCommand;
+		});
+	}
+
+}
\ No newline at end of file
diff --git a/app/src/Providers/ErrorServiceProvider.php b/app/src/Providers/ErrorServiceProvider.php
new file mode 100644
index 000000000..af5464e4b
--- /dev/null
+++ b/app/src/Providers/ErrorServiceProvider.php
@@ -0,0 +1,46 @@
+<?php
+
+use Illuminate\Support\ServiceProvider;
+
+class ErrorServiceProvider extends ServiceProvider {
+
+	/**
+	 * Bootstrap the application events.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		$this->setupErrorHandlers();
+	}
+
+	/**
+	 * Register the service provider.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		//
+	}
+
+	/**
+	 * Setup the error handlers for the application.
+	 *
+	 * @return void
+	 */
+	protected function setupErrorHandlers()
+	{
+		// Here you may handle any errors that occur in your application, including
+		// logging them or displaying custom views for specific errors. You may
+		// even register several error handlers to handle different types of
+		// exceptions. If nothing is returned, the default error view is
+		// shown, which includes a detailed stack trace during debug.
+
+		$this->app->error(function(Exception $exception, $code)
+		{
+			Log::error($exception);
+		});
+	}
+
+}
\ No newline at end of file
diff --git a/app/src/Providers/LogServiceProvider.php b/app/src/Providers/LogServiceProvider.php
new file mode 100644
index 000000000..3a0666a34
--- /dev/null
+++ b/app/src/Providers/LogServiceProvider.php
@@ -0,0 +1,41 @@
+<?php
+
+use Illuminate\Support\ServiceProvider;
+
+class LogServiceProvider extends ServiceProvider {
+
+	/**
+	 * Bootstrap the application events.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		$this->setupLogging();
+	}
+
+	/**
+	 * Register the service provider.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		//
+	}
+
+	/**
+	 * Setup the logging facilities for the application.
+	 *
+	 * @return void
+	 */
+	protected function setupLogging()
+	{
+		// Here we will configure the error logger setup for the application which
+		// is built on top of the wonderful Monolog library. By default we will
+		// build a basic log file setup which creates a single file for logs.
+
+		Log::useFiles(storage_path().'/logs/laravel.log');
+	}
+
+}
\ No newline at end of file
diff --git a/app/models/User.php b/app/src/User.php
similarity index 100%
rename from app/models/User.php
rename to app/src/User.php
diff --git a/app/start/artisan.php b/app/start/artisan.php
deleted file mode 100644
index 1df850bc9..000000000
--- a/app/start/artisan.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-/*
-|--------------------------------------------------------------------------
-| Register The Artisan Commands
-|--------------------------------------------------------------------------
-|
-| Each available Artisan command must be registered with the console so
-| that it is available to be called. We'll register every command so
-| the console gets access to each of the command object instances.
-|
-*/
-
diff --git a/app/start/global.php b/app/start/global.php
deleted file mode 100644
index c12f33e5f..000000000
--- a/app/start/global.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/*
-|--------------------------------------------------------------------------
-| Register The Laravel Class Loader
-|--------------------------------------------------------------------------
-|
-| In addition to using Composer, you may use the Laravel class loader to
-| load your controllers and models. This is useful for keeping all of
-| your classes in the "global" namespace without Composer updating.
-|
-*/
-
-ClassLoader::addDirectories(array(
-
-	app_path().'/console',
-	app_path().'/controllers',
-	app_path().'/models',
-	app_path().'/database/seeds',
-
-));
-
-/*
-|--------------------------------------------------------------------------
-| Application Error Logger
-|--------------------------------------------------------------------------
-|
-| Here we will configure the error logger setup for the application which
-| is built on top of the wonderful Monolog library. By default we will
-| build a basic log file setup which creates a single file for logs.
-|
-*/
-
-Log::useFiles(storage_path().'/logs/laravel.log');
-
-/*
-|--------------------------------------------------------------------------
-| Application Error Handler
-|--------------------------------------------------------------------------
-|
-| Here you may handle any errors that occur in your application, including
-| logging them or displaying custom views for specific errors. You may
-| even register several error handlers to handle different types of
-| 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)
-{
-	Log::error($exception);
-});
-
-/*
-|--------------------------------------------------------------------------
-| Maintenance Mode Handler
-|--------------------------------------------------------------------------
-|
-| The "down" Artisan command gives you the ability to put an application
-| into maintenance mode. Here, you will define what is displayed back
-| to the user if maintenance mode is in effect for the application.
-|
-*/
-
-App::down(function()
-{
-	return Response::make("Be right back!", 503);
-});
-
-/*
-|--------------------------------------------------------------------------
-| Require The Filters File
-|--------------------------------------------------------------------------
-|
-| Next we will load the filters file for the application. This gives us
-| a nice separate location to store our route and application filter
-| definitions instead of putting them all in the main routes file.
-|
-*/
-
-require app_path().'/filters.php';
diff --git a/app/start/local.php b/app/start/local.php
deleted file mode 100644
index 3d1485091..000000000
--- a/app/start/local.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-//
\ No newline at end of file
diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php
index 6b329312a..626612a27 100644
--- a/bootstrap/autoload.php
+++ b/bootstrap/autoload.php
@@ -32,19 +32,6 @@ if (file_exists($compiled = __DIR__.'/compiled.php'))
 	require $compiled;
 }
 
-/*
-|--------------------------------------------------------------------------
-| Setup Patchwork UTF-8 Handling
-|--------------------------------------------------------------------------
-|
-| The Patchwork library provides solid handling of UTF-8 strings as well
-| as provides replacements for all mb_* and iconv type functions that
-| are not available by default in PHP. We'll setup this stuff here.
-|
-*/
-
-Patchwork\Utf8\Bootup::initMbstring();
-
 /*
 |--------------------------------------------------------------------------
 | Register The Laravel Auto Loader
diff --git a/composer.json b/composer.json
index 72e77469e..b5d07e72c 100644
--- a/composer.json
+++ b/composer.json
@@ -8,11 +8,11 @@
 	},
 	"autoload": {
 		"classmap": [
-			"app/console",
+			"app/commands",
 			"app/controllers",
-			"app/models",
 			"app/database/migrations",
 			"app/database/seeds",
+			"app/src",
 			"app/tests/TestCase.php"
 		]
 	},