From f3ac439bb020fb28f1b82baa653d22c09496bd29 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 24 Oct 2020 17:52:23 +0200 Subject: [PATCH] cs and phpstan fixes --- Models/Client.php | 45 +++++++++++++++++++++++++++++++++++++++++ Models/ClientMapper.php | 14 ++++++------- 2 files changed, 52 insertions(+), 7 deletions(-) diff --git a/Models/Client.php b/Models/Client.php index d5781f5..66f8971 100644 --- a/Models/Client.php +++ b/Models/Client.php @@ -19,6 +19,7 @@ use Modules\Media\Models\Media; use Modules\Profile\Models\ContactElement; use Modules\Profile\Models\NullContactElement; use Modules\Profile\Models\Profile; +use Modules\Admin\Models\Address; /** * Account class. @@ -340,11 +341,27 @@ class Client $this->profile = $profile; } + /** + * Set main address + * + * @param int|Address $address Address + * + * @return void + * + * @since 1.0.0 + */ public function setMainAddress($address) : void { $this->mainAddress = $address; } + /** + * Get main address + * + * @return int|Address + * + * @since 1.0.0 + */ public function getMainAddress() { return $this->mainAddress; @@ -400,11 +417,30 @@ class Client return $this->contactElements; } + /** + * Order contact elements + * + * @param ContactElement $a Element + * @param ContactElement $b Element + * + * @return int + * + * @since 1.0.0 + */ private function orderContactElements(ContactElement $a, ContactElement $b) : int { return $a->getOrder() <=> $b->getOrder(); } + /** + * Get the main contact element by type + * + * @param int $type Contact element type + * + * @return ContactElement + * + * @since 1.0.0 + */ public function getMainContactElement(int $type) : ContactElement { \uasort($this->contactElements, [$this, 'orderContactElements']); @@ -418,6 +454,15 @@ class Client return new NullContactElement(); } + /** + * Add contact element + * + * @param int|ContactElement $element Contact element + * + * @return void + * + * @since 1.0.0 + */ public function addContactElement($element) : void { $this->contactElements[] = $element; diff --git a/Models/ClientMapper.php b/Models/ClientMapper.php index 0da70a9..d0651b8 100644 --- a/Models/ClientMapper.php +++ b/Models/ClientMapper.php @@ -75,17 +75,17 @@ final class ClientMapper extends DataMapperAbstract /** * Has one relation. * - * @var array + * @var array * @since 1.0.0 */ protected static array $ownsOne = [ 'profile' => [ - 'mapper' => ProfileMapper::class, - 'external' => 'clientmgmt_client_profile', + 'mapper' => ProfileMapper::class, + 'external' => 'clientmgmt_client_profile', ], 'mainAddress' => [ - 'mapper' => AddressMapper::class, - 'external' => 'clientmgmt_client_address', + 'mapper' => AddressMapper::class, + 'external' => 'clientmgmt_client_address', ], ]; @@ -97,8 +97,8 @@ final class ClientMapper extends DataMapperAbstract */ protected static array $hasMany = [ 'files' => [ - 'mapper' => MediaMapper::class, /* mapper of the related object */ - 'table' => 'clientmgmt_client_media', /* table of the related object, null if no relation table is used (many->1) */ + 'mapper' => MediaMapper::class, /* mapper of the related object */ + 'table' => 'clientmgmt_client_media', /* table of the related object, null if no relation table is used (many->1) */ 'external' => 'clientmgmt_client_media_src', 'self' => 'clientmgmt_client_media_dst', ],