Continue with getter/setter cleanup

This commit is contained in:
Dennis Eichhorn 2023-05-30 15:44:18 +02:00
parent 0893c42846
commit bd9ced93c9
7 changed files with 32 additions and 38 deletions

View File

@ -48,20 +48,14 @@ final class BackendController extends Controller
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Exchange/Theme/Backend/exchange-log-list'); $view->setTemplate('/Modules/Exchange/Theme/Backend/exchange-log-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1007001001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1007001001, $request, $response);
if ($request->getData('ptype') === 'p') { if ($request->getData('ptype') === 'p') {
$view->setData('logs', $view->data['logs'] = ExchangeLogMapper::getAll()->where('id', $request->getDataInt('id') ?? 0, '<')->limit(25)->execute();
ExchangeLogMapper::getAll()->where('id', $request->getDataInt('id') ?? 0, '<')->limit(25)->execute()
);
} elseif ($request->getData('ptype') === 'n') { } elseif ($request->getData('ptype') === 'n') {
$view->setData('logs', $view->data['logs'] = ExchangeLogMapper::getAll()->where('id', $request->getDataInt('id') ?? 0, '>')->limit(25)->execute();
ExchangeLogMapper::getAll()->where('id', $request->getDataInt('id') ?? 0, '>')->limit(25)->execute()
);
} else { } else {
$view->setData('logs', $view->data['logs'] = ExchangeLogMapper::getAll()->where('id', 0, '>')->limit(25)->execute();
ExchangeLogMapper::getAll()->where('id', 0, '>')->limit(25)->execute()
);
} }
return $view; return $view;
@ -83,10 +77,10 @@ final class BackendController extends Controller
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Exchange/Theme/Backend/exchange-log'); $view->setTemplate('/Modules/Exchange/Theme/Backend/exchange-log');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1007001001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1007001001, $request, $response);
$log = ExchangeLogMapper::get()->where('id', (int) $request->getData('id'))->execute(); $log = ExchangeLogMapper::get()->where('id', (int) $request->getData('id'))->execute();
$view->setData('log', $log); $view->data['log'] = $log;
return $view; return $view;
} }
@ -107,7 +101,7 @@ final class BackendController extends Controller
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Exchange/Theme/Backend/exchange-export-list'); $view->setTemplate('/Modules/Exchange/Theme/Backend/exchange-export-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1007001001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1007001001, $request, $response);
/** @var \Modules\Exchange\Models\InterfaceManager[] $interfaces */ /** @var \Modules\Exchange\Models\InterfaceManager[] $interfaces */
$interfaces = InterfaceManagerMapper::getAll()->execute(); $interfaces = InterfaceManagerMapper::getAll()->execute();
@ -119,7 +113,7 @@ final class BackendController extends Controller
} }
} }
$view->addData('interfaces', $export); $view->data['interfaces'] = $export;
return $view; return $view;
} }
@ -140,7 +134,7 @@ final class BackendController extends Controller
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Exchange/Theme/Backend/exchange-import-list'); $view->setTemplate('/Modules/Exchange/Theme/Backend/exchange-import-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1007001001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1007001001, $request, $response);
/** @var \Modules\Exchange\Models\InterfaceManager[] $interfaces */ /** @var \Modules\Exchange\Models\InterfaceManager[] $interfaces */
$interfaces = InterfaceManagerMapper::getAll()->execute(); $interfaces = InterfaceManagerMapper::getAll()->execute();
@ -152,7 +146,7 @@ final class BackendController extends Controller
} }
} }
$view->addData('interfaces', $import); $view->data['interfaces'] = $import;
return $view; return $view;
} }
@ -173,7 +167,7 @@ final class BackendController extends Controller
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Exchange/Theme/Backend/exchange-export'); $view->setTemplate('/Modules/Exchange/Theme/Backend/exchange-export');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1007001001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1007001001, $request, $response);
/** @var \Modules\Exchange\Models\InterfaceManager $interface */ /** @var \Modules\Exchange\Models\InterfaceManager $interface */
$interface = InterfaceManagerMapper::get() $interface = InterfaceManagerMapper::get()
@ -182,14 +176,14 @@ final class BackendController extends Controller
->where('id', (int) $request->getData('id')) ->where('id', (int) $request->getData('id'))
->execute(); ->execute();
$view->addData('interface', $interface); $view->data['interface'] = $interface;
$view->addData('db', $this->app->dbPool->get()); $view->data['db'] = $this->app->dbPool->get();
$lang = include $interface->source->getAbsolutePath() $lang = include $interface->source->getAbsolutePath()
. $interface->source->name . $interface->source->name
. '/Lang/' . $response->header->l11n->language . '.lang.php'; . '/Lang/' . $response->header->l11n->language . '.lang.php';
$view->addData('lang', $lang); $view->data['lang'] = $lang;
return $view; return $view;
} }
@ -210,7 +204,7 @@ final class BackendController extends Controller
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Exchange/Theme/Backend/exchange-import'); $view->setTemplate('/Modules/Exchange/Theme/Backend/exchange-import');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1007001001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1007001001, $request, $response);
/** @var \Modules\Exchange\Models\InterfaceManager $interface */ /** @var \Modules\Exchange\Models\InterfaceManager $interface */
$interface = InterfaceManagerMapper::get() $interface = InterfaceManagerMapper::get()
@ -219,14 +213,14 @@ final class BackendController extends Controller
->where('id', (int) $request->getData('id')) ->where('id', (int) $request->getData('id'))
->execute(); ->execute();
$view->addData('interface', $interface); $view->data['interface'] = $interface;
$view->addData('db', $this->app->dbPool->get()); $view->data['db'] = $this->app->dbPool->get();
$lang = include $interface->source->getAbsolutePath() $lang = include $interface->source->getAbsolutePath()
. $interface->source->name . $interface->source->name
. '/Lang/' . $response->header->l11n->language . '.lang.php'; . '/Lang/' . $response->header->l11n->language . '.lang.php';
$view->addData('lang', $lang); $view->data['lang'] = $lang;
return $view; return $view;
} }

View File

@ -13,9 +13,9 @@
declare(strict_types=1); declare(strict_types=1);
/** @var \phpOMS\Views\View $this */ /** @var \phpOMS\Views\View $this */
$interfaces = $this->getData('interfaces'); $interfaces = $this->data['interfaces'];
echo $this->getData('nav')->render(); echo $this->data['nav']->render();
?> ?>
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">

View File

@ -12,12 +12,12 @@
*/ */
declare(strict_types=1); declare(strict_types=1);
$lang = $this->getData('lang'); $lang = $this->data['lang'];
/** @var \phpOMS\Views\View $this */ /** @var \phpOMS\Views\View $this */
echo $this->getData('nav')->render(); echo $this->data['nav']->render();
$interface = $this->getData('interface'); $interface = $this->data['interface'];
include $interface->source->getAbsolutePath() include $interface->source->getAbsolutePath()
. $interface->source->name . '/' . $interface->source->name . '/'

View File

@ -13,9 +13,9 @@
declare(strict_types=1); declare(strict_types=1);
/** @var \phpOMS\Views\View $this */ /** @var \phpOMS\Views\View $this */
$interfaces = $this->getData('interfaces'); $interfaces = $this->data['interfaces'];
echo $this->getData('nav')->render(); echo $this->data['nav']->render();
?> ?>
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">

View File

@ -12,12 +12,12 @@
*/ */
declare(strict_types=1); declare(strict_types=1);
$lang = $this->getData('lang'); $lang = $this->data['lang'];
/** @var \phpOMS\Views\View $this */ /** @var \phpOMS\Views\View $this */
echo $this->getData('nav')->render(); echo $this->data['nav']->render();
$interface = $this->getData('interface'); $interface = $this->data['interface'];
include $interface->source->getAbsolutePath() include $interface->source->getAbsolutePath()
. $interface->source->name . '/' . $interface->source->name . '/'

View File

@ -15,9 +15,9 @@ declare(strict_types=1);
use phpOMS\Uri\UriFactory; use phpOMS\Uri\UriFactory;
/** @var \phpOMS\Views\View $this */ /** @var \phpOMS\Views\View $this */
$logs = $this->getData('logs') ?? []; $logs = $this->data['logs'] ?? [];
echo $this->getData('nav')->render(); ?> echo $this->data['nav']->render(); ?>
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">

View File

@ -15,9 +15,9 @@ declare(strict_types=1);
use \phpOMS\Uri\UriFactory; use \phpOMS\Uri\UriFactory;
/** @var \Modules\Exchange\Models\ExchangeLog $log */ /** @var \Modules\Exchange\Models\ExchangeLog $log */
$log = $this->getData('log'); $log = $this->data['log'];
echo $this->getData('nav')->render(); echo $this->data['nav']->render();
?> ?>
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">