FIX: lots of bugfixes, sorry for ugly commit

app/Models/Content/ModelTraits/ContentHistory.php

@@ -1,10 +1,9 @@
 <?php
 namespace App\Models\Content\ModelTraits;
 
-use App\CMS\Handlers\Contracts\AppHandler;
 use App\CMS\Handlers\Contracts\HistoryHandler;
 use App\CMS\Helpers\Differ;
-use App\Models\Content\Content;
+use App\Models\Content\Content as ContentModel;
 
 trait ContentHistory
 {
@@ -15,7 +14,7 @@ trait ContentHistory
      *
      * @return array
      */
-    public function getStructuredHistoryOf(Content $content)
+    public function getStructuredHistoryOf(ContentModel $content)
     {
         $data = $content->history()
                         ->select('content_history.*', 'contents.moduleHandler', 'users.email AS user_email', 'users.name AS user_name')

app/Models/ModelTraits/Module.php

@@ -1,11 +1,14 @@
 <?php
 namespace App\Models\ModelTraits;
 
-use App\CMS\Handlers\Contracts\TemplateHandler;
+use App\CMS\Contracts\Modules\AppHandler;
+use App\CMS\Contracts\Modules\TemplateHandler;
+use App\Models\Module as ModuleModel;
 use App\Models\Templates\TemplatePath;
 use Illuminate\Support\Facades\App;
 
-trait Module {
+trait Module
+{
     /**
      * Create new module in database
      *
@@ -26,32 +29,32 @@ trait Module {
             throw new \ErrorException('Modules can be installed only via Artisan!');
         }
 
-        $managesContent = $handler ? in_array('App\CMS\Handlers\Contracts\AppHandler', class_implements($handler)) : false;
+        $managesContent = $handler ? in_array(AppHandler::class, class_implements($handler)) : false;
         $isTemplate = $handler ? in_array(TemplateHandler::class, class_implements($handler)) : false;
         $supportCategories = $managesContent ? call_user_func([$handler, 'supportCategories']) : false;
 
         if ($parentModuleId) {
-            $parentModule = Module::findOrFail($parentModuleId);
+            $parentModule = ModuleModel::findOrFail($parentModuleId);
             $parentModule->has_submodules = true;
             $parentModule->save();
         }
 
         // insert module into database
-        $module = Module::create([
-                                     'name'               => $name,
-                                     'description'        => $description,
-                                     'handler'            => $handler,
-                                     'manages_content'    => $managesContent,
-                                     'support_categories' => $supportCategories,
-                                     'alias'              => $alias,
-                                     'moduleSettings'    => json_encode($settings),
-                                     'parent_id'          => $parentModuleId ? $parentModuleId : null,
-                                     'enabled'            => 1,
-                                     'is_template'        => $isTemplate
-                                 ]);
+        $module = ModuleModel::create([
+                                          'name'               => $name,
+                                          'description'        => $description,
+                                          'handler'            => $handler,
+                                          'manages_content'    => $managesContent,
+                                          'support_categories' => $supportCategories,
+                                          'alias'              => $alias,
+                                          'module_settings'     => json_encode($settings),
+                                          'parent_id'          => $parentModuleId ? $parentModuleId : null,
+                                          'enabled'            => 1,
+                                          'is_template'        => $isTemplate
+                                      ]);
 
         // install something module-specific
-        if ($handler) {
+        if ($handler && is_callable([$handler, 'install'])) {
             call_user_func([$handler, 'install']);
         }
 
@@ -77,7 +80,8 @@ trait Module {
             $this->deleteDirectory(public_path('assets'));
 
             // delete all template paths
-            TemplatePath::getQuery()->delete();
+            TemplatePath::getQuery()
+                        ->delete();
         }
 
         if ($this->handler && is_callable([$this->handler, 'uninstall'])) {
@@ -96,8 +100,9 @@ trait Module {
      */
     private function deleteDirectory($directory)
     {
-        if (!is_dir($directory))
+        if (!is_dir($directory)) {
             return;
+        }
 
         $success = \File::deleteDirectory($directory, true);
 

app/Models/Module.php

@@ -17,7 +17,7 @@ class Module extends Model
         'name',
         'description',
         'alias',
-        'moduleSettings',
+        'module_settings',
         'enabled',
         'support_categories',
         'manages_content',

app/Models/Templates/Template.php

@@ -21,7 +21,8 @@ class Template extends Model
      *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
-    public function path() {
+    public function templatePath()
+    {
         return $this->belongsTo(TemplatePath::class, 'path');
     }
 }