REFACTORING #1880 @4h30m: another ugly refactoring commit

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