minicms/core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

REFACTORING: another ugly commit full of refactored code

Browse Source
This commit is contained in:
Michal Kváček
2016-10-19 00:28:44 +02:00
parent 4f6a006ad9
commit 28f67ffe3c
34 changed files with 101 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/CMS/Contracts/Content/ContentTitles.php
+1 -1
View File
@@ -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
+10 -3
View File
@@ -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
+15 -1
View File
@@ -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
+1
View File
@@ -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
+36 -28
View File
@@ -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;
}
}
app/Http/Controllers/Admin/Contents/EditContent.php
+9 -16
View File
@@ -1,6 +1,9 @@
<?php
namespace App\Http\Controllers\Admin\Contents;
use App\CMS\Contracts\Repositories\Content as IContent;
use App\CMS\Contracts\Repositories\Module as IModuleRepository;
use App\CMS\Contracts\Repositories\Template as ITemplate;
use App\CMS\Enumerations\ContentStatuses;
use App\Cms\Handlers\Interactions\Interaction;
use App\CMS\Helpers\CurrentTemplate;
@@ -12,16 +15,9 @@ use App\Http\Requests\Request;
use App\Models\Content\Content;
use App\Models\Content\ContentHistory;
use App\Models\FileManager\File;
use App\Models\Module;
use App\Models\Templates\Template;
use Illuminate\Support\Facades\Event;
use Modules\Categories\Entities\Category;
use Pingpong\Modules\Facades\Module as ModuleInstance;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use App\CMS\Contracts\Repositories\Content as IContent;
use App\CMS\Contracts\Repositories\Module as IModuleRepository;
use App\CMS\Contracts\Repositories\Template as ITemplate;
use Modules\Categories\Contracts\Repositories\Category as ICategory;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
class EditContent extends Controller
{
@@ -85,15 +81,12 @@ class EditContent extends Controller
$page = $this->content->getOne($url);
// get module ID
$module = Module::where('handler', $page->module_handler)
->firstOrFail();
$pageHeading = $this->module->getUpdateContentTitle($module);
$module = $this->module->getByHandler($page->module_handler);
$pageHeading = $this->module->getUpdateContentTitle($module, $page);
$templates = $this->template->getForModule($module);
$categories = $this->category->getForModule($module);
$history = $this->history->getStructuredHistoryOf($page);
// modify data for edit form according to installed template
call_user_func_array([CurrentTemplate::handler(), 'beforePopulatingEditForm'], [&$page]);
@@ -106,8 +99,8 @@ class EditContent extends Controller
'categories' => $categories,
'rootPages' => $this->content->getOverview(),
'templates' => $templates,
'formSectionNames' => call_user_func([$page->module_handler, 'getExtendedFormSections']),
'formSections' => call_user_func([$page->module_handler, 'getExtendedFormInputsEdit']),
'formSectionNames' => $this->module->call($module, 'getExtendedFormSections'),
'formSections' => $this->module->call($module, 'getExtendedFormInputsEdit'),
'historySize' => count($history['changesets'])
]);
}
@@ -126,7 +119,7 @@ class EditContent extends Controller
/**
* @var $page Content
*/
$page = Content::findOrFail($id);
$page = $this->content->getOne($id);
} catch (NotFoundHttpException $e) {
// log attempt of invalid edit
app/Http/Controllers/Admin/Contents/History.php
-1
View File
@@ -43,7 +43,6 @@ class History extends Controller
return view('admin/history.diff', [
'change' => $change,
'columnName' => 'Page content',
'diff' => $diff
]);
}
app/Http/Controllers/Visitor/ContentPage.php
+4 -4
View File
@@ -2,9 +2,10 @@
namespace App\Http\Controllers\Visitor;
use App\Models\Content\Content as ContentModel;
use App\CMS\Contracts\Repositories\Content;
use App\CMS\Helpers\PageRenderer;
use App\Http\Controllers\Controller;
use App\Models\Content\Content;
use Illuminate\Support\Facades\Auth;
class ContentPage extends Controller
@@ -43,11 +44,10 @@ class ContentPage extends Controller
* @return mixed
* @throws \Exception
*/
protected function renderPage(Content $page)
protected function renderPage(ContentModel $page)
{
// test if loaded page is visible or not
if ($page->status == Content::STATUS_PROTECTED && !Auth::user()) {
// throw new \Exception('Cannot access protected resources');
if ($page->isProtected() && !Auth::user()) {
abort(404);
}
app/Http/Controllers/Visitor/Homepage.php
+1 -7
View File
@@ -2,8 +2,6 @@
namespace App\Http\Controllers\Visitor;
use App\Http\Requests;
class Homepage extends ContentPage
{
public function getIndex()
@@ -17,10 +15,6 @@ class Homepage extends ContentPage
}
// render page
// try {
return $this->renderPage($page);
// } catch (\Exception $e) {
// return view('errors.homepageNotAvailable', ['exception' => $e, 'reason' => 'exception']);
// }
return $this->renderPage($page);
}
}