From ee6f47dc47ad6ba8dd438c86c0ca130d6e8efbb4 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Wed, 13 Aug 2014 09:44:20 -0500 Subject: [PATCH] Working on app structure. --- app/{src/Console => console}/InspireCommand.php | 0 app/{src/Core => core}/User.php | 0 .../Controllers => http/controllers}/HomeController.php | 0 app/{src/Http/Filters => http/filters}/AuthFilter.php | 0 .../Http/Filters => http/filters}/BasicAuthFilter.php | 0 app/{src/Http/Filters => http/filters}/CsrfFilter.php | 0 app/{src/Http/Filters => http/filters}/GuestFilter.php | 0 .../Http/Filters => http/filters}/MaintenanceFilter.php | 0 app/{src/Http/Requests => http/requests}/.gitkeep | 0 app/{src/Providers => providers}/AppServiceProvider.php | 0 .../Providers => providers}/ArtisanServiceProvider.php | 0 app/{src/Providers => providers}/ErrorServiceProvider.php | 0 app/{src/Providers => providers}/EventServiceProvider.php | 0 .../Providers => providers}/FilterServiceProvider.php | 0 app/{src/Providers => providers}/LogServiceProvider.php | 0 app/{src/Providers => providers}/RouteServiceProvider.php | 2 +- app/{src/Http => }/routes.php | 0 bootstrap/paths.php | 8 ++++---- composer.json | 5 +++-- 19 files changed, 8 insertions(+), 7 deletions(-) rename app/{src/Console => console}/InspireCommand.php (100%) rename app/{src/Core => core}/User.php (100%) rename app/{src/Http/Controllers => http/controllers}/HomeController.php (100%) rename app/{src/Http/Filters => http/filters}/AuthFilter.php (100%) rename app/{src/Http/Filters => http/filters}/BasicAuthFilter.php (100%) rename app/{src/Http/Filters => http/filters}/CsrfFilter.php (100%) rename app/{src/Http/Filters => http/filters}/GuestFilter.php (100%) rename app/{src/Http/Filters => http/filters}/MaintenanceFilter.php (100%) rename app/{src/Http/Requests => http/requests}/.gitkeep (100%) rename app/{src/Providers => providers}/AppServiceProvider.php (100%) rename app/{src/Providers => providers}/ArtisanServiceProvider.php (100%) rename app/{src/Providers => providers}/ErrorServiceProvider.php (100%) rename app/{src/Providers => providers}/EventServiceProvider.php (100%) rename app/{src/Providers => providers}/FilterServiceProvider.php (100%) rename app/{src/Providers => providers}/LogServiceProvider.php (100%) rename app/{src/Providers => providers}/RouteServiceProvider.php (90%) rename app/{src/Http => }/routes.php (100%) diff --git a/app/src/Console/InspireCommand.php b/app/console/InspireCommand.php similarity index 100% rename from app/src/Console/InspireCommand.php rename to app/console/InspireCommand.php diff --git a/app/src/Core/User.php b/app/core/User.php similarity index 100% rename from app/src/Core/User.php rename to app/core/User.php diff --git a/app/src/Http/Controllers/HomeController.php b/app/http/controllers/HomeController.php similarity index 100% rename from app/src/Http/Controllers/HomeController.php rename to app/http/controllers/HomeController.php diff --git a/app/src/Http/Filters/AuthFilter.php b/app/http/filters/AuthFilter.php similarity index 100% rename from app/src/Http/Filters/AuthFilter.php rename to app/http/filters/AuthFilter.php diff --git a/app/src/Http/Filters/BasicAuthFilter.php b/app/http/filters/BasicAuthFilter.php similarity index 100% rename from app/src/Http/Filters/BasicAuthFilter.php rename to app/http/filters/BasicAuthFilter.php diff --git a/app/src/Http/Filters/CsrfFilter.php b/app/http/filters/CsrfFilter.php similarity index 100% rename from app/src/Http/Filters/CsrfFilter.php rename to app/http/filters/CsrfFilter.php diff --git a/app/src/Http/Filters/GuestFilter.php b/app/http/filters/GuestFilter.php similarity index 100% rename from app/src/Http/Filters/GuestFilter.php rename to app/http/filters/GuestFilter.php diff --git a/app/src/Http/Filters/MaintenanceFilter.php b/app/http/filters/MaintenanceFilter.php similarity index 100% rename from app/src/Http/Filters/MaintenanceFilter.php rename to app/http/filters/MaintenanceFilter.php diff --git a/app/src/Http/Requests/.gitkeep b/app/http/requests/.gitkeep similarity index 100% rename from app/src/Http/Requests/.gitkeep rename to app/http/requests/.gitkeep diff --git a/app/src/Providers/AppServiceProvider.php b/app/providers/AppServiceProvider.php similarity index 100% rename from app/src/Providers/AppServiceProvider.php rename to app/providers/AppServiceProvider.php diff --git a/app/src/Providers/ArtisanServiceProvider.php b/app/providers/ArtisanServiceProvider.php similarity index 100% rename from app/src/Providers/ArtisanServiceProvider.php rename to app/providers/ArtisanServiceProvider.php diff --git a/app/src/Providers/ErrorServiceProvider.php b/app/providers/ErrorServiceProvider.php similarity index 100% rename from app/src/Providers/ErrorServiceProvider.php rename to app/providers/ErrorServiceProvider.php diff --git a/app/src/Providers/EventServiceProvider.php b/app/providers/EventServiceProvider.php similarity index 100% rename from app/src/Providers/EventServiceProvider.php rename to app/providers/EventServiceProvider.php diff --git a/app/src/Providers/FilterServiceProvider.php b/app/providers/FilterServiceProvider.php similarity index 100% rename from app/src/Providers/FilterServiceProvider.php rename to app/providers/FilterServiceProvider.php diff --git a/app/src/Providers/LogServiceProvider.php b/app/providers/LogServiceProvider.php similarity index 100% rename from app/src/Providers/LogServiceProvider.php rename to app/providers/LogServiceProvider.php diff --git a/app/src/Providers/RouteServiceProvider.php b/app/providers/RouteServiceProvider.php similarity index 90% rename from app/src/Providers/RouteServiceProvider.php rename to app/providers/RouteServiceProvider.php index 50a40b3a..35621d20 100644 --- a/app/src/Providers/RouteServiceProvider.php +++ b/app/providers/RouteServiceProvider.php @@ -25,7 +25,7 @@ class RouteServiceProvider extends ServiceProvider { { $this->app->booted(function() { - require app('path.src').'/Http/routes.php'; + require app('path').'/routes.php'; }); } diff --git a/app/src/Http/routes.php b/app/routes.php similarity index 100% rename from app/src/Http/routes.php rename to app/routes.php diff --git a/bootstrap/paths.php b/bootstrap/paths.php index 717ac1b1..277ecf7a 100644 --- a/bootstrap/paths.php +++ b/bootstrap/paths.php @@ -65,13 +65,13 @@ return array( | */ - 'commands' => __DIR__.'/../app/src/Console', + 'commands' => __DIR__.'/../app/console', 'config' => __DIR__.'/../app/config', - 'controllers' => __DIR__.'/../app/src/Http/Controllers', + 'controllers' => __DIR__.'/../app/http/controllers', 'database' => __DIR__.'/../app/database', - 'filters' => __DIR__.'/../app/src/Http/Filters', + 'filters' => __DIR__.'/../app/http/filters', 'lang' => __DIR__.'/../app/lang', - 'requests' => __DIR__.'/../app/src/Http/Requests', + 'requests' => __DIR__.'/../app/http/requests', 'src' => __DIR__.'/../app/src', ); diff --git a/composer.json b/composer.json index db5c7cf4..9e9a6129 100644 --- a/composer.json +++ b/composer.json @@ -9,11 +9,12 @@ "autoload": { "classmap": [ "app/database", - "app/src", + "app/http", "app/tests/TestCase.php" ], "psr-4": { - "App\\": "app/src/Core/" + "App\\": "app/src/core/", + "Providers\\": "app/providers/" } }, "scripts": {