From e21b52f9d31512a2dbbb61120c8b1739e17ce50d Mon Sep 17 00:00:00 2001 From: Formatter Bot Date: Sat, 20 Feb 2021 10:01:34 +0000 Subject: [PATCH] Automated formatting changes --- Models/AccountMapper.php | 28 ++++++++++++++-------------- Models/GroupMapper.php | 2 +- Theme/Backend/groups-list.tpl.php | 6 +++--- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Models/AccountMapper.php b/Models/AccountMapper.php index 4043016..4c24343 100755 --- a/Models/AccountMapper.php +++ b/Models/AccountMapper.php @@ -37,21 +37,21 @@ final class AccountMapper extends DataMapperAbstract * @since 1.0.0 */ protected static array $columns = [ - 'account_id' => ['name' => 'account_id', 'type' => 'int', 'internal' => 'id'], - 'account_status' => ['name' => 'account_status', 'type' => 'int', 'internal' => 'status'], - 'account_type' => ['name' => 'account_type', 'type' => 'int', 'internal' => 'type'], - 'account_login' => ['name' => 'account_login', 'type' => 'string', 'internal' => 'login', 'autocomplete' => true], - 'account_name1' => ['name' => 'account_name1', 'type' => 'string', 'internal' => 'name1', 'autocomplete' => true, 'annotations' => ['gdpr' => true]], - 'account_name2' => ['name' => 'account_name2', 'type' => 'string', 'internal' => 'name2', 'autocomplete' => true, 'annotations' => ['gdpr' => true]], - 'account_name3' => ['name' => 'account_name3', 'type' => 'string', 'internal' => 'name3', 'autocomplete' => true, 'annotations' => ['gdpr' => true]], - 'account_password' => ['name' => 'account_password', 'type' => 'string', 'internal' => 'password', 'writeonly' => true], - 'account_password_temp' => ['name' => 'account_password_temp', 'type' => 'string', 'internal' => 'tempPassword', 'writeonly' => true], + 'account_id' => ['name' => 'account_id', 'type' => 'int', 'internal' => 'id'], + 'account_status' => ['name' => 'account_status', 'type' => 'int', 'internal' => 'status'], + 'account_type' => ['name' => 'account_type', 'type' => 'int', 'internal' => 'type'], + 'account_login' => ['name' => 'account_login', 'type' => 'string', 'internal' => 'login', 'autocomplete' => true], + 'account_name1' => ['name' => 'account_name1', 'type' => 'string', 'internal' => 'name1', 'autocomplete' => true, 'annotations' => ['gdpr' => true]], + 'account_name2' => ['name' => 'account_name2', 'type' => 'string', 'internal' => 'name2', 'autocomplete' => true, 'annotations' => ['gdpr' => true]], + 'account_name3' => ['name' => 'account_name3', 'type' => 'string', 'internal' => 'name3', 'autocomplete' => true, 'annotations' => ['gdpr' => true]], + 'account_password' => ['name' => 'account_password', 'type' => 'string', 'internal' => 'password', 'writeonly' => true], + 'account_password_temp' => ['name' => 'account_password_temp', 'type' => 'string', 'internal' => 'tempPassword', 'writeonly' => true], 'account_password_temp_limit' => ['name' => 'account_password_temp_limit', 'type' => 'DateTimeImmutable', 'internal' => 'tempPasswordLimit'], - 'account_email' => ['name' => 'account_email', 'type' => 'string', 'internal' => 'email', 'autocomplete' => true, 'annotations' => ['gdpr' => true]], - 'account_tries' => ['name' => 'account_tries', 'type' => 'int', 'internal' => 'tries'], - 'account_lactive' => ['name' => 'account_lactive', 'type' => 'DateTime', 'internal' => 'lastActive'], - 'account_localization' => ['name' => 'account_localization', 'type' => 'int', 'internal' => 'l11n'], - 'account_created_at' => ['name' => 'account_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt', 'readonly' => true], + 'account_email' => ['name' => 'account_email', 'type' => 'string', 'internal' => 'email', 'autocomplete' => true, 'annotations' => ['gdpr' => true]], + 'account_tries' => ['name' => 'account_tries', 'type' => 'int', 'internal' => 'tries'], + 'account_lactive' => ['name' => 'account_lactive', 'type' => 'DateTime', 'internal' => 'lastActive'], + 'account_localization' => ['name' => 'account_localization', 'type' => 'int', 'internal' => 'l11n'], + 'account_created_at' => ['name' => 'account_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt', 'readonly' => true], ]; /** diff --git a/Models/GroupMapper.php b/Models/GroupMapper.php index 17504f1..548d7d9 100755 --- a/Models/GroupMapper.php +++ b/Models/GroupMapper.php @@ -15,8 +15,8 @@ declare(strict_types=1); namespace Modules\Admin\Models; use phpOMS\DataStorage\Database\DataMapperAbstract; -use phpOMS\DataStorage\Database\RelationType; use phpOMS\DataStorage\Database\Query\Builder; +use phpOMS\DataStorage\Database\RelationType; /** * Group mapper class. diff --git a/Theme/Backend/groups-list.tpl.php b/Theme/Backend/groups-list.tpl.php index b35c864..ee1c6b1 100755 --- a/Theme/Backend/groups-list.tpl.php +++ b/Theme/Backend/groups-list.tpl.php @@ -12,14 +12,14 @@ */ declare(strict_types=1); -use phpOMS\Uri\UriFactory; use phpOMS\Account\GroupStatus; +use phpOMS\Uri\UriFactory; /** * @var \phpOMS\Views\View $this * @var \Modules\Admin\Models\Group[] $groups */ -$groups = $this->getData('groups') ?? []; +$groups = $this->getData('groups') ?? []; $memberCount = $this->getData('memberCount') ?? []; $previous = empty($groups) ? '{/prefix}admin/group/list' : '{/prefix}admin/group/list?{?}&id=' . \reset($groups)->getId() . '&ptype=p'; @@ -43,7 +43,7 @@ echo $this->getData('nav')->render(); ?> foreach ($groups as $key => $value) : ++$c; $url = UriFactory::build('{/prefix}admin/group/settings?{?}&id=' . $value->getId()); - $color = 'darkred'; + $color = 'darkred'; if ($value->getStatus() === GroupStatus::ACTIVE) { $color = 'green'; } elseif ($value->getStatus() === GroupStatus::INACTIVE) { $color = 'darkblue'; } elseif ($value->getStatus() === GroupStatus::HIDDEN) { $color = 'purple'; }