From d9ab0381d9e5b5b21858e36a781d4b02dc9bc2e2 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 30 May 2023 15:44:20 +0200 Subject: [PATCH] Continue with getter/setter cleanup --- Controller/BackendController.php | 126 +++++++++++----------- Theme/Backend/attribute-type-list.tpl.php | 4 +- Theme/Backend/attribute-type.tpl.php | 6 +- Theme/Backend/item-analysis.tpl.php | 2 +- Theme/Backend/item-create.tpl.php | 2 +- Theme/Backend/item-list.tpl.php | 4 +- Theme/Backend/item-profile.tpl.php | 26 ++--- Theme/Backend/purchase-item-list.tpl.php | 4 +- Theme/Backend/sales-item-list.tpl.php | 4 +- Theme/Backend/sales-item-profile.tpl.php | 16 +-- Theme/Backend/stock-item-list.tpl.php | 4 +- 11 files changed, 99 insertions(+), 99 deletions(-) diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 9f20655..a6c34b2 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -70,7 +70,7 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/ItemManagement/Theme/Backend/attribute-type-list'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004801001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1004801001, $request, $response); /** @var \Modules\Attribute\Models\AttributeType[] $attributes */ $attributes = ItemAttributeTypeMapper::getAll() @@ -78,7 +78,7 @@ final class BackendController extends Controller ->where('l11n/language', $response->header->l11n->language) ->execute(); - $view->addData('attributes', $attributes); + $view->data['attributes'] = $attributes; return $view; } @@ -99,7 +99,7 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/ItemManagement/Theme/Backend/attribute-value-list'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004801001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1004801001, $request, $response); /** @var \Modules\Attribute\Models\AttributeValue[] $attributes */ $attributes = ItemAttributeValueMapper::getAll() @@ -107,7 +107,7 @@ final class BackendController extends Controller ->where('l11n/language', $response->header->l11n->language) ->execute(); - $view->addData('attributes', $attributes); + $view->data['attributes'] = $attributes; return $view; } @@ -128,7 +128,7 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/ItemManagement/Theme/Backend/attribute-type'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004801001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1004801001, $request, $response); /** @var \Modules\Attribute\Models\AttributeType $attribute */ $attribute = ItemAttributeTypeMapper::get() @@ -141,8 +141,8 @@ final class BackendController extends Controller ->where('ref', $attribute->id) ->execute(); - $view->addData('attribute', $attribute); - $view->addData('l11ns', $l11ns); + $view->data['attribute'] = $attribute; + $view->data['l11ns'] = $l11ns; return $view; } @@ -163,7 +163,7 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/ItemManagement/Theme/Backend/attribute-value'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004801001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1004801001, $request, $response); /** @var \Modules\Attribute\Models\AttributeValue $attribute */ $attribute = ItemAttributeValueMapper::get() @@ -172,7 +172,7 @@ final class BackendController extends Controller ->where('l11n/language', $response->header->l11n->language) ->execute(); - $view->addData('attribute', $attribute); + $view->data['attribute'] = $attribute; return $view; } @@ -193,7 +193,7 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/ItemManagement/Theme/Backend/item-list'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004801001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1004801001, $request, $response); /** @var \Modules\ItemManagement\Models\Item[] $items */ $items = ItemMapper::getAll() @@ -207,7 +207,7 @@ final class BackendController extends Controller ->limit(50) ->execute(); - $view->addData('items', $items); + $view->data['items'] = $items; return $view; } @@ -279,7 +279,7 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/ItemManagement/Theme/Backend/item-create'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004805001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1004805001, $request, $response); return $view; } @@ -300,7 +300,7 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/ItemManagement/Theme/Backend/item-create'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004806001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1004806001, $request, $response); return $view; } @@ -321,7 +321,7 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/ItemManagement/Theme/Backend/item-create'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004807001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1004807001, $request, $response); return $view; } @@ -340,14 +340,14 @@ final class BackendController extends Controller */ public function viewItemManagementItem(RequestAbstract $request, ResponseAbstract $response, $data = null) : View { - $head = $response->get('Content')->getData('head'); + $head = $response->get('Content')->head; $head->addAsset(AssetType::CSS, 'Resources/chartjs/Chartjs/chart.css'); $head->addAsset(AssetType::JSLATE, 'Resources/chartjs/Chartjs/chart.js'); $head->addAsset(AssetType::JSLATE, 'Modules/ItemManagement/Controller.js', ['type' => 'module']); $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/ItemManagement/Theme/Backend/item-profile'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004803001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1004803001, $request, $response); /** @var \Modules\ItemManagement\Models\Item $item */ $item = ItemMapper::get() @@ -368,7 +368,7 @@ final class BackendController extends Controller ->limit(5, 'notes')->sort('notes/id', OrderType::DESC) ->execute(); - $view->addData('item', $item); + $view->data['item'] = $item; // Get item profile image // It might not be part of the 5 newest item files from above @@ -395,59 +395,59 @@ final class BackendController extends Controller ->limit(1) ->execute(); - $view->addData('itemImage', $itemImage); + $view->data['itemImage'] = $itemImage; /** @var \Model\Setting $settings */ $settings = $this->app->appSettings->get(null, [ SettingsEnum::DEFAULT_LOCALIZATION, ]); - $view->setData('defaultlocalization', LocalizationMapper::get()->where('id', (int) $settings->id)->execute()); + $view->data['defaultlocalization'] = LocalizationMapper::get()->where('id', (int) $settings->id)->execute(); $l11nTypes = ItemL11nTypeMapper::getAll() ->execute(); - $view->setData('l11nTypes', $l11nTypes); + $view->data['l11nTypes'] = $l11nTypes; $l11nValues = ItemL11nMapper::getAll() ->with('type') ->where('ref', $item->id) ->execute(); - $view->setData('l11nValues', $l11nValues); + $view->data['l11nValues'] = $l11nValues; $attributeTypes = ItemAttributeTypeMapper::getAll() ->with('l11n') ->where('l11n/language', $response->header->l11n->language) ->execute(); - $view->setData('attributeTypes', $attributeTypes); + $view->data['attributeTypes'] = $attributeTypes; $units = UnitMapper::getAll() ->execute(); - $view->setData('units', $units); + $view->data['units'] = $units; $prices = PriceMapper::getAll() ->where('item', $item->id) ->where('type', PriceType::SALES) ->where('client', null) ->execute(); - $view->setData('prices', $prices); + $view->data['prices'] = $prices; $audits = AuditMapper::getAll() ->where('type', StringUtils::intHash(ItemMapper::class)) ->where('module', 'ItemManagement') ->where('ref', $item->id) ->execute(); - $view->setData('audits', $audits); + $view->data['audits'] = $audits; $files = MediaMapper::getAll() ->with('types') ->join('id', ItemMapper::class, 'files') // id = media id, files = item relations ->on('id', $item->id, relation: 'files') // id = item id ->execute(); - $view->setData('files', $files); + $view->data['files'] = $files; $mediaListView = new \Modules\Media\Theme\Backend\Components\Media\ListView($this->app->l11nManager, $request, $response); $mediaListView->setTemplate('/Modules/Media/Theme/Backend/Components/Media/list'); - $view->addData('medialist', $mediaListView); + $view->data['medialist'] = $mediaListView; // stats if ($this->app->moduleManager->isActive('Billing')) { @@ -484,16 +484,16 @@ final class BackendController extends Controller $monthlySalesCosts = []; } - $view->addData('ytd', $ytd); - $view->addData('mtd', $mtd); - $view->addData('avg', $avg); - $view->addData('lastOrder', $lastOrder); - $view->addData('newestInvoices', $newestInvoices); - $view->addData('allInvoices', $allInvoices); - $view->addData('topCustomers', $topCustomers); - $view->addData('regionSales', $regionSales); - $view->addData('countrySales', $countrySales); - $view->addData('monthlySalesCosts', $monthlySalesCosts); + $view->data['ytd'] = $ytd; + $view->data['mtd'] = $mtd; + $view->data['avg'] = $avg; + $view->data['lastOrder'] = $lastOrder; + $view->data['newestInvoices'] = $newestInvoices; + $view->data['allInvoices'] = $allInvoices; + $view->data['topCustomers'] = $topCustomers; + $view->data['regionSales'] = $regionSales; + $view->data['countrySales'] = $countrySales; + $view->data['monthlySalesCosts'] = $monthlySalesCosts; return $view; } @@ -563,14 +563,14 @@ final class BackendController extends Controller */ public function viewItemSalesAnalysis(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface { - $head = $response->get('Content')->getData('head'); + $head = $response->get('Content')->head; $head->addAsset(AssetType::CSS, 'Resources/chartjs/Chartjs/chart.css'); $head->addAsset(AssetType::JSLATE, 'Resources/chartjs/Chartjs/chart.js'); $head->addAsset(AssetType::JSLATE, 'Modules/ClientManagement/Controller.js', ['type' => 'module']); $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/ItemManagement/Theme/Backend/item-analysis'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001602001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001602001, $request, $response); $monthlySalesCosts = []; for ($i = 1; $i < 13; ++$i) { @@ -582,7 +582,7 @@ final class BackendController extends Controller ]; } - $view->addData('monthlySalesCosts', $monthlySalesCosts); + $view->data['monthlySalesCosts'] = $monthlySalesCosts; ///// $monthlySalesCustomer = []; @@ -595,7 +595,7 @@ final class BackendController extends Controller ]; } - $view->addData('monthlySalesCustomer', $monthlySalesCustomer); + $view->data['monthlySalesCustomer'] = $monthlySalesCustomer; $annualSalesCustomer = []; for ($i = 1; $i < 11; ++$i) { @@ -606,7 +606,7 @@ final class BackendController extends Controller ]; } - $view->addData('annualSalesCustomer', $annualSalesCustomer); + $view->data['annualSalesCustomer'] = $annualSalesCustomer; ///// $monthlyCustomerRetention = []; @@ -617,7 +617,7 @@ final class BackendController extends Controller ]; } - $view->addData('monthlyCustomerRetention', $monthlyCustomerRetention); + $view->data['monthlyCustomerRetention'] = $monthlyCustomerRetention; ///// $currentCustomerRegion = [ @@ -629,7 +629,7 @@ final class BackendController extends Controller 'Other' => (int) (\mt_rand(200, 400) / 4), ]; - $view->addData('currentCustomerRegion', $currentCustomerRegion); + $view->data['currentCustomerRegion'] = $currentCustomerRegion; $annualCustomerRegion = []; for ($i = 1; $i < 11; ++$i) { @@ -645,7 +645,7 @@ final class BackendController extends Controller ]; } - $view->addData('annualCustomerRegion', $annualCustomerRegion); + $view->data['annualCustomerRegion'] = $annualCustomerRegion; ///// $currentCustomersRep = []; @@ -659,7 +659,7 @@ final class BackendController extends Controller return $b['customers'] <=> $a['customers']; }); - $view->addData('currentCustomersRep', $currentCustomersRep); + $view->data['currentCustomersRep'] = $currentCustomersRep; $annualCustomersRep = []; for ($i = 1; $i < 13; ++$i) { @@ -673,7 +673,7 @@ final class BackendController extends Controller } } - $view->addData('annualCustomersRep', $annualCustomersRep); + $view->data['annualCustomersRep'] = $annualCustomersRep; ///// $currentCustomersCountry = []; @@ -688,7 +688,7 @@ final class BackendController extends Controller return $b['customers'] <=> $a['customers']; }); - $view->addData('currentCustomersCountry', $currentCustomersCountry); + $view->data['currentCustomersCountry'] = $currentCustomersCountry; $annualCustomersCountry = []; for ($i = 1; $i < 51; ++$i) { @@ -706,7 +706,7 @@ final class BackendController extends Controller } } - $view->addData('annualCustomersCountry', $annualCustomersCountry); + $view->data['annualCustomersCountry'] = $annualCustomersCountry; ///// $customerGroups = []; @@ -716,7 +716,7 @@ final class BackendController extends Controller ]; } - $view->addData('customerGroups', $customerGroups); + $view->data['customerGroups'] = $customerGroups; return $view; } @@ -735,14 +735,14 @@ final class BackendController extends Controller */ public function viewItemPurchaseAnalysis(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface { - $head = $response->get('Content')->getData('head'); + $head = $response->get('Content')->head; $head->addAsset(AssetType::CSS, 'Resources/chartjs/Chartjs/chart.css'); $head->addAsset(AssetType::JSLATE, 'Resources/chartjs/Chartjs/chart.js'); $head->addAsset(AssetType::JSLATE, 'Modules/ClientManagement/Controller.js', ['type' => 'module']); $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/ItemManagement/Theme/Backend/item-analysis'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001602001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001602001, $request, $response); $monthlySalesCosts = []; for ($i = 1; $i < 13; ++$i) { @@ -754,7 +754,7 @@ final class BackendController extends Controller ]; } - $view->addData('monthlySalesCosts', $monthlySalesCosts); + $view->data['monthlySalesCosts'] = $monthlySalesCosts; ///// $monthlySalesCustomer = []; @@ -767,7 +767,7 @@ final class BackendController extends Controller ]; } - $view->addData('monthlySalesCustomer', $monthlySalesCustomer); + $view->data['monthlySalesCustomer'] = $monthlySalesCustomer; $annualSalesCustomer = []; for ($i = 1; $i < 11; ++$i) { @@ -778,7 +778,7 @@ final class BackendController extends Controller ]; } - $view->addData('annualSalesCustomer', $annualSalesCustomer); + $view->data['annualSalesCustomer'] = $annualSalesCustomer; ///// $monthlyCustomerRetention = []; @@ -789,7 +789,7 @@ final class BackendController extends Controller ]; } - $view->addData('monthlyCustomerRetention', $monthlyCustomerRetention); + $view->data['monthlyCustomerRetention'] = $monthlyCustomerRetention; ///// $currentCustomerRegion = [ @@ -801,7 +801,7 @@ final class BackendController extends Controller 'Other' => (int) (\mt_rand(200, 400) / 4), ]; - $view->addData('currentCustomerRegion', $currentCustomerRegion); + $view->data['currentCustomerRegion'] = $currentCustomerRegion; $annualCustomerRegion = []; for ($i = 1; $i < 11; ++$i) { @@ -817,7 +817,7 @@ final class BackendController extends Controller ]; } - $view->addData('annualCustomerRegion', $annualCustomerRegion); + $view->data['annualCustomerRegion'] = $annualCustomerRegion; ///// $currentCustomersRep = []; @@ -831,7 +831,7 @@ final class BackendController extends Controller return $b['customers'] <=> $a['customers']; }); - $view->addData('currentCustomersRep', $currentCustomersRep); + $view->data['currentCustomersRep'] = $currentCustomersRep; $annualCustomersRep = []; for ($i = 1; $i < 13; ++$i) { @@ -845,7 +845,7 @@ final class BackendController extends Controller } } - $view->addData('annualCustomersRep', $annualCustomersRep); + $view->data['annualCustomersRep'] = $annualCustomersRep; ///// $currentCustomersCountry = []; @@ -860,7 +860,7 @@ final class BackendController extends Controller return $b['customers'] <=> $a['customers']; }); - $view->addData('currentCustomersCountry', $currentCustomersCountry); + $view->data['currentCustomersCountry'] = $currentCustomersCountry; $annualCustomersCountry = []; for ($i = 1; $i < 51; ++$i) { @@ -878,7 +878,7 @@ final class BackendController extends Controller } } - $view->addData('annualCustomersCountry', $annualCustomersCountry); + $view->data['annualCustomersCountry'] = $annualCustomersCountry; ///// $customerGroups = []; @@ -888,7 +888,7 @@ final class BackendController extends Controller ]; } - $view->addData('customerGroups', $customerGroups); + $view->data['customerGroups'] = $customerGroups; return $view; } diff --git a/Theme/Backend/attribute-type-list.tpl.php b/Theme/Backend/attribute-type-list.tpl.php index 95435c9..204aaae 100755 --- a/Theme/Backend/attribute-type-list.tpl.php +++ b/Theme/Backend/attribute-type-list.tpl.php @@ -15,9 +15,9 @@ declare(strict_types=1); use phpOMS\Uri\UriFactory; /** @var \phpOMS\Views\View $this */ -$attributes = $this->getData('attributes'); +$attributes = $this->data['attributes']; -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/attribute-type.tpl.php b/Theme/Backend/attribute-type.tpl.php index bed6997..ab560c4 100755 --- a/Theme/Backend/attribute-type.tpl.php +++ b/Theme/Backend/attribute-type.tpl.php @@ -17,10 +17,10 @@ use phpOMS\Localization\ISO639Enum; $types = AttributeValueType::getConstants(); -$attribute = $this->getData('attribute'); -$l11ns = $this->getData('l11ns'); +$attribute = $this->data['attribute']; +$l11ns = $this->data['l11ns']; -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/item-analysis.tpl.php b/Theme/Backend/item-analysis.tpl.php index 32f2ac4..e85d475 100755 --- a/Theme/Backend/item-analysis.tpl.php +++ b/Theme/Backend/item-analysis.tpl.php @@ -16,4 +16,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/item-create.tpl.php b/Theme/Backend/item-create.tpl.php index f5ff3ff..602c1e6 100755 --- a/Theme/Backend/item-create.tpl.php +++ b/Theme/Backend/item-create.tpl.php @@ -15,7 +15,7 @@ declare(strict_types=1); /** * @var \phpOMS\Views\View $this */ -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/item-list.tpl.php b/Theme/Backend/item-list.tpl.php index 1c18d6b..8df3da0 100755 --- a/Theme/Backend/item-list.tpl.php +++ b/Theme/Backend/item-list.tpl.php @@ -16,9 +16,9 @@ use phpOMS\Uri\UriFactory; /** @var \phpOMS\Views\View $this */ /** @var \Modules\ItemManagement\Models\Item[] $items */ -$items = $this->getData('items') ?? []; +$items = $this->data['items'] ?? []; -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/item-profile.tpl.php b/Theme/Backend/item-profile.tpl.php index ce391a4..39d0627 100755 --- a/Theme/Backend/item-profile.tpl.php +++ b/Theme/Backend/item-profile.tpl.php @@ -21,7 +21,7 @@ use phpOMS\Message\Http\HttpHeader; use phpOMS\Uri\UriFactory; /** @var \Modules\ItemManagement\Models\Item $item */ -$item = $this->getData('item'); +$item = $this->data['item']; $attribute = $item->getAttributes(); @@ -29,19 +29,19 @@ $notes = $item->getNotes(); $files = $item->files; $itemImage = $this->getData('itemImage') ?? new NullMedia(); -$newestInvoices = $this->getData('newestInvoices') ?? []; -$allInvoices = $this->getData('allInvoices') ?? []; +$newestInvoices = $this->data['newestInvoices'] ?? []; +$allInvoices = $this->data['allInvoices'] ?? []; $topCustomers = $this->getData('topCustomers') ?? [[], []]; -$regionSales = $this->getData('regionSales') ?? []; -$countrySales = $this->getData('countrySales') ?? []; -$monthlySalesCosts = $this->getData('monthlySalesCosts') ?? []; +$regionSales = $this->data['regionSales'] ?? []; +$countrySales = $this->data['countrySales'] ?? []; +$monthlySalesCosts = $this->data['monthlySalesCosts'] ?? []; $languages = ISO639Enum::getConstants(); /** @var \phpOMS\Localization\Localization $l11n */ $l11n = $this->getData('defaultlocalization') ?? new NullLocalization(); -echo $this->getData('nav')->render(); +echo $this->data['nav']->render(); ?>
@@ -484,7 +484,7 @@ echo $this->getData('nav')->render(); getData('attributeTypes') ?? []; + $types = $this->data['attributeTypes'] ?? []; foreach ($types as $type) : ?>