From 10f6d7e622e753bedc22ce24128b2e7d0868a4f7 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 30 May 2023 15:44:19 +0200 Subject: [PATCH] Continue with getter/setter cleanup --- Controller/ApiController.php | 14 ++++---- Controller/BackendController.php | 38 ++++++++++---------- Theme/Backend/helper-create.tpl.php | 2 +- Theme/Backend/helper-list.tpl.php | 8 ++--- Theme/Backend/helper-single.tpl.php | 14 ++++---- Theme/Backend/helper-template-create.tpl.php | 2 +- tests/depreciation/view.doc.php | 12 +++---- tests/depreciation/view.pdf.php | 8 ++--- 8 files changed, 49 insertions(+), 49 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index bf6373e..8910cdf 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -107,7 +107,7 @@ final class ApiController extends Controller $view = $this->createView($template, $request, $response); $this->setHelperResponseHeader($view, $template->name, $request, $response); - $view->setData('path', __DIR__ . '/../../../'); + $view->data['path'] = __DIR__ . '/../../../'; $response->set('export', $view); } @@ -370,14 +370,14 @@ final class ApiController extends Controller } } - $view->addData('report', $report); - $view->addData('rcoll', $rcoll); + $view->data['report'] = $report; + $view->data['rcoll'] = $rcoll; } - $view->addData('tcoll', $tcoll); - $view->addData('lang', $request->getData('lang') ?? $request->header->l11n->language); - $view->addData('template', $template); - $view->addData('basepath', __DIR__ . '/../../../'); + $view->data['tcoll'] = $tcoll; + $view->data['lang'] = $request->getData('lang') ?? $request->header->l11n->language; + $view->data['template'] = $template; + $view->data['basepath'] = __DIR__ . '/../../../'; return $view; } diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 53351f5..dd0f6e0 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -54,7 +54,7 @@ final class BackendController extends Controller $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Helper/Theme/Backend/helper-list'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002701001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002701001, $request, $response); $path = \str_replace('+', ' ', (string) ($request->getData('path') ?? '/')); $templates = TemplateMapper::getAll() @@ -67,11 +67,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; } @@ -93,11 +93,11 @@ final class BackendController extends Controller $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Helper/Theme/Backend/helper-template-create'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002701001, $request, $response)); - $view->addData('media-upload', new \Modules\Media\Theme\Backend\Components\Upload\BaseView($this->app->l11nManager, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002701001, $request, $response); + $view->data['media-upload'] = new \Modules\Media\Theme\Backend\Components\Upload\BaseView($this->app->l11nManager, $request, $response); $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response); - $view->addData('editor', $editor); + $view->data['editor'] = $editor; return $view; } @@ -119,11 +119,11 @@ final class BackendController extends Controller $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Helper/Theme/Backend/helper-create'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002701001, $request, $response)); - $view->addData('media-upload', new \Modules\Media\Theme\Backend\Components\Upload\BaseView($this->app->l11nManager, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002701001, $request, $response); + $view->data['media-upload'] = new \Modules\Media\Theme\Backend\Components\Upload\BaseView($this->app->l11nManager, $request, $response); $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response); - $view->addData('editor', $editor); + $view->data['editor'] = $editor; return $view; } @@ -220,15 +220,15 @@ final class BackendController extends Controller } } - $view->addData('report', $report); - $view->addData('rcoll', $rcoll); + $view->data['report'] = $report; + $view->data['rcoll'] = $rcoll; } - $view->addData('unit', $this->app->unitId); - $view->addData('tcoll', $tcoll); - $view->addData('lang', $request->getData('lang') ?? $request->header->l11n->language); - $view->addData('template', $template); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002701001, $request, $response)); + $view->data['unit'] = $this->app->unitId; + $view->data['tcoll'] = $tcoll; + $view->data['lang'] = $request->getData('lang') ?? $request->header->l11n->language; + $view->data['template'] = $template; + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002701001, $request, $response); return $view; } diff --git a/Theme/Backend/helper-create.tpl.php b/Theme/Backend/helper-create.tpl.php index 8729b21..1a54809 100755 --- a/Theme/Backend/helper-create.tpl.php +++ b/Theme/Backend/helper-create.tpl.php @@ -19,7 +19,7 @@ use phpOMS\Uri\UriFactory; */ $templateList = \Modules\Helper\Models\TemplateMapper::getAll()->execute(); -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/helper-list.tpl.php b/Theme/Backend/helper-list.tpl.php index 7478d29..29ed78b 100755 --- a/Theme/Backend/helper-list.tpl.php +++ b/Theme/Backend/helper-list.tpl.php @@ -18,21 +18,21 @@ use phpOMS\Uri\UriFactory; * @var \phpOMS\Views\View $this * @var \Modules\Helper\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) ? '{/base}/helper/list' : '{/base}/helper/list?{?}&id=' . \reset($templates)->id . '&ptype=p'; $next = empty($templates) ? '{/base}/helper/list' : 'helper/list?{?}&id=' . \end($templates)->id . '&ptype=n'; -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/helper-single.tpl.php b/Theme/Backend/helper-single.tpl.php index 6066744..2f5e23e 100755 --- a/Theme/Backend/helper-single.tpl.php +++ b/Theme/Backend/helper-single.tpl.php @@ -20,19 +20,19 @@ use phpOMS\Uri\UriFactory; */ /** @var \Modules\Media\Models\Collection $tcoll */ -$tcoll = $this->getData('tcoll'); +$tcoll = $this->data['tcoll']; /** @var \Modules\Media\Models\Collection $rcoll */ -$rcoll = $this->getData('rcoll'); +$rcoll = $this->data['rcoll']; /** @var string $cLang */ -$cLang = $this->getData('lang'); +$cLang = $this->data['lang']; /** @var \Modules\Helper\Models\Template $template */ -$template = $this->getData('template'); +$template = $this->data['template']; /** @var \Modules\Helper\Models\Report $report */ -$report = $this->getData('report'); +$report = $this->data['report']; /** @noinspection PhpIncludeInspection */ /** @var array> $reportLanguage */ @@ -42,12 +42,12 @@ $reportLanguage = isset($tcoll['lang']) ? include __DIR__ . '/../../../../' . \l $lang = $reportLanguage[$cLang] ?? []; $settings = isset($tcoll['cfg']) ? \json_decode(\file_get_contents(__DIR__ . '/../../../../' . \ltrim($tcoll['cfg']->getPath(), '/')), true) : []; -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>
- +
diff --git a/Theme/Backend/helper-template-create.tpl.php b/Theme/Backend/helper-template-create.tpl.php index f489529..85af671 100755 --- a/Theme/Backend/helper-template-create.tpl.php +++ b/Theme/Backend/helper-template-create.tpl.php @@ -13,7 +13,7 @@ declare(strict_types=1); /** @var \phpOMS\Views\View $this */ -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>
diff --git a/tests/depreciation/view.doc.php b/tests/depreciation/view.doc.php index d5b5385..b15135a 100755 --- a/tests/depreciation/view.doc.php +++ b/tests/depreciation/view.doc.php @@ -10,12 +10,12 @@ use PhpOffice\PhpWord\Style\Language; /** * @var \phpOMS\Views\View $this */ -$tcoll = $this->getData('tcoll'); -$rcoll = $this->getData('rcoll'); -$cLang = $this->getData('lang'); -$template = $this->getData('template'); -$report = $this->getData('report'); -$basepath = \rtrim($this->getData('basepath') ?? '', '/'); +$tcoll = $this->data['tcoll']; +$rcoll = $this->data['rcoll']; +$cLang = $this->data['lang']; +$template = $this->data['template']; +$report = $this->data['report']; +$basepath = \rtrim($this->data['basepath'] ?? '', '/'); /** @noinspection PhpIncludeInspection */ $reportLanguage = include $basepath . '/' . \ltrim($tcoll['lang']->getPath(), '/'); diff --git a/tests/depreciation/view.pdf.php b/tests/depreciation/view.pdf.php index 6792f78..1b9dfd5 100755 --- a/tests/depreciation/view.pdf.php +++ b/tests/depreciation/view.pdf.php @@ -5,13 +5,13 @@ use phpOMS\Autoloader; require_once Autoloader::findPaths('Resources\tcpdf\tcpdf')[0]; -$cLang = $this->getData('lang'); +$cLang = $this->data['lang']; /** @noinspection PhpIncludeInspection */ $reportLanguage = include $basepath . '/' . \ltrim($tcoll['lang']->getPath(), '/'); $lang = $reportLanguage[$cLang]; -$amount = (float) ($this->request->getData('amount') ?? 10000.0); -$duration = (int) ($this->request->getData('duration') ?? 10); +$amount = $this->request->getDataFloat('amount') ?? 10000.0; +$duration = $this->request->getDataInt('duration') ?? 10; $pdf = new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false); @@ -40,7 +40,7 @@ $pdf->Rect(0, 0, $pdf->getPageWidth(), 5, 'F'); $pdf->SetFont('helvetica', '', 32); $pdf->SetTextColor(54, 151, 219); -$pdf->Write(0, 'Demo Mailing - ' . $this->request->getData('date') ?? 'Y-m-d', '', 0, 'C', true, 0, false, false, 0); +$pdf->Write(0, 'Demo Mailing - ' . $this->request->getDataString('date') ?? 'Y-m-d', '', 0, 'C', true, 0, false, false, 0); $pdf->Image(__DIR__ . '/logo.png', $pdf->getPageWidth() / 2 - 60 / 2, 40, 60, 60, 'PNG', '', 'C', true, 300, '', false, false, 0, false, false, false);