REFACTORING: another ugly commit full of refactored code

app/CMS/Contracts/Content/ContentTitles.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\CMS\Handlers\Contracts;
+namespace App\CMS\Contracts\Content;
 
 use App\Models\Content\Content;
 

app/CMS/Contracts/Repositories/Module.php

@@ -1,11 +1,18 @@
 <?php
 namespace App\CMS\Contracts\Repositories;
 
+use App\Models\Content\Content as ContentModel;
+use App\Models\Module as ModuleModel;
+
 interface Module extends BaseRepository {
 
-    public function getCreateContentTitle(\App\Models\Module $module);
+    public function getCreateContentTitle(ModuleModel $module);
 
-    public function getUpdateContentTitle(\App\Models\Module $module);
+    public function getUpdateContentTitle(ModuleModel $module, ContentModel $content = null);
 
-    public function getOverviewTitle(\App\Models\Module $module);
+    public function getOverviewTitle(ModuleModel $module);
+
+    public function getByHandler($handler);
+
+    public function call(ModuleModel $module, $method, ...$parameters);
 }

app/CMS/Interactions/Admin/Content/EditContent.php

@@ -2,15 +2,26 @@
 namespace App\Cms\Interactions\Admin\Content;
 
 use App\CMS\Contracts\Interaction;
+use App\CMS\Contracts\Repositories\Module;
 use App\CMS\Enumerations\ContentStatuses;
 use App\CMS\Helpers\CurrentTemplate;
 use App\Events\EditContent as EditContentEvent;
 use App\Http\Requests\Request;
+use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Str;
 
 class EditContent implements Interaction
 {
+    /**
+     * @var Module
+     */
+    protected $module;
+    public function __construct()
+    {
+        $this->module = App::make(Module::class);
+    }
+
     public function handle(Request $request, $parameters)
     {
         $page = $parameters[0];
@@ -57,7 +68,10 @@ class EditContent implements Interaction
 
         list($revision, $changedColumns) = $page->updateWithHistory($fields, $data);
 
-        $changedColumns += call_user_func_array([$page->module_handler, 'edit'], [&$page, $request, $revision]);
+        $module = $this->module->getByHandler($page->module_handler);
+
+
+        $changedColumns += $this->module->call($module, 'edit', [&$page, $request, $revision]);
 
 
         // move to interaction

app/CMS/Repositories/Content/Content.php

@@ -39,6 +39,7 @@ class Content extends Repository implements IContent
                                      ->orWhereNull('published_to');
                            })
                            ->where('language', LaravelLocalization::getCurrentLocale())
+                           ->whereNull('contents.deleted_at')
                            ->where('modules.enabled', true);
     }
 

app/CMS/Repositories/Module.php

@@ -2,64 +2,72 @@
 namespace App\CMS\Repositories;
 
 use App\CMS\Contracts\Repositories\Module as IModule;
+use App\Models\Content\Content;
 use App\Models\Module as ModuleModel;
 
 class Module extends Repository implements IModule
 {
-    /**
-     * @var ModuleModel
-     */
-    private $module;
-
     public function __construct(ModuleModel $module)
     {
-        $this->module = $module;
+        $this->model = $module;
     }
 
     public function getOne($id = null)
     {
-        if (!is_null($id)) {
-
-            if (is_numeric($id)) {
-                return ModuleModel::findOrFail($id);
-            } else {
-                return ModuleModel::where('alias', $id)
-                                  ->firstOrFail();
-            }
-        } else {
+        if (is_null($id)) {
             return new ModuleModel();
         }
+
+        if (is_numeric($id)) {
+            return ModuleModel::findOrFail($id);
+        } else {
+            return ModuleModel::where('alias', $id)
+                              ->firstOrFail();
+        }
     }
 
     public function getCreateContentTitle(ModuleModel $module)
     {
         $pageHeading = trans('admin/contents.new', ['name' => trans($module->name)]);
-        if (is_callable([$module->handler, 'getCreateNewTitle'])) {
-            $pageHeading = call_user_func([$module->handler, 'getCreateNewTitle']);
-        }
+        $moduleHeading = $this->call($module, 'getCreateNewTitle');
 
-        return $pageHeading;
+        return is_null($moduleHeading) ? $pageHeading : $moduleHeading;
     }
 
-    public function getUpdateContentTitle(ModuleModel $module)
+    public function getUpdateContentTitle(ModuleModel $module, Content $content = null)
     {
-        // TODO: Implement getUpdateContentTitle() method.
+        $pageHeading = trans('admin/contents.new', ['name' => trans($module->name)]);
+        $moduleHeading = $this->call($module, 'getEditTitle', $content);
+
+        return is_null($moduleHeading) ? $pageHeading : $moduleHeading;
     }
 
     public function getOverviewTitle(ModuleModel $module)
     {
         $pageHeading = 'admin/contents.overview';
+        $moduleHeading = $this->call($module, 'getOverviewTitle');
 
-        // does user want to filter results using module?
-        if (!is_null($module) && is_callable([$module->handler, 'getOverviewTitle'])) {
-            $pageHeading = call_user_func([$module->handler, 'getOverviewTitle']);
-        }
-
-        return $pageHeading;
+        return is_null($moduleHeading) ? $pageHeading : $moduleHeading;
     }
 
     public function all()
     {
-        // TODO: Implement all() method.
+        return ModuleModel::where('enabled', true)
+                          ->get();
+    }
+
+    public function getByHandler($handler)
+    {
+        return ModuleModel::where('handler', $handler)
+                          ->firstOrFail();
+    }
+
+    public function call(ModuleModel $module, $method, ...$parameters)
+    {
+        if (!is_null($module) && is_callable([$module->handler, $method])) {
+            return call_user_func_array([$module->handler, $method], $parameters);
+        }
+
+        return null;
     }
 }