From 112e06e89892fc0944e7f2f1f002771cc3e966de Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 24 Nov 2020 17:31:19 +0100 Subject: [PATCH] remove some getter/setter --- Models/Audit.php | 28 ++-------------------------- Theme/Backend/audit-list.tpl.php | 4 ++-- Theme/Backend/audit-single.tpl.php | 4 ++-- tests/Models/AuditTest.php | 6 +++--- 4 files changed, 9 insertions(+), 33 deletions(-) diff --git a/Models/Audit.php b/Models/Audit.php index 84a79e0..4b2edf0 100755 --- a/Models/Audit.php +++ b/Models/Audit.php @@ -101,7 +101,7 @@ class Audit * @var Account * @since 1.0.0 */ - private Account $createdBy; + public Account $createdBy; /** * Created at. @@ -109,7 +109,7 @@ class Audit * @var \DateTimeImmutable * @since 1.0.0 */ - private \DateTimeImmutable $createdAt; + public \DateTimeImmutable $createdAt; /** * Ip of creator. @@ -255,30 +255,6 @@ class Audit return $this->new; } - /** - * Get created by. - * - * @return Account|int - * - * @since 1.0.0 - */ - public function getCreatedBy() - { - return $this->createdBy; - } - - /** - * Get created at. - * - * @return \DateTimeImmutable - * - * @since 1.0.0 - */ - public function getCreatedAt() : \DateTimeImmutable - { - return $this->createdAt; - } - /** * Get ip. * diff --git a/Theme/Backend/audit-list.tpl.php b/Theme/Backend/audit-list.tpl.php index bd53a20..69643a6 100755 --- a/Theme/Backend/audit-list.tpl.php +++ b/Theme/Backend/audit-list.tpl.php @@ -65,9 +65,9 @@ echo $this->getData('nav')->render(); ?> printHtml($audit->getOld()); ?> printHtml($audit->getNew()); ?> printHtml($audit->getContent()); ?> - printHtml($audit->getCreatedBy()->getName()); ?> + printHtml($audit->createdBy->login); ?> printHtml($audit->getRef()); ?> - getCreatedAt()->format('Y-m-d H:i'); ?> + createdAt->format('Y-m-d H:i'); ?> getHtml('Empty', '0', '0'); ?> diff --git a/Theme/Backend/audit-single.tpl.php b/Theme/Backend/audit-single.tpl.php index 47219cb..d16d0d5 100755 --- a/Theme/Backend/audit-single.tpl.php +++ b/Theme/Backend/audit-single.tpl.php @@ -51,10 +51,10 @@ echo $this->getData('nav')->render(); Created By - getCreatedBy()->getName1(); ?> + createdBy->name1; ?> Created At - getDateTime($audit->getCreatedAt(), 'long'); ?> + getDateTime($audit->createdAt, 'long'); ?> Module getModule(); ?> diff --git a/tests/Models/AuditTest.php b/tests/Models/AuditTest.php index 087a71c..d7b3a58 100755 --- a/tests/Models/AuditTest.php +++ b/tests/Models/AuditTest.php @@ -41,8 +41,8 @@ class AuditTest extends \PHPUnit\Framework\TestCase self::assertNull($audit->getOld()); self::assertNull($audit->getNew()); self::assertEquals(0, $audit->getIp()); - self::assertEquals(0, $audit->getCreatedBy()->getId()); - self::assertInstanceOf('\DateTimeImmutable', $audit->getCreatedAt()); + self::assertEquals(0, $audit->createdBy->getId()); + self::assertInstanceOf('\DateTimeImmutable', $audit->createdAt); } /** @@ -70,6 +70,6 @@ class AuditTest extends \PHPUnit\Framework\TestCase self::assertEquals('old', $audit->getOld()); self::assertEquals('new', $audit->getNew()); self::assertEquals(\ip2long('127.0.0.1'), $audit->getIp()); - self::assertEquals(0, $audit->getCreatedBy()->getId()); + self::assertEquals(0, $audit->createdBy->getId()); } }