From 79d83c0bcbe0f3182016eb1344ce521f4deaa67d Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 30 May 2023 02:37:07 +0200 Subject: [PATCH 1/4] remove getId() --- Models/WorkflowInstanceAbstract.php | 12 ------------ Models/WorkflowTemplate.php | 12 ------------ 2 files changed, 24 deletions(-) diff --git a/Models/WorkflowInstanceAbstract.php b/Models/WorkflowInstanceAbstract.php index bb6b784..d90d8f3 100755 --- a/Models/WorkflowInstanceAbstract.php +++ b/Models/WorkflowInstanceAbstract.php @@ -103,18 +103,6 @@ class WorkflowInstanceAbstract $this->createdAt = new \DateTimeImmutable('now'); } - /** - * Get id - * - * @return int - * - * @since 1.0.0 - */ - public function getId() : int - { - return $this->id; - } - /** * Set status * diff --git a/Models/WorkflowTemplate.php b/Models/WorkflowTemplate.php index 16fc749..d8b918f 100755 --- a/Models/WorkflowTemplate.php +++ b/Models/WorkflowTemplate.php @@ -107,18 +107,6 @@ class WorkflowTemplate $this->source = new NullCollection(); } - /** - * Get id - * - * @return int - * - * @since 1.0.0 - */ - public function getId() : int - { - return $this->id; - } - /** * Get hooks * From 1f47007e971978580b4242fae4e0290026f9ea49 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 30 May 2023 03:42:52 +0200 Subject: [PATCH 2/4] use direct data access for response data --- Controller/ApiController.php | 8 ++++---- Controller/CliController.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 16eb93f..e69389c 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -86,7 +86,7 @@ final class ApiController extends Controller public function apiWorkflowExport(HttpRequest $request, HttpResponse $response, mixed $data = null) : void { if (!empty($val = $this->validateExport($request))) { - $response->set('export', new FormValidation($val)); + $response->data['export'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return; @@ -347,11 +347,11 @@ final class ApiController extends Controller */ public function apiWorkflowTemplateCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { - $uploadedFiles = $request->getFiles(); + $uploadedFiles = $request->files; $files = []; if (!empty($val = $this->validateTemplateCreate($request))) { - $response->set('template_create', new FormValidation($val)); + $response->data['template_create'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return; @@ -631,7 +631,7 @@ final class ApiController extends Controller public function apiWorkflowInstanceCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateInstanceCreate($request))) { - $response->set('instance_create', new FormValidation($val)); + $response->data['instance_create'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return; diff --git a/Controller/CliController.php b/Controller/CliController.php index 64830c8..7b7bc89 100755 --- a/Controller/CliController.php +++ b/Controller/CliController.php @@ -108,7 +108,7 @@ final class CliController extends Controller $view = new View($this->app->l11nManager, $request, $response); if (!empty($val = $this->validateInstanceCreate($request))) { - $response->set('instance_create', new FormValidation($val)); + $response->data['instance_create'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; } From e140abdf536b9a1c4e59881b97fb0be252bd614d Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 30 May 2023 04:15:42 +0200 Subject: [PATCH 3/4] continue with getter/setter removal --- Controller/ApiController.php | 2 +- Controller/BackendController.php | 2 +- Theme/Backend/workflow-template.tpl.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index e69389c..8baad61 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -324,7 +324,7 @@ final class ApiController extends Controller $view = new View($this->app->l11nManager, $request, $response); $view->addData('tcoll', $tcoll); - $view->addData('lang', $request->getData('lang') ?? $request->getLanguage()); + $view->addData('lang', $request->getData('lang') ?? $request->header->l11n->language); $view->addData('instance', $instance); $view->addData('template', $instance->template); $view->addData('basepath', __DIR__ . '/../../../'); diff --git a/Controller/BackendController.php b/Controller/BackendController.php index c0b15a4..968c554 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -58,7 +58,7 @@ final class BackendController extends Controller ->with('tags') ->with('tags/title') ->where('virtualPath', $path) - ->where('tags/title/language', $response->getLanguage()) + ->where('tags/title/language', $response->header->l11n->language) ->execute(); list($collection, $parent) = CollectionMapper::getCollectionsByPath($path); diff --git a/Theme/Backend/workflow-template.tpl.php b/Theme/Backend/workflow-template.tpl.php index 144f810..fd1d927 100755 --- a/Theme/Backend/workflow-template.tpl.php +++ b/Theme/Backend/workflow-template.tpl.php @@ -112,7 +112,7 @@ if (!empty($template->schema)) :
printHtml($action['name']); ?>
-
printHtml($action['description'][$this->request->getLanguage()]); ?>
+
printHtml($action['description'][$this->request->header->l11n->language]); ?>
From f707b2faade16f23c303b30edca01f79b8d8baa9 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 30 May 2023 15:44:26 +0200 Subject: [PATCH 4/4] Continue with getter/setter cleanup --- Controller/ApiController.php | 12 +++---- Controller/BackendController.php | 32 +++++++++---------- Theme/Backend/workflow-create.tpl.php | 2 +- Theme/Backend/workflow-dashboard.tpl.php | 4 +-- Theme/Backend/workflow-instance-list.tpl.php | 4 +-- Theme/Backend/workflow-instance.tpl.php | 2 +- .../Backend/workflow-template-create.tpl.php | 2 +- Theme/Backend/workflow-template-list.tpl.php | 8 ++--- Theme/Backend/workflow-template.tpl.php | 4 +-- 9 files changed, 35 insertions(+), 35 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 8baad61..0f2a1b1 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -124,7 +124,7 @@ final class ApiController extends Controller $view = $this->createView($instance, $request, $response); $this->setWorkflowResponseHeader($view, $instance->template->name, $request, $response); - $view->setData('path', __DIR__ . '/../../../'); + $view->data['path'] = __DIR__ . '/../../../'; $response->set('export', $view); } @@ -323,11 +323,11 @@ final class ApiController extends Controller $view = new View($this->app->l11nManager, $request, $response); - $view->addData('tcoll', $tcoll); - $view->addData('lang', $request->getData('lang') ?? $request->header->l11n->language); - $view->addData('instance', $instance); - $view->addData('template', $instance->template); - $view->addData('basepath', __DIR__ . '/../../../'); + $view->data['tcoll'] = $tcoll; + $view->data['lang'] = $request->getData('lang') ?? $request->header->l11n->language; + $view->data['instance'] = $instance; + $view->data['template'] = $instance->template; + $view->data['basepath'] = __DIR__ . '/../../../'; return $view; } diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 968c554..9ddd179 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -50,7 +50,7 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Workflow/Theme/Backend/workflow-template-list'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005501001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005501001, $request, $response); $path = \str_replace('+', ' ', (string) ($request->getData('path') ?? '/')); $templates = WorkflowTemplateMapper::getAll() @@ -63,11 +63,11 @@ final class BackendController extends Controller list($collection, $parent) = CollectionMapper::getCollectionsByPath($path); - $view->addData('parent', $parent); - $view->addData('collections', $collection); - $view->addData('path', $path); - $view->addData('reports', $templates); - $view->addData('account', $this->app->accountManager->get($request->header->account)); + $view->data['parent'] = $parent; + $view->data['collections'] = $collection; + $view->data['path'] = $path; + $view->data['reports'] = $templates; + $view->data['account'] = $this->app->accountManager->get($request->header->account); return $view; } @@ -87,7 +87,7 @@ final class BackendController extends Controller public function viewWorkflowTemplate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface { $view = new View($this->app->l11nManager, $request, $response); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005501001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005501001, $request, $response); /** @var \Modules\Workflow\Models\WorkflowTemplate $template */ $template = WorkflowTemplateMapper::get() @@ -97,7 +97,7 @@ final class BackendController extends Controller ->where('id', (int) $request->getData('id')) ->execute(); - $view->setData('template', $template); + $view->data['template'] = $template; if ($template->source->findFile('template-profile.tpl.php')->id > 0) { require_once $template->source->findFile('WorkflowController.php')->getPath(); @@ -109,7 +109,7 @@ final class BackendController extends Controller $view->setTemplate('/Modules/Workflow/Theme/Backend/workflow-template'); } - $head = $response->get('Content')->getData('head'); + $head = $response->get('Content')->head; $head->addAsset(AssetType::JSLATE, 'Resources/mermaid/mermaid.min.js?v=1.0.0'); $head->addAsset(AssetType::JSLATE, 'Modules/Workflow/Controller.js?v=1.0.0', ['type' => 'module']); @@ -132,7 +132,7 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Workflow/Theme/Backend/workflow-template-create'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005501001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005501001, $request, $response); return $view; } @@ -153,12 +153,12 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Workflow/Theme/Backend/workflow-dashboard'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005501001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005501001, $request, $response); $instances = WorkflowInstanceAbstractMapper::getAll() ->execute(); - $view->setData('instances', $instances); + $view->data['instances'] = $instances; return $view; } @@ -179,13 +179,13 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Workflow/Theme/Backend/workflow-instance-list'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005501001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005501001, $request, $response); /** @var \Modules\Workflow\Models\WorkflowInstanceAbstract $instances */ $instances = WorkflowInstanceAbstractMapper::getAll() ->execute(); - $view->setData('instances', $instances); + $view->data['instances'] = $instances; return $view; } @@ -205,7 +205,7 @@ final class BackendController extends Controller public function viewInstance(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface { $view = new View($this->app->l11nManager, $request, $response); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005501001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005501001, $request, $response); /** @var \Modules\Workflow\Models\WorkflowInstanceAbstract $instance */ $instance = WorkflowInstanceAbstractMapper::get() @@ -220,7 +220,7 @@ final class BackendController extends Controller ->limit() ->execute(); - $view->addData('template', $template); + $view->data['template'] = $template; if ($template->source->findFile('instance-profile.tpl.php')->id > 0) { require_once $template->source->findFile('WorkflowController.php')->getPath(); diff --git a/Theme/Backend/workflow-create.tpl.php b/Theme/Backend/workflow-create.tpl.php index 50b488c..0cdc604 100755 --- a/Theme/Backend/workflow-create.tpl.php +++ b/Theme/Backend/workflow-create.tpl.php @@ -13,4 +13,4 @@ declare(strict_types=1); /** @var \phpOMS\Views\View $this */ -echo $this->getData('nav')->render(); +echo $this->data['nav']->render(); diff --git a/Theme/Backend/workflow-dashboard.tpl.php b/Theme/Backend/workflow-dashboard.tpl.php index 3cb98c1..db1abc2 100755 --- a/Theme/Backend/workflow-dashboard.tpl.php +++ b/Theme/Backend/workflow-dashboard.tpl.php @@ -15,9 +15,9 @@ declare(strict_types=1); /** * @var \phpOMS\Views\View $this */ -$instances = $this->getData('instances') ?? []; +$instances = $this->data['instances'] ?? []; -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/workflow-instance-list.tpl.php b/Theme/Backend/workflow-instance-list.tpl.php index 6fcd480..d856a91 100755 --- a/Theme/Backend/workflow-instance-list.tpl.php +++ b/Theme/Backend/workflow-instance-list.tpl.php @@ -15,9 +15,9 @@ declare(strict_types=1); /** * @var \phpOMS\Views\View $this */ -$instances = $this->getData('instances') ?? []; +$instances = $this->data['instances'] ?? []; -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/workflow-instance.tpl.php b/Theme/Backend/workflow-instance.tpl.php index 50b488c..0cdc604 100755 --- a/Theme/Backend/workflow-instance.tpl.php +++ b/Theme/Backend/workflow-instance.tpl.php @@ -13,4 +13,4 @@ declare(strict_types=1); /** @var \phpOMS\Views\View $this */ -echo $this->getData('nav')->render(); +echo $this->data['nav']->render(); diff --git a/Theme/Backend/workflow-template-create.tpl.php b/Theme/Backend/workflow-template-create.tpl.php index 50b488c..0cdc604 100755 --- a/Theme/Backend/workflow-template-create.tpl.php +++ b/Theme/Backend/workflow-template-create.tpl.php @@ -13,4 +13,4 @@ declare(strict_types=1); /** @var \phpOMS\Views\View $this */ -echo $this->getData('nav')->render(); +echo $this->data['nav']->render(); diff --git a/Theme/Backend/workflow-template-list.tpl.php b/Theme/Backend/workflow-template-list.tpl.php index a0bca2d..044ca78 100755 --- a/Theme/Backend/workflow-template-list.tpl.php +++ b/Theme/Backend/workflow-template-list.tpl.php @@ -18,21 +18,21 @@ use phpOMS\Uri\UriFactory; * @var \phpOMS\Views\View $this * @var \Modules\Workflow\Models\Template[] $templates */ -$templates = $this->getData('reports'); +$templates = $this->data['reports']; /** @var \Modules\Admin\Models\Account $account */ -$account = $this->getData('account'); +$account = $this->data['account']; $accountDir = $account->id . ' ' . $account->login; /** @var \Modules\Media\Models\Collection[] */ -$collections = $this->getData('collections'); +$collections = $this->data['collections']; $mediaPath = \urldecode($this->getData('path') ?? '/'); $previous = empty($templates) ? 'workflow/template/list' : '{/base}/workflow/template/list?{?}&id=' . \reset($templates)->id . '&ptype=p'; $next = empty($templates) ? 'workflow/template/list' : '{/base}/workflow/template/list?{?}&id=' . \end($templates)->id . '&ptype=n'; -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/workflow-template.tpl.php b/Theme/Backend/workflow-template.tpl.php index fd1d927..0333c16 100755 --- a/Theme/Backend/workflow-template.tpl.php +++ b/Theme/Backend/workflow-template.tpl.php @@ -18,7 +18,7 @@ use phpOMS\Views\View; * @var \phpOMS\Views\View $this * @var \Modules\Workflow\Models\Template $template */ -$template = $this->getData('template'); +$template = $this->data['template']; $actions = \json_decode(\file_get_contents(__DIR__ . '/../../Definitions/actions.json'), true); @@ -84,7 +84,7 @@ function renderElements(array $leaf, array $actions) : void } } -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?> schema)) :