REFACTORING #1880 @4h30m: another ugly refactoring commit

app/Providers/AppServiceProvider.php

@@ -32,18 +32,16 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        // ignore running from artisan
-        if (App::runningInConsole()) {
-            return;
-        }
-
-        $this->registerWidgets();
-        $this->registerSettings();
-        $this->registerSearch();
-
         $this->app->bind(IContent::class, ContentRepository::class);
         $this->app->bind(IModule::class, ModuleRepository::class);
         $this->app->bind(ITemplate::class, TemplateRepository::class);
+
+        // ignore running from artisan
+        if (!App::runningInConsole()) {
+            $this->registerWidgets();
+            $this->registerSettings();
+            $this->registerSearch();
+        }
     }
 
     /**

app/Providers/LaravelLocalizationServiceProvider.php

@@ -1,7 +1,5 @@
 <?php namespace App\Providers;
 
-use App\Models\Language;
-use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\ServiceProvider;
 use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
@@ -16,14 +14,14 @@ class LaravelLocalizationServiceProvider extends ServiceProvider
         $supportedLocales = [];
         if (empty($languages)) {
             $supportedLocales[config('app.locale')] = [
-                'native' => env('LOCALE_NATIVE_NAME'),
-                'script' => env('LOCALE_SCRIPT'),
-                'name'   => env('LOCALE_TRANSLATED_NAME'),
+                'native' => env('LOCALE_NATIVE_NAME', config('app.locale')),
+                'script' => env('LOCALE_SCRIPT', 'Latn'),
+                'name'   => env('LOCALE_TRANSLATED_NAME', config('app.locale')),
                 'code'   => config('app.locale'),
             ];
-
             // create default language
-            Language::create($supportedLocales[config('app.locale')]);
+            DB::table('languages')
+              ->insert($supportedLocales[config('app.locale')]);
         }
 
         foreach ($languages as $language) {

app/Providers/ModuleManager.php

@@ -26,12 +26,12 @@ class ModuleManager extends ServiceProvider
         // iterate over all modules and enable or disable them
         foreach ($modules as $module) {
 
-            $module->module_settings = json_decode($module->module_settings);
+            $module->moduleSettings = json_decode($module->moduleSettings);
 
             if ($module->is_template) {
 
-                if (isset($module->module_settings->providers) && !empty($module->module_settings->providers)) {
-                    foreach ($module->module_settings->providers as $provider) {
+                if (isset($module->moduleSettings->providers) && !empty($module->moduleSettings->providers)) {
+                    foreach ($module->moduleSettings->providers as $provider) {
                         $this->app->register($provider);
                     }
                 }
@@ -61,7 +61,7 @@ class ModuleManager extends ServiceProvider
      */
     private function createModulesJson(Module $module)
     {
-        $config = $module->module_settings;
+        $config = $module->moduleSettings;
 
         if (is_null($config)) {
             return;

app/Providers/TemplateServiceProvider.php

@@ -2,9 +2,9 @@
 
 namespace App\Providers;
 
+use App\CMS\Contracts\Repositories\Template as TemplateContract;
 use App\CMS\Handlers\Registrators\TemplateRegistrator;
 use App\CMS\Helpers\CurrentTemplate;
-use App\Models\Templates\Template;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\ServiceProvider;
 
@@ -13,7 +13,7 @@ class TemplateServiceProvider extends ServiceProvider
     public function boot()
     {
         // ignore running from artisan
-        if (App::runningInConsole()) {
+        if (App::runningInConsole() || App::environment('testing')) {
             $this->publishViewResources();
 
             return;
@@ -26,19 +26,24 @@ class TemplateServiceProvider extends ServiceProvider
         }
 
         // include files
-        $files = isset($template->module_settings->files) ? $template->module_settings->files : [];
+        $files = isset($template->moduleSettings->files) ? $template->moduleSettings->files : [];
 
         foreach ($files as $file) {
             include_once $file;
         }
 
         // register templates
-        $publicTemplates = call_user_func([CurrentTemplate::handler(), 'getPublicTemplatePaths']);
+        $publicTemplates = CurrentTemplate::getPublicTemplatePaths();
 
         if (!is_array($publicTemplates)) {
             throw new \ErrorException(CurrentTemplate::handler() . '::getPublicTemplatePaths() must return array!');
         }
 
+        $this->registerTemplatePaths($publicTemplates);
+    }
+
+    public function registerTemplatePaths($publicTemplates)
+    {
         /**
          * @var $registrator TemplateRegistrator
          */
@@ -76,12 +81,12 @@ class TemplateServiceProvider extends ServiceProvider
     private function publishViewResources()
     {
         $template = CurrentTemplate::get();
-        if (!$template) {
+        if (!$template || is_null($template->moduleSettings)) {
             return;
         }
 
-        $templateDir = base_path('templates/' . $template->module_settings->staticName . '/Resources');
-        $assetsDir = $templateDir . '/' . Template::ASSETS_DIRECTORY;
+        $templateDir = base_path('templates/' . $template->moduleSettings->staticName . '/Resources');
+        $assetsDir = $templateDir . '/' . TemplateContract::ASSETS_DIRECTORY;
         $viewsDir = $templateDir . '/views';
 
         // publish assets if exists for current theme