From ce2ae1e1aa5dddaa8768dd0d41cf9740e7ff3cd3 Mon Sep 17 00:00:00 2001 From: Samuel De Backer Date: Sun, 22 Feb 2015 00:25:43 +0100 Subject: [PATCH] database folder --- composer.json | 3 --- src/Providers/ModuleProvider.php | 12 +++++++----- src/{ => database}/migrations/.gitkeep | 0 .../2014_06_15_200602_create_partners_table.php | 0 4 files changed, 7 insertions(+), 8 deletions(-) rename src/{ => database}/migrations/.gitkeep (100%) rename src/{ => database}/migrations/2014_06_15_200602_create_partners_table.php (100%) diff --git a/composer.json b/composer.json index ec2cf95..9d251b5 100644 --- a/composer.json +++ b/composer.json @@ -11,9 +11,6 @@ "typicms/core": "~1.8.0" }, "autoload": { - "classmap": [ - "src/migrations" - ], "psr-4": { "TypiCMS\\Modules\\Partners\\": "src/" } diff --git a/src/Providers/ModuleProvider.php b/src/Providers/ModuleProvider.php index f0a3f2f..cc7614a 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.partners' + ); + $this->loadViewsFrom(__DIR__ . '/../resources/views/', 'partners'); + $this->loadTranslationsFrom(__DIR__ . '/../resources/lang', 'partners'); + $this->publishes([ __DIR__ . '/../views' => base_path('resources/views/vendor/partners'), ], 'views'); - $this->loadTranslationsFrom(__DIR__ . '/../resources/lang', 'partners'); - $this->mergeConfigFrom( - __DIR__ . '/../config/config.php', 'typicms.partners' - ); $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/2014_06_15_200602_create_partners_table.php b/src/database/migrations/2014_06_15_200602_create_partners_table.php similarity index 100% rename from src/migrations/2014_06_15_200602_create_partners_table.php rename to src/database/migrations/2014_06_15_200602_create_partners_table.php