From 177da65d2b5ad08016698cef44a5777a7584f80e Mon Sep 17 00:00:00 2001
From: Samuel De Backer <sdebacker@gmail.com>
Date: Sun, 22 Feb 2015 00:25:37 +0100
Subject: [PATCH] database folder

---
 composer.json                                        |  3 ---
 src/Providers/ModuleProvider.php                     | 12 +++++++-----
 src/{ => database}/migrations/.gitkeep               |  0
 .../2013_11_07_185433_create_news_table.php          |  0
 4 files changed, 7 insertions(+), 8 deletions(-)
 rename src/{ => database}/migrations/.gitkeep (100%)
 rename src/{ => database}/migrations/2013_11_07_185433_create_news_table.php (100%)

diff --git a/composer.json b/composer.json
index 67a473e..1e2a504 100644
--- a/composer.json
+++ b/composer.json
@@ -11,9 +11,6 @@
         "typicms/core": "~1.8.0"
     },
     "autoload": {
-        "classmap": [
-            "src/migrations"
-        ],
         "psr-4": {
             "TypiCMS\\Modules\\News\\": "src/"
         }
diff --git a/src/Providers/ModuleProvider.php b/src/Providers/ModuleProvider.php
index d9b49c9..69923d6 100644
--- a/src/Providers/ModuleProvider.php
+++ b/src/Providers/ModuleProvider.php
@@ -21,16 +21,18 @@ class ModuleProvider extends ServiceProvider
     public function boot()
     {
 
+        $this->mergeConfigFrom(
+            __DIR__ . '/../config/config.php', 'typicms.news'
+        );
+
         $this->loadViewsFrom(__DIR__ . '/../resources/views/', 'news');
+        $this->loadTranslationsFrom(__DIR__ . '/../resources/lang', 'news');
+
         $this->publishes([
             __DIR__ . '/../views' => base_path('resources/views/vendor/news'),
         ], 'views');
-        $this->loadTranslationsFrom(__DIR__ . '/../resources/lang', 'news');
-        $this->mergeConfigFrom(
-            __DIR__ . '/../config/config.php', 'typicms.news'
-        );
         $this->publishes([
-            __DIR__ . '/../migrations/' => base_path('/database/migrations'),
+            __DIR__ . '/../database' => base_path('database'),
         ], 'migrations');
 
         AliasLoader::getInstance()->alias(
diff --git a/src/migrations/.gitkeep b/src/database/migrations/.gitkeep
similarity index 100%
rename from src/migrations/.gitkeep
rename to src/database/migrations/.gitkeep
diff --git a/src/migrations/2013_11_07_185433_create_news_table.php b/src/database/migrations/2013_11_07_185433_create_news_table.php
similarity index 100%
rename from src/migrations/2013_11_07_185433_create_news_table.php
rename to src/database/migrations/2013_11_07_185433_create_news_table.php