diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index 6a780c46..00000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,3 +0,0 @@ -# Contribution Guidelines - -Please submit all issues and pull requests to the [laravel/framework](http://github.com/laravel/framework) repository! diff --git a/app/views/emails/auth/reminder.blade.php b/app/Http/Views/emails/auth/reminder.blade.php similarity index 100% rename from app/views/emails/auth/reminder.blade.php rename to app/Http/Views/emails/auth/reminder.blade.php diff --git a/app/views/hello.php b/app/Http/Views/hello.php similarity index 100% rename from app/views/hello.php rename to app/Http/Views/hello.php diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php index 44c7dfa9..2ae4fc34 100644 --- a/bootstrap/autoload.php +++ b/bootstrap/autoload.php @@ -27,9 +27,11 @@ require __DIR__.'/../vendor/autoload.php'; | */ -if (file_exists($compiled = __DIR__.'/compiled.php')) +$compiledPath = __DIR__.'/../storage/meta/compiled.php'; + +if (file_exists($compiledPath)) { - require $compiled; + require $compiledPath; } /* diff --git a/bootstrap/paths.php b/bootstrap/paths.php index df010479..c0f427e8 100644 --- a/bootstrap/paths.php +++ b/bootstrap/paths.php @@ -65,12 +65,12 @@ return array( | */ - 'commands' => __DIR__.'/../app/console', - 'config' => __DIR__.'/../app/config', - 'controllers' => __DIR__.'/../app/http/controllers', - 'database' => __DIR__.'/../app/database', - 'filters' => __DIR__.'/../app/http/filters', - 'lang' => __DIR__.'/../app/lang', - 'requests' => __DIR__.'/../app/http/requests', + 'commands' => __DIR__.'/../app/Console', + 'config' => __DIR__.'/../config', + 'controllers' => __DIR__.'/../app/Http/Controllers', + 'database' => __DIR__.'/../database', + 'filters' => __DIR__.'/../app/Http/Filters', + 'lang' => __DIR__.'/../lang', + 'requests' => __DIR__.'/../app/Http/Requests', ); diff --git a/composer.json b/composer.json index cdd53d7b..f4493dea 100644 --- a/composer.json +++ b/composer.json @@ -4,18 +4,22 @@ "keywords": ["framework", "laravel"], "license": "MIT", "require": { - "laravel/framework": "4.3.*" + "laravel/framework": "4.3.*", + "phpunit/phpunit": "~4.0" }, "autoload": { "classmap": [ - "app/console", - "app/database", - "app/http", - "app/tests/TestCase.php" + "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/Core/", + "Providers\\": "app/Providers/" } }, "scripts": { diff --git a/app/config/app.php b/config/app.php similarity index 100% rename from app/config/app.php rename to config/app.php diff --git a/app/config/auth.php b/config/auth.php similarity index 100% rename from app/config/auth.php rename to config/auth.php diff --git a/app/config/cache.php b/config/cache.php similarity index 100% rename from app/config/cache.php rename to config/cache.php diff --git a/app/config/compile.php b/config/compile.php similarity index 71% rename from app/config/compile.php rename to config/compile.php index 7f6d7b5f..f21c236d 100644 --- a/app/config/compile.php +++ b/config/compile.php @@ -14,7 +14,15 @@ return array( */ 'files' => array( - // + + __DIR__.'/../providers/AppServiceProvider.php', + __DIR__.'/../providers/ArtisanServiceProvider.php', + __DIR__.'/../providers/ErrorServiceProvider.php', + __DIR__.'/../providers/EventServiceProvider.php', + __DIR__.'/../providers/FilterServiceProvider.php', + __DIR__.'/../providers/LogServiceProvider.php', + __DIR__.'/../providers/RouteServiceProvider.php', + ), /* diff --git a/app/config/database.php b/config/database.php similarity index 100% rename from app/config/database.php rename to config/database.php diff --git a/app/config/local/app.php b/config/local/app.php similarity index 100% rename from app/config/local/app.php rename to config/local/app.php diff --git a/app/config/local/database.php b/config/local/database.php similarity index 100% rename from app/config/local/database.php rename to config/local/database.php diff --git a/app/config/mail.php b/config/mail.php similarity index 100% rename from app/config/mail.php rename to config/mail.php diff --git a/app/config/packages/.gitkeep b/config/packages/.gitkeep similarity index 100% rename from app/config/packages/.gitkeep rename to config/packages/.gitkeep diff --git a/app/config/queue.php b/config/queue.php similarity index 100% rename from app/config/queue.php rename to config/queue.php diff --git a/app/config/remote.php b/config/remote.php similarity index 100% rename from app/config/remote.php rename to config/remote.php diff --git a/app/config/services.php b/config/services.php similarity index 100% rename from app/config/services.php rename to config/services.php diff --git a/app/config/session.php b/config/session.php similarity index 100% rename from app/config/session.php rename to config/session.php diff --git a/app/config/testing/cache.php b/config/testing/cache.php similarity index 100% rename from app/config/testing/cache.php rename to config/testing/cache.php diff --git a/app/config/testing/session.php b/config/testing/session.php similarity index 100% rename from app/config/testing/session.php rename to config/testing/session.php diff --git a/app/config/view.php b/config/view.php similarity index 95% rename from app/config/view.php rename to config/view.php index 34b8f387..421b84ae 100644 --- a/app/config/view.php +++ b/config/view.php @@ -13,7 +13,7 @@ return array( | */ - 'paths' => array(__DIR__.'/../views'), + 'paths' => array(app_path().'/Http/Views'), /* |-------------------------------------------------------------------------- diff --git a/app/config/workbench.php b/config/workbench.php similarity index 100% rename from app/config/workbench.php rename to config/workbench.php diff --git a/app/database/.gitignore b/database/.gitignore similarity index 100% rename from app/database/.gitignore rename to database/.gitignore diff --git a/app/database/migrations/.gitkeep b/database/migrations/.gitkeep similarity index 100% rename from app/database/migrations/.gitkeep rename to database/migrations/.gitkeep diff --git a/app/database/seeds/.gitkeep b/database/seeds/.gitkeep similarity index 100% rename from app/database/seeds/.gitkeep rename to database/seeds/.gitkeep diff --git a/app/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php similarity index 100% rename from app/database/seeds/DatabaseSeeder.php rename to database/seeds/DatabaseSeeder.php diff --git a/app/lang/en/pagination.php b/lang/en/pagination.php similarity index 100% rename from app/lang/en/pagination.php rename to lang/en/pagination.php diff --git a/app/lang/en/reminders.php b/lang/en/reminders.php similarity index 100% rename from app/lang/en/reminders.php rename to lang/en/reminders.php diff --git a/app/lang/en/validation.php b/lang/en/validation.php similarity index 100% rename from app/lang/en/validation.php rename to lang/en/validation.php diff --git a/public/index.php b/public/index.php index 6da55083..f08822d9 100644 --- a/public/index.php +++ b/public/index.php @@ -45,4 +45,5 @@ $app = require_once __DIR__.'/../bootstrap/start.php'; | and wonderful application we have whipped up for them. | */ + $app->run(); diff --git a/app/tests/ExampleTest.php b/tests/ExampleTest.php similarity index 100% rename from app/tests/ExampleTest.php rename to tests/ExampleTest.php diff --git a/app/tests/TestCase.php b/tests/TestCase.php similarity index 100% rename from app/tests/TestCase.php rename to tests/TestCase.php