database folder

TypiCMS · Feb 21, 2015 · ac70fa0 · ac70fa0
1 parent b427ed4
commit ac70fa0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -11,9 +11,6 @@
         "typicms/core": "~1.8.0"
     },
     "autoload": {
-        "classmap": [
-            "src/migrations"
-        ],
         "psr-4": {
             "TypiCMS\\Modules\\Places\\": "src/"
         }

diff --git 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.places'
+        );
+
         $this->loadViewsFrom(__DIR__ . '/../resources/views/', 'places');
+        $this->loadTranslationsFrom(__DIR__ . '/../resources/lang', 'places');
+
         $this->publishes([
             __DIR__ . '/../views' => base_path('resources/views/vendor/places'),
         ], 'views');
-        $this->loadTranslationsFrom(__DIR__ . '/../resources/lang', 'places');
-        $this->mergeConfigFrom(
-            __DIR__ . '/../config/config.php', 'typicms.places'
-        );
         $this->publishes([
-            __DIR__ . '/../migrations/' => base_path('/database/migrations'),
+            __DIR__ . '/../database' => base_path('database'),
         ], 'migrations');
 
         AliasLoader::getInstance()->alias(

diff --git a/src/migrations/.gitkeep → src/database/migrations/.gitkeep b/src/migrations/.gitkeep → src/database/migrations/.gitkeep
diff --git a/...2014_01_13_094853_create_places_table.php → ...2014_01_13_094853_create_places_table.php b/...2014_01_13_094853_create_places_table.php → ...2014_01_13_094853_create_places_table.php