From bcbb0eacb31cdd1d158e16f860f4c5a11322c2e4 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 24 Nov 2020 17:31:20 +0100 Subject: [PATCH] remove some getter/setter --- Controller/ApiController.php | 4 +- Interfaces/GSD/Importer.php | 51 +++++++++++----------- Interfaces/GSD/Model/GSDCostCenter.php | 28 +----------- Interfaces/GSD/Model/GSDCostObject.php | 28 +----------- Models/ExchangeLog.php | 14 +----- Theme/Backend/exchange-export-list.tpl.php | 2 +- Theme/Backend/exchange-import-list.tpl.php | 2 +- 7 files changed, 33 insertions(+), 96 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 9878a87..1d5ea1c 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -58,7 +58,7 @@ final class ApiController extends Controller $message = 'Import succeeded.'; } - $response->set($request->getUri()->__toString(), [ + $response->set($request->uri->__toString(), [ 'status' => $status, 'title' => 'Exchange', 'message' => $message, @@ -130,7 +130,7 @@ final class ApiController extends Controller { if (!empty($val = $this->validateInterfaceInstall($request))) { $response->set('interface_install', new FormValidation($val)); - $response->getHeader()->setStatusCode(RequestStatusCode::R_400); + $response->header->status = RequestStatusCode::R_400; return; } diff --git a/Interfaces/GSD/Importer.php b/Interfaces/GSD/Importer.php index 8ba743d..0e11515 100755 --- a/Interfaces/GSD/Importer.php +++ b/Interfaces/GSD/Importer.php @@ -139,7 +139,7 @@ final class Importer extends ImporterAbstract $this->remote->connect(); - $this->account = $request->getHeader()->getAccount(); + $this->account = $request->header->account; if ($this->remote->getStatus() !== DatabaseStatus::OK) { return false; @@ -200,8 +200,8 @@ final class Importer extends ImporterAbstract foreach ($costCenters as $cc) { $obj = new CostCenter(); - $obj->setCode($cc->getCostCenter()); - $obj->setName(\trim($cc->getDescription(), " ,\t")); + $obj->code = $cc->getCostCenter(); + $obj->l11n->name = \trim($cc->description, " ,\t"); CostCenterMapper::create($obj); } @@ -231,8 +231,8 @@ final class Importer extends ImporterAbstract foreach ($costObjects as $co) { $obj = new CostObject(); - $obj->setCode($co->getCostObject()); - $obj->setName(\trim($co->getDescription(), " ,\t")); + $obj->code = $co->getCostObject(); + $obj->l11n->name = \trim($co->description, " ,\t"); CostObjectMapper::create($obj); } @@ -262,22 +262,22 @@ final class Importer extends ImporterAbstract foreach ($customers as $customer) { $account = new Account(); - $account->setName1(\trim($customer->addr->name1, " ,\t")); + $account->name1 = \trim($customer->addr->name1, " ,\t"); $a = \trim($customer->addr->name2, " ,\t"); $b = \trim($customer->addr->name3, " ,\t"); - $account->setName2(\trim($a . ' ' . $b)); + $account->name2 = \trim($a . ' ' . $b); $profile = new Profile($account); $obj = new Client(); - $obj->setNumber(\trim($customer->number, "., \t")); - $obj->setProfile($profile); + $obj->number = \trim($customer->number, "., \t"); + $obj->profile = $profile; $addr = new Address(); - $addr->setAddress(\trim($customer->addr->street, ", \t")); - $addr->setPostal(\trim($customer->addr->zip, ",. \t")); - $addr->setCity(\trim($customer->addr->city, ",. \t")); + $addr->address = \trim($customer->addr->street, ", \t"); + $addr->postal = \trim($customer->addr->zip, ",. \t"); + $addr->city = \trim($customer->addr->city, ",. \t"); $addr->setCountry(ISO3166TwoEnum::_DEU); $obj->setMainAddress($addr); @@ -341,22 +341,22 @@ final class Importer extends ImporterAbstract foreach ($suppliers as $supplier) { $account = new Account(); - $account->setName1(\trim($supplier->addr->name1, " ,\t")); + $account->name1 = \trim($supplier->addr->name1, " ,\t"); $a = \trim($supplier->addr->name2, " ,\t"); $b = \trim($supplier->addr->name3, " ,\t"); - $account->setName2(\trim($a . ' ' . $b)); + $account->name2 = \trim($a . ' ' . $b); $profile = new Profile($account); $obj = new Supplier(); - $obj->setNumber(\trim($supplier->number, "., \t")); - $obj->setProfile($profile); + $obj->number = \trim($supplier->number, "., \t"); + $obj->profile = $profile; $addr = new Address(); - $addr->setAddress(\trim($supplier->addr->street, ", \t")); - $addr->setPostal(\trim($supplier->addr->zip, ",. \t")); - $addr->setCity(\trim($supplier->addr->city, ",. \t")); + $addr->address = \trim($supplier->addr->street, ", \t"); + $addr->postal = \trim($supplier->addr->zip, ",. \t"); + $addr->city = \trim($supplier->addr->city, ",. \t"); $addr->setCountry(ISO3166TwoEnum::_DEU); $obj->setMainAddress($addr); @@ -440,6 +440,7 @@ final class Importer extends ImporterAbstract $images = []; $imagePath = Controller::FILE_PATH . '/Modules/ItemManagement/Articles/Images'; + /** @var Media[] $media */ $media = []; if (!empty($files)) { if (!\is_dir($imagePath)) { @@ -463,13 +464,13 @@ final class Importer extends ImporterAbstract $number = (int) \explode('.', $image)[0]; $media[$number] = new Media(); - $media[$number]->setName((string) $number); - $media[$number]->setType('backend_image'); + $media[$number]->name = (string) $number; + $media[$number]->type = 'backend_image'; $media[$number]->setPath('/Modules/Media/Files/Modules/ItemManagement/Articles/Images/' . $image); $media[$number]->setVirtualPath('/Modules/ItemManagement/Articles/Images'); - $media[$number]->setExtension(\explode('.', $image)[1]); - $media[$number]->setSize((int) \filesize($imagePath . '/' . $image)); - $media[$number]->setCreatedBy(new NullAccount($this->account)); + $media[$number]->extension = \explode('.', $image)[1]; + $media[$number]->size = (int) \filesize($imagePath . '/' . $image); + $media[$number]->createdBy = new NullAccount($this->account); MediaMapper::create($media[$number]); } @@ -483,7 +484,7 @@ final class Importer extends ImporterAbstract $number = (int) \trim($article->number, ",. \t"); $obj = new Item(); - $obj->setNumber((string) $number); + $obj->number = (string) $number; // German Language $obj->addL11n(new ItemL11n( diff --git a/Interfaces/GSD/Model/GSDCostCenter.php b/Interfaces/GSD/Model/GSDCostCenter.php index d1ee33a..2ab12b5 100755 --- a/Interfaces/GSD/Model/GSDCostCenter.php +++ b/Interfaces/GSD/Model/GSDCostCenter.php @@ -46,7 +46,7 @@ class GSDCostCenter implements \JsonSerializable * @var \DateTimeImmutable * @since 1.0.0 */ - protected \DateTimeImmutable $createdAt; + public \DateTimeImmutable $createdAt; /** * Description. @@ -84,32 +84,6 @@ class GSDCostCenter implements \JsonSerializable return $this->createdAt ?? new \DateTimeImmutable(); } - /** - * Get created by - * - * @return int|\phpOMS\Account\Account - * - * @since 1.0.0 - */ - public function getCreatedBy() - { - return $this->createdBy; - } - - /** - * Set created by - * - * @param mixed $id Created by - * - * @return void - * - * @since 1.0.0 - */ - public function setCreatedBy($id) : void - { - $this->createdBy = $id; - } - /** * Set description * diff --git a/Interfaces/GSD/Model/GSDCostObject.php b/Interfaces/GSD/Model/GSDCostObject.php index 80da2a3..7d4a619 100755 --- a/Interfaces/GSD/Model/GSDCostObject.php +++ b/Interfaces/GSD/Model/GSDCostObject.php @@ -46,7 +46,7 @@ class GSDCostObject implements \JsonSerializable * @var \DateTimeImmutable * @since 1.0.0 */ - protected \DateTimeImmutable $createdAt; + public \DateTimeImmutable $createdAt; /** * Description. @@ -84,32 +84,6 @@ class GSDCostObject implements \JsonSerializable return $this->createdAt ?? new \DateTimeImmutable(); } - /** - * Get created by - * - * @return int|\phpOMS\Account\Account - * - * @since 1.0.0 - */ - public function getCreatedBy() - { - return $this->createdBy; - } - - /** - * Set created by - * - * @param mixed $id Created by - * - * @return void - * - * @since 1.0.0 - */ - public function setCreatedBy($id) : void - { - $this->createdBy = $id; - } - /** * Set description * diff --git a/Models/ExchangeLog.php b/Models/ExchangeLog.php index 8acbad0..ced426c 100644 --- a/Models/ExchangeLog.php +++ b/Models/ExchangeLog.php @@ -64,7 +64,7 @@ class ExchangeLog implements \JsonSerializable, ArrayableInterface * @var \DateTimeImmutable * @since 1.0.0 */ - private \DateTimeImmutable $createdAt; + public \DateTimeImmutable $createdAt; /** * Constructor. @@ -164,18 +164,6 @@ class ExchangeLog implements \JsonSerializable, ArrayableInterface $this->fields = $fields; } - /** - * Get created at. - * - * @return \DateTimeImmutable - * - * @since 1.0.0 - */ - public function getCreatedAt() : \DateTimeImmutable - { - return $this->createdAt; - } - /** * {@inheritdoc} */ diff --git a/Theme/Backend/exchange-export-list.tpl.php b/Theme/Backend/exchange-export-list.tpl.php index a53a896..bf40f8c 100755 --- a/Theme/Backend/exchange-export-list.tpl.php +++ b/Theme/Backend/exchange-export-list.tpl.php @@ -29,7 +29,7 @@ echo $this->getData('nav')->render(); $value) : ++$count; $url = \phpOMS\Uri\UriFactory::build('{/prefix}admin/exchange/export/profile?{?}&id=' . $value->getId()); ?> - printHtml($value->getName()); ?> + printHtml($value->name); ?> getHtml('Empty', '0', '0'); ?> diff --git a/Theme/Backend/exchange-import-list.tpl.php b/Theme/Backend/exchange-import-list.tpl.php index 7c2afb5..52d1fdc 100755 --- a/Theme/Backend/exchange-import-list.tpl.php +++ b/Theme/Backend/exchange-import-list.tpl.php @@ -29,7 +29,7 @@ echo $this->getData('nav')->render(); $value) : ++$count; $url = \phpOMS\Uri\UriFactory::build('{/prefix}admin/exchange/import/profile?{?}&id=' . $value->getId()); ?> - printHtml($value->getName()); ?> + printHtml($value->name); ?> getHtml('Empty', '0', '0'); ?>