From d82537a0c15f2c0ccfc42124420192d1b4fa19fd Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Tue, 24 Nov 2020 17:31:20 +0100
Subject: [PATCH] remove some getter/setter

---
 Controller/ApiController.php                  |  41 ++---
 Controller/BackendController.php              |   2 +-
 Models/Contact.php                            | 146 +-----------------
 Models/Profile.php                            |  85 +---------
 .../AccountGroupSelector/BaseView.php         |  14 +-
 .../AccountGroupSelector/base.tpl.php         |   2 +-
 .../AccountGroupSelector/popup.tpl.php        |   4 +-
 Theme/Backend/profile-list.tpl.php            |   8 +-
 Theme/Backend/profile-single.tpl.php          |  34 ++--
 tests/Controller/ApiControllerTest.php        |  18 +--
 tests/Models/ProfileMapperTest.php            |  26 ++--
 tests/Models/ProfileTest.php                  |  27 ++--
 12 files changed, 93 insertions(+), 314 deletions(-)

diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 2b54263..11a36e6 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -17,6 +17,7 @@ namespace Modules\Profile\Controller;
 use Modules\Admin\Models\AccountMapper;
 use Modules\Admin\Models\Address;
 use Modules\Admin\Models\AddressMapper;
+use Modules\Media\Models\NullMedia;
 use Modules\Media\Models\PathSettings;
 use Modules\Profile\Models\ContactElement;
 use Modules\Profile\Models\ContactElementMapper;
@@ -92,7 +93,7 @@ final class ApiController extends Controller
             return false;
         }
 
-        $this->createModel($request->getHeader()->getAccount(), $profile, ProfileMapper::class, 'profile', $request->getOrigin());
+        $this->createModel($request->header->account, $profile, ProfileMapper::class, 'profile', $request->getOrigin());
 
         return true;
     }
@@ -147,30 +148,30 @@ final class ApiController extends Controller
 
         if (empty($uploadedFiles)) {
             $this->fillJsonResponse($request, $response, NotificationLevel::ERROR, 'Profile', 'Invalid profile image', $uploadedFiles);
-            $response->getHeader()->setStatusCode(RequestStatusCode::R_400);
+            $response->header->status = RequestStatusCode::R_400;
 
             return;
         }
 
         /** @var Profile $profile */
-        $profile = ProfileMapper::getFor($request->getHeader()->getAccount(), 'account');
+        $profile = ProfileMapper::getFor($request->header->account, 'account');
         $old     = clone $profile;
 
         $uploaded = $this->app->moduleManager->get('Media')->uploadFiles(
             $request->getData('name') ?? '',
             $uploadedFiles,
-            $request->getHeader()->getAccount(),
-            'Modules/Media/Files/Accounts/' . $profile->getAccount()->getId() . ' ' . $profile->getAccount()->getName(),
-            '/Accounts/' . $profile->getAccount()->getId() . ' ' . $profile->getAccount()->getName(),
+            $request->header->account,
+            'Modules/Media/Files/Accounts/' . $profile->account->getId() . ' ' . $profile->account->login,
+            '/Accounts/' . $profile->account->getId() . ' ' . $profile->account->login,
             'profile_image',
             '',
             '',
             PathSettings::FILE_PATH
         );
 
-        $profile->setImage(\reset($uploaded));
+        $profile->image = !empty($uploaded) ? \reset($uploaded) : new NullMedia();
 
-        $this->updateModel($request->getHeader()->getAccount(), $old, $profile, ProfileMapper::class, 'profile', $request->getOrigin());
+        $this->updateModel($request->header->account, $old, $profile, ProfileMapper::class, 'profile', $request->getOrigin());
         $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Profile', 'Profile successfully updated', $profile);
     }
 
@@ -191,7 +192,7 @@ final class ApiController extends Controller
     {
         if (!empty($val = $this->validateContactElementCreate($request))) {
             $response->set('contact_element_create', new FormValidation($val));
-            $response->getHeader()->setStatusCode(RequestStatusCode::R_400);
+            $response->header->status = RequestStatusCode::R_400;
 
             return;
         }
@@ -201,8 +202,8 @@ final class ApiController extends Controller
 
         $contactElement = $this->createContactElementFromRequest($request);
 
-        $this->createModel($request->getHeader()->getAccount(), $contactElement, ContactElementMapper::class, 'profile-contactElement', $request->getOrigin());
-        $this->createModelRelation($request->getHeader()->getAccount(), $profile, $contactElement->getId(), ProfileMapper::class, 'contactElements', '', $request->getOrigin());
+        $this->createModel($request->header->account, $contactElement, ContactElementMapper::class, 'profile-contactElement', $request->getOrigin());
+        $this->createModelRelation($request->header->account, $profile, $contactElement->getId(), ProfileMapper::class, 'contactElements', '', $request->getOrigin());
         $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Contact Element', 'Contact element successfully created', $contactElement);
     }
 
@@ -265,7 +266,7 @@ final class ApiController extends Controller
     {
         if (!empty($val = $this->validateAddressCreate($request))) {
             $response->set('address_create', new FormValidation($val));
-            $response->getHeader()->setStatusCode(RequestStatusCode::R_400);
+            $response->header->status = RequestStatusCode::R_400;
 
             return;
         }
@@ -275,8 +276,8 @@ final class ApiController extends Controller
 
         $address = $this->createAddressFromRequest($request);
 
-        $this->createModel($request->getHeader()->getAccount(), $address, AddressMapper::class, 'profile-address', $request->getOrigin());
-        $this->createModelRelation($request->getHeader()->getAccount(), $profile, $address->getId(), ProfileMapper::class, 'location', '', $request->getOrigin());
+        $this->createModel($request->header->account, $address, AddressMapper::class, 'profile-address', $request->getOrigin());
+        $this->createModelRelation($request->header->account, $profile, $address->getId(), ProfileMapper::class, 'location', '', $request->getOrigin());
         $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Address', 'Address successfully created', $address);
     }
 
@@ -317,13 +318,13 @@ final class ApiController extends Controller
     {
         /** @var Address $element */
         $element = new Address();
-        $element->setName((string) ($request->getData('name') ?? ''));
-        $element->setAddition((string) ($request->getData('addition') ?? ''));
-        $element->setPostal((string) ($request->getData('postal') ?? ''));
-        $element->setCity((string) ($request->getData('city') ?? ''));
-        $element->setAddress((string) ($request->getData('address') ?? ''));
+        $element->name = (string) ($request->getData('name') ?? '');
+        $element->addition = (string) ($request->getData('addition') ?? '');
+        $element->postal = (string) ($request->getData('postal') ?? '');
+        $element->city = (string) ($request->getData('city') ?? '');
+        $element->address = (string) ($request->getData('address') ?? '');
+        $element->state = (string) ($request->getData('state') ?? '');
         $element->setCountry((string) ($request->getData('country') ?? ''));
-        $element->setState((string) ($request->getData('state') ?? ''));
         $element->setType((int) ($request->getData('type') ?? 0));
 
         return $element;
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 079750e..70c23f3 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -128,7 +128,7 @@ final class BackendController extends Controller
         $accGrpSelector = new \Modules\Profile\Theme\Backend\Components\AccountGroupSelector\BaseView($this->app->l11nManager, $request, $response);
         $view->addData('accGrpSelector', $accGrpSelector);
 
-        $view->setData('media', MediaMapper::getFor((int) $profile->getAccount()->getId(), 'createdBy'));
+        $view->setData('media', MediaMapper::getFor((int) $profile->account->getId(), 'createdBy'));
 
         return $view;
     }
diff --git a/Models/Contact.php b/Models/Contact.php
index 138338f..959bbcd 100644
--- a/Models/Contact.php
+++ b/Models/Contact.php
@@ -41,7 +41,7 @@ class Contact
      * @var string
      * @since 1.0.0
      */
-    protected string $name1 = '';
+    public string $name1 = '';
 
     /**
      * Name2
@@ -49,7 +49,7 @@ class Contact
      * @var string
      * @since 1.0.0
      */
-    protected string $name2 = '';
+    public string $name2 = '';
 
     /**
      * Name2
@@ -57,7 +57,7 @@ class Contact
      * @var string
      * @since 1.0.0
      */
-    protected string $name3 = '';
+    public string $name3 = '';
 
     /**
      * Description
@@ -65,7 +65,7 @@ class Contact
      * @var string
      * @since 1.0.0
      */
-    protected string $description = '';
+    public string $description = '';
 
     /**
      * Company name
@@ -73,7 +73,7 @@ class Contact
      * @var string
      * @since 1.0.0
      */
-    protected string $company = '';
+    public string $company = '';
 
     /**
      * Job title
@@ -81,7 +81,7 @@ class Contact
      * @var string
      * @since 1.0.0
      */
-    protected string $job = '';
+    public string $job = '';
 
     /**
      * Birthday
@@ -89,7 +89,7 @@ class Contact
      * @var null|\DateTime
      * @since 1.0.0
      */
-    protected ?\DateTime $birthday = null;
+    public ?\DateTime $birthday = null;
 
     /**
      * Contact image
@@ -97,7 +97,7 @@ class Contact
      * @var Media
      * @since 1.0.0
      */
-    protected Media $image;
+    public Media $image;
 
     /**
      * Profile this contact belongs to
@@ -128,134 +128,4 @@ class Contact
     {
         return $this->id;
     }
-
-    /**
-     * Get name1.
-     *
-     * @return string
-     *
-     * @since 1.0.0
-     */
-    public function getName1() : string
-    {
-        return $this->name1;
-    }
-
-    /**
-     * Set name1
-     *
-     * @param string $name Name
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
-    public function setName1(string $name) : void
-    {
-        $this->name1 = $name;
-    }
-
-    /**
-     * Get name2.
-     *
-     * @return string
-     *
-     * @since 1.0.0
-     */
-    public function getName2() : string
-    {
-        return $this->name2;
-    }
-
-    /**
-     * Set name2
-     *
-     * @param string $name Name
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
-    public function setName2(string $name) : void
-    {
-        $this->name2 = $name;
-    }
-
-    /**
-     * Get name3.
-     *
-     * @return string
-     *
-     * @since 1.0.0
-     */
-    public function getName3() : string
-    {
-        return $this->name3;
-    }
-
-    /**
-     * Set name3
-     *
-     * @param string $name Name
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
-    public function setName3(string $name) : void
-    {
-        $this->name3 = $name;
-    }
-
-    /**
-     * Get the contact description
-     *
-     * @return string
-     *
-     * @since 1.0.0
-     */
-    public function getDescription() : string
-    {
-        return $this->description;
-    }
-
-    /**
-     * Set the description
-     *
-     * @param string $description Description
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
-    public function setDescription(string $description) : void
-    {
-        $this->description = $description;
-    }
-
-    /**
-     * Set the image
-     *
-     * @param Media $image Image
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
-    public function setImage(Media $image) : void
-    {
-        $this->image = $image;
-    }
-
-    /**
-     * Get the image
-     *
-     * @return Media
-     *
-     * @since 1.0.0
-     */
-    public function getImage() : Media
-    {
-        return $this->image;
-    }
 }
diff --git a/Models/Profile.php b/Models/Profile.php
index 1aa75fd..b790e0d 100755
--- a/Models/Profile.php
+++ b/Models/Profile.php
@@ -45,7 +45,7 @@ class Profile implements \JsonSerializable
      * @var Media
      * @since 1.0.0
      */
-    protected Media $image;
+    public Media $image;
 
     /**
      * Birthday.
@@ -53,7 +53,7 @@ class Profile implements \JsonSerializable
      * @var null|\DateTime
      * @since 1.0.0
      */
-    protected ?\DateTime $birthday = null;
+    public ?\DateTime $birthday = null;
 
     /**
      * Account.
@@ -61,7 +61,7 @@ class Profile implements \JsonSerializable
      * @var Account
      * @since 1.0.0
      */
-    protected Account $account;
+    public Account $account;
 
     /**
      * Location data.
@@ -105,7 +105,6 @@ class Profile implements \JsonSerializable
     public function __construct(Account $account = null)
     {
         $this->image    = new NullMedia();
-        $this->birthday = new \DateTime('now');
         $this->account  = $account ?? new NullAccount();
     }
 
@@ -237,84 +236,6 @@ class Profile implements \JsonSerializable
         $this->contactElements[] = $contactElement;
     }
 
-    /**
-     * Get account image.
-     *
-     * @return Media
-     *
-     * @since 1.0.0
-     */
-    public function getImage() : Media
-    {
-        return $this->image ?? new NullMedia();
-    }
-
-    /**
-     * Set account image.
-     *
-     * @param Media $image Profile image
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
-    public function setImage(Media $image) : void
-    {
-        $this->image = $image;
-    }
-
-    /**
-     * Set account.
-     *
-     * @param Account $account Profile account
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
-    public function setAccount(Account $account) : void
-    {
-        $this->account = $account;
-    }
-
-    /**
-     * Get account.
-     *
-     * @return Account
-     *
-     * @since 1.0.0
-     */
-    public function getAccount() : Account
-    {
-        return $this->account ?? new NullAccount();
-    }
-
-    /**
-     * Set birthday.
-     *
-     * @param null|\DateTime $birthday Birthday
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
-    public function setBirthday(?\DateTime $birthday) : void
-    {
-        $this->birthday = $birthday;
-    }
-
-    /**
-     * Get birthday.
-     *
-     * @return null|\DateTime
-     *
-     * @since 1.0.0
-     */
-    public function getBirthday() : ?\DateTime
-    {
-        return $this->birthday;
-    }
-
     /**
      * {@inheritdoc}
      */
diff --git a/Theme/Backend/Components/AccountGroupSelector/BaseView.php b/Theme/Backend/Components/AccountGroupSelector/BaseView.php
index c798f50..3230557 100755
--- a/Theme/Backend/Components/AccountGroupSelector/BaseView.php
+++ b/Theme/Backend/Components/AccountGroupSelector/BaseView.php
@@ -52,7 +52,7 @@ class BaseView extends View
      * @var string
      * @since 1.0.0
      */
-    private string $name = '';
+    public string $name = '';
 
     /**
      * {@inheritdoc}
@@ -78,18 +78,6 @@ class BaseView extends View
         return $this->id;
     }
 
-    /**
-     * Get name
-     *
-     * @return string
-     *
-     * @since 1.0.0
-     */
-    public function getName() : string
-    {
-        return $this->name;
-    }
-
     /**
      * Is required?
      *
diff --git a/Theme/Backend/Components/AccountGroupSelector/base.tpl.php b/Theme/Backend/Components/AccountGroupSelector/base.tpl.php
index a35f361..6126e63 100755
--- a/Theme/Backend/Components/AccountGroupSelector/base.tpl.php
+++ b/Theme/Backend/Components/AccountGroupSelector/base.tpl.php
@@ -44,7 +44,7 @@
 </div>
 <div class="box" id="<?= $this->printHtml($this->getId()); ?>-tags" data-limit="0" data-active="true">
     <template id="<?= $this->printHtml($this->getId()); ?>-tagTemplate">
-        <span class="tag red" data-tpl-value="/id" data-value="" data-uuid="" data-name="<?= $this->printHtml($this->getName()); ?>">
+        <span class="tag red" data-tpl-value="/id" data-value="" data-uuid="" data-name="<?= $this->printHtml($this->name); ?>">
             <i class="fa fa-times"></i>
             <span style="display: none;" data-name="type_prefix" data-tpl-value="/type_prefix" data-value=""></span>
             <span data-tpl-text="/id" data-name="id" data-tpl-value="/id" data-value=""></span>
diff --git a/Theme/Backend/Components/AccountGroupSelector/popup.tpl.php b/Theme/Backend/Components/AccountGroupSelector/popup.tpl.php
index 3043515..a03c94a 100755
--- a/Theme/Backend/Components/AccountGroupSelector/popup.tpl.php
+++ b/Theme/Backend/Components/AccountGroupSelector/popup.tpl.php
@@ -11,7 +11,7 @@
                 </ul>
             </div>
             <div class="tab-content">
-                <input type="radio" id="c-tab-1" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-1' ? ' checked' : ''; ?>>
+                <input type="radio" id="c-tab-1" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-1' ? ' checked' : ''; ?>>
                 <div class="tab">
                     <label for="iSearchAcc">Search</label>
                     <input type="text" id="iSearchAcc" name="receiver-search" data-action='[
@@ -54,7 +54,7 @@
                             }
                         ]'><?= $this->getHtml('Close', 'Admin'); ?></button>
                 </div>
-                <input type="radio" id="c-tab-2" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-2' ? ' checked' : ''; ?>>
+                <input type="radio" id="c-tab-2" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-2' ? ' checked' : ''; ?>>
                 <div class="tab">
                     <label for="iSearchGrp">Search</label>
                     <input type="text" id="iSearchGrp" name="receiver-search" data-action='[
diff --git a/Theme/Backend/profile-list.tpl.php b/Theme/Backend/profile-list.tpl.php
index 0d100a2..1cd1c8b 100755
--- a/Theme/Backend/profile-list.tpl.php
+++ b/Theme/Backend/profile-list.tpl.php
@@ -40,11 +40,11 @@ $next     = empty($accounts) ? '{/prefix}profile/list' : '{/prefix}profile/list?
                     <tr tabindex="0" tabindex="0" data-href="<?= $url; ?>">
                         <td><a href="<?= $url; ?>"><img width="30" loading="lazy" class="profile-image"
                             src="<?=
-                                    $account->getImage() instanceof NullMedia ?
+                                    $account->image instanceof NullMedia ?
                                         UriFactory::build('Web/Backend/img/user_default_' . \mt_rand(1, 6) .'.png') :
-                                        UriFactory::build('{/prefix}' . $account->getImage()->getPath()); ?>"></a>
-                        <td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($account->getAccount()->getName3() . ' ' . $account->getAccount()->getName2() . ' ' . $account->getAccount()->getName1()); ?></a>
-                        <td  data-label="<?= $this->getHtml('Activity'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($account->getAccount()->getLastActive()->format('Y-m-d')); ?></a>
+                                        UriFactory::build('{/prefix}' . $account->image->getPath()); ?>"></a>
+                        <td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($account->account->name3 . ' ' . $account->account->name2 . ' ' . $account->account->name1); ?></a>
+                        <td  data-label="<?= $this->getHtml('Activity'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($account->account->getLastActive()->format('Y-m-d')); ?></a>
                 <?php endforeach; ?>
                 <?php if ($count === 0) : ?>
                 <tr><td colspan="3" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
diff --git a/Theme/Backend/profile-single.tpl.php b/Theme/Backend/profile-single.tpl.php
index ed9c8f9..4260778 100755
--- a/Theme/Backend/profile-single.tpl.php
+++ b/Theme/Backend/profile-single.tpl.php
@@ -22,8 +22,8 @@ use phpOMS\Uri\UriFactory;
 $profile = $this->getData('account');
 $media   = $this->getDatA('media') ?? [];
 
-$account = $profile->getAccount();
-$l11n    = $account->getL11n();
+$account = $profile->account;
+$l11n    = $account->l11n;
 
 echo $this->getData('nav')->render();
 ?>
@@ -31,24 +31,24 @@ echo $this->getData('nav')->render();
     <div class="box wf-100 col-xs-12">
         <ul class="tab-links">
             <li><label for="c-tab-1"><?= $this->getHtml('General'); ?></label></li>
-            <?php if ($this->request->getHeader()->getAccount() === $account->getId()) : ?>
+            <?php if ($this->request->header->account === $account->getId()) : ?>
             <li><label for="c-tab-2"><?= $this->getHtml('Localization'); ?></label></li>
             <?php endif; ?>
         </ul>
     </div>
     <div class="tab-content">
-        <input type="radio" id="c-tab-1" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-1' ? ' checked' : ''; ?>>
+        <input type="radio" id="c-tab-1" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-1' ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12">
                     <div class="portlet" itemscope itemtype="http://schema.org/Person" itemtype="http://schema.org/Organization">
                         <div class="portlet-head">
-                            <?php if (!empty($account->getName3()) || !empty($account->getName2())) : ?>
+                            <?php if (!empty($account->name3) || !empty($account->name2)) : ?>
                                 <span itemprop="familyName" itemprop="legalName">
-                                    <?= $this->printHtml(empty($account->getName3()) ? $account->getName2() : $account->getName3()); ?></span>,
+                                    <?= $this->printHtml(empty($account->name3) ? $account->name2 : $account->name3); ?></span>,
                             <?php endif; ?>
                             <span itemprop="givenName" itemprop="legalName">
-                                <?= $this->printHtml($account->getName1()); ?>
+                                <?= $this->printHtml($account->name1); ?>
                             </span>
                         </div>
                         <div class="portlet-body">
@@ -57,11 +57,11 @@ echo $this->getData('nav')->render();
                                     alt="<?= $this->getHtml('ProfileImage'); ?>"
                                     itemprop="logo" loading="lazy"
                                     src="<?=
-                                        $profile->getImage() instanceof NullMedia ?
+                                        $profile->image instanceof NullMedia ?
                                             UriFactory::build('Web/Backend/img/user_default_' . \mt_rand(1, 6) .'.png') :
-                                            UriFactory::build('{/prefix}' . $profile->getImage()->getPath()); ?>"
+                                            UriFactory::build('{/prefix}' . $profile->image->getPath()); ?>"
                                 width="100px"></div>
-                                <?php if ($this->request->getHeader()->getAccount() === $account->getId()) : ?>
+                                <?php if ($this->request->header->account === $account->getId()) : ?>
                                     <div><a id="iProfileUploadButton" href="#upload" data-action='[
                                         {"listener": "click", "key": 1, "action": [
                                             {"key": 1, "type": "event.prevent"},
@@ -78,7 +78,7 @@ echo $this->getData('nav')->render();
                             <table class="list" style="table-layout: fixed">
                                 <tr>
                                     <th><?= $this->getHtml('Birthday'); ?>
-                                    <td itemprop="birthDate" itemprop="foundingDate"><?= $this->getDateTime($profile->getBirthday()); ?>
+                                    <td itemprop="birthDate" itemprop="foundingDate"><?= $this->getDateTime($profile->birthday); ?>
                                 <tr>
                                     <th><?= $this->getHtml('Email'); ?>
                                     <td itemprop="email"><a href="mailto:>donald.duck@email.com<"><?= $this->printHtml($account->getEmail()); ?></a>
@@ -98,10 +98,10 @@ echo $this->getData('nav')->render();
                                         <td>
                                     <tr>
                                         <th>
-                                        <td><?= $this->printHtml($location->getAddress()); ?>
+                                        <td><?= $this->printHtml($location->address); ?>
                                     <tr>
                                         <th>
-                                        <td><?= $this->printHtml($location->getPostal() . ', ' . $location->getCity()); ?>
+                                        <td><?= $this->printHtml($location->postal . ', ' . $location->city); ?>
                                     <tr>
                                         <th>
                                         <td><?= $this->printHtml(ISO3166NameEnum::getByName(ISO3166TwoEnum::getName($location->getCountry()))); ?>
@@ -123,7 +123,7 @@ echo $this->getData('nav')->render();
                                 <?php endforeach; endif; ?>
                                 <tr>
                                     <th><?= $this->getHtml('Registered'); ?>
-                                    <td><?= $this->printHtml($account->getCreatedAt()->format('Y-m-d')); ?>
+                                    <td><?= $this->printHtml($account->createdAt->format('Y-m-d')); ?>
                                 <tr>
                                     <th><?= $this->getHtml('LastLogin'); ?>
                                     <td><?= $this->printHtml($account->getLastActive()->format('Y-m-d')); ?>
@@ -132,7 +132,7 @@ echo $this->getData('nav')->render();
                                     <td><span class="tag green"><?= $this->getHtml(':s' . $account->getStatus(), 'Admin'); ?></span>
                             </table>
                         </div>
-                        <?php if ($this->request->getHeader()->getAccount() === $account->getId()) : ?>
+                        <?php if ($this->request->header->account === $account->getId()) : ?>
                         <div class="portlet-foot"><button class="update"><?= $this->getHtml('Edit', '0', '0'); ?></button></div>
                         <?php endif; ?>
                     </div>
@@ -149,7 +149,7 @@ echo $this->getData('nav')->render();
                 </div>
             </div>
         </div>
-        <?php if ($this->request->getHeader()->getAccount() === $account->getId()) :
+        <?php if ($this->request->header->account === $account->getId()) :
             $countryCodes    = \phpOMS\Localization\ISO3166TwoEnum::getConstants();
             $countries       = \phpOMS\Localization\ISO3166NameEnum::getConstants();
             $timezones       = \phpOMS\Localization\TimeZoneEnumArray::getConstants();
@@ -165,7 +165,7 @@ echo $this->getData('nav')->render();
             $volumes      = \phpOMS\Utils\Converter\VolumeType::getConstants();
             $temperatures = \phpOMS\Utils\Converter\TemperatureType::getConstants();
         ?>
-        <input type="radio" id="c-tab-2" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-2' ? ' checked' : ''; ?>>
+        <input type="radio" id="c-tab-2" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-2' ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12 col-md-4">
diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php
index 5378b85..c51901b 100755
--- a/tests/Controller/ApiControllerTest.php
+++ b/tests/Controller/ApiControllerTest.php
@@ -91,12 +91,12 @@ class ApiControllerTest extends \PHPUnit\Framework\TestCase
         $response = new HttpResponse();
         $request  = new HttpRequest(new HttpUri(''));
 
-        $request->getHeader()->setAccount(1);
+        $request->header->account = 1;
         $request->setData('iaccount-idlist', '1');
 
         $this->module->apiProfileCreate($request, $response);
 
-        self::assertEquals('admin', $response->get('')['response'][0]->getAccount()->getName());
+        self::assertEquals('admin', $response->get('')['response'][0]->account->login);
         self::assertGreaterThan(0, $response->get('')['response'][0]->getId());
     }
 
@@ -108,11 +108,11 @@ class ApiControllerTest extends \PHPUnit\Framework\TestCase
     {
         $request  = new HttpRequest(new HttpUri(''));
 
-        $request->getHeader()->setAccount(1);
+        $request->header->account = 1;
 
         $profile = new Profile(new \Modules\Admin\Models\Account());
-        $profile->getAccount()->setName('ProfileCreateDb');
-        $profile->getAccount()->setEmail('profile_create_db@email.com');
+        $profile->account->login = 'ProfileCreateDb';
+        $profile->account->setEmail('profile_create_db@email.com');
 
         $this->module->apiProfileCreateDbEntry($profile, $request);
     }
@@ -128,7 +128,7 @@ class ApiControllerTest extends \PHPUnit\Framework\TestCase
         $response = new HttpResponse();
         $request  = new HttpRequest(new HttpUri(''));
 
-        $request->getHeader()->setAccount(1);
+        $request->header->account = 1;
         $request->setData('name', 'Profile Logo');
         $request->setData('id', 1);
 
@@ -143,8 +143,8 @@ class ApiControllerTest extends \PHPUnit\Framework\TestCase
         ]);
         $this->module->apiSettingsAccountImageSet($request, $response);
 
-        $image = ProfileMapper::get(3)->getImage();
-        self::assertEquals('Profile Logo', $image->getName());
+        $image = ProfileMapper::get(3)->image;
+        self::assertEquals('Profile Logo', $image->name);
     }
 
     /**
@@ -158,6 +158,6 @@ class ApiControllerTest extends \PHPUnit\Framework\TestCase
 
         $this->module->apiSettingsAccountImageSet($request, $response);
 
-        self::assertEquals(RequestStatusCode::R_400, $response->getHeader()->getStatusCode());
+        self::assertEquals(RequestStatusCode::R_400, $response->header->status);
     }
 }
diff --git a/tests/Models/ProfileMapperTest.php b/tests/Models/ProfileMapperTest.php
index b96083f..15e5d0f 100755
--- a/tests/Models/ProfileMapperTest.php
+++ b/tests/Models/ProfileMapperTest.php
@@ -32,33 +32,33 @@ class ProfileMapperTest extends \PHPUnit\Framework\TestCase
     public function testCRUD() : void
     {
         $media = new Media();
-        $media->setCreatedBy(new NullAccount(1));
-        $media->setDescription('desc');
+        $media->createdBy = new NullAccount(1);
+        $media->description = 'desc';
         $media->setPath('Web/Backend/img/default-user.jpg');
-        $media->setSize(11);
-        $media->setExtension('png');
-        $media->setName('Image');
+        $media->size = 11;
+        $media->extension = 'png';
+        $media->name = 'Image';
 
         if (($profile = ProfileMapper::getFor(1, 'account'))->getId() === 0) {
             $profile = new Profile();
 
-            $profile->setAccount(AccountMapper::get(1));
-            $profile->setImage($media);
-            $profile->setBirthday($date = new \DateTime('now'));
+            $profile->account = AccountMapper::get(1);
+            $profile->image = $media;
+            $profile->birthday =  new \DateTime('now');
 
             $id = ProfileMapper::create($profile);
             self::assertGreaterThan(0, $profile->getId());
             self::assertEquals($id, $profile->getId());
         } else {
-            $profile->setImage($media);
-            $profile->setBirthday($date = new \DateTime('now'));
+            $profile->image = $media;
+            $profile->birthday =  new \DateTime('now');
 
             ProfileMapper::update($profile);
         }
 
         $profileR = ProfileMapper::get($profile->getId());
-        self::assertEquals($profile->getBirthday()->format('Y-m-d'), $profileR->getBirthday()->format('Y-m-d'));
-        self::assertEquals($profile->getImage()->getName(), $profileR->getImage()->getName());
-        self::assertEquals($profile->getAccount()->getName1(), $profileR->getAccount()->getName1());
+        self::assertEquals($profile->birthday->format('Y-m-d'), $profileR->birthday->format('Y-m-d'));
+        self::assertEquals($profile->image->name, $profileR->image->name);
+        self::assertEquals($profile->account->name1, $profileR->account->name1);
     }
 }
diff --git a/tests/Models/ProfileTest.php b/tests/Models/ProfileTest.php
index f0c95c9..9c99d0d 100755
--- a/tests/Models/ProfileTest.php
+++ b/tests/Models/ProfileTest.php
@@ -45,9 +45,9 @@ class ProfileTest extends \PHPUnit\Framework\TestCase
         self::assertEquals(SexType::OTHER, $this->profile->getSex());
         self::assertEquals([], $this->profile->getLocation());
         self::assertEquals([], $this->profile->getContactElements());
-        self::assertInstanceOf('\Modules\Media\Models\Media', $this->profile->getImage());
-        self::assertInstanceOf('\Modules\Admin\Models\Account', $this->profile->getAccount());
-        self::assertInstanceOf('\DateTime', $this->profile->getBirthday());
+        self::assertInstanceOf('\Modules\Media\Models\Media', $this->profile->image);
+        self::assertInstanceOf('\Modules\Admin\Models\Account', $this->profile->account);
+        self::assertEquals(null, $this->profile->birthday);
     }
 
     /**
@@ -98,8 +98,8 @@ class ProfileTest extends \PHPUnit\Framework\TestCase
      */
     public function testBirthdayInputOutput() : void
     {
-        $this->profile->setBirthday($date = new \DateTime('now'));
-        self::assertEquals($date, $this->profile->getBirthday());
+        $this->profile->birthday = ($date = new \DateTime('now'));
+        self::assertEquals($date, $this->profile->birthday);
     }
 
     /**
@@ -108,8 +108,8 @@ class ProfileTest extends \PHPUnit\Framework\TestCase
      */
     public function testImageInputOutput() : void
     {
-        $this->profile->setImage(new NullMedia(1));
-        self::assertEquals(1, $this->profile->getImage()->getId());
+        $this->profile->image = new NullMedia(1);
+        self::assertEquals(1, $this->profile->image->getId());
     }
 
     /**
@@ -138,11 +138,11 @@ class ProfileTest extends \PHPUnit\Framework\TestCase
      */
     public function testAccountInputOutput() : void
     {
-        $this->profile->setAccount(new NullAccount(1));
-        self::assertEquals(1, $this->profile->getAccount()->getId());
+        $this->profile->account = new NullAccount(1);
+        self::assertEquals(1, $this->profile->account->getId());
 
         $profile = new Profile(new NullAccount(1));
-        self::assertEquals(1, $profile->getAccount()->getId());
+        self::assertEquals(1, $profile->account->getId());
     }
 
     /**
@@ -153,10 +153,9 @@ class ProfileTest extends \PHPUnit\Framework\TestCase
     {
         $this->profile->setGender(GenderType::FEMALE);
         $this->profile->setSex(SexType::FEMALE);
-        $this->profile->setBirthday($date = new \DateTime('now'));
-        $this->profile->setImage(new NullMedia(1));
-        $this->profile->setAccount($a = new NullAccount(1));
-        $this->profile->setImage($i = new NullMedia(1));
+        $this->profile->birthday = ($date = new \DateTime('now'));
+        $this->profile->account = ($a = new NullAccount(1));
+        $this->profile->image = ($i = new NullMedia(1));
 
         self::assertEquals(
             [