From 7876697de20dd13cc893bcb5a901c540c76b75d7 Mon Sep 17 00:00:00 2001 From: Formatter Bot Date: Sun, 10 Apr 2022 16:05:15 +0000 Subject: [PATCH] Automated formatting changes --- Controller/ApiController.php | 2 +- Models/AccountPermissionMapper.php | 26 ++++++++++++------------ Models/GroupPermissionMapper.php | 26 ++++++++++++------------ Models/LocalizationMapper.php | 6 +++--- Models/PermissionQueryBuilder.php | 2 -- Theme/Backend/Lang/da.lang.php | 2 +- Theme/Backend/modules-hook-list.tpl.php | 7 +++---- Theme/Backend/modules-route-list.tpl.php | 5 ++--- 8 files changed, 36 insertions(+), 40 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 531cf28..feb06d6 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -315,7 +315,7 @@ final class ApiController extends Controller return; } - $account = AccountMapper::get()->where('id', (int) $request->getData('user'))->execute(); + $account = AccountMapper::get()->where('id', (int) $request->getData('user'))->execute(); $account->generatePassword($pass = StringRng::generateString(10, 14, '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()_-+=/\\{}<>?')); AccountMapper::update()->execute($account); diff --git a/Models/AccountPermissionMapper.php b/Models/AccountPermissionMapper.php index 51b187e..f8d3c29 100755 --- a/Models/AccountPermissionMapper.php +++ b/Models/AccountPermissionMapper.php @@ -33,20 +33,20 @@ final class AccountPermissionMapper extends DataMapperFactory * @since 1.0.0 */ public const COLUMNS = [ - 'account_permission_id' => ['name' => 'account_permission_id', 'type' => 'int', 'internal' => 'id'], - 'account_permission_account' => ['name' => 'account_permission_account', 'type' => 'int', 'internal' => 'account'], - 'account_permission_unit' => ['name' => 'account_permission_unit', 'type' => 'int', 'internal' => 'unit'], - 'account_permission_app' => ['name' => 'account_permission_app', 'type' => 'string', 'internal' => 'app'], - 'account_permission_module' => ['name' => 'account_permission_module', 'type' => 'string', 'internal' => 'module'], - 'account_permission_from' => ['name' => 'account_permission_from', 'type' => 'string', 'internal' => 'from'], + 'account_permission_id' => ['name' => 'account_permission_id', 'type' => 'int', 'internal' => 'id'], + 'account_permission_account' => ['name' => 'account_permission_account', 'type' => 'int', 'internal' => 'account'], + 'account_permission_unit' => ['name' => 'account_permission_unit', 'type' => 'int', 'internal' => 'unit'], + 'account_permission_app' => ['name' => 'account_permission_app', 'type' => 'string', 'internal' => 'app'], + 'account_permission_module' => ['name' => 'account_permission_module', 'type' => 'string', 'internal' => 'module'], + 'account_permission_from' => ['name' => 'account_permission_from', 'type' => 'string', 'internal' => 'from'], 'account_permission_category' => ['name' => 'account_permission_category', 'type' => 'int', 'internal' => 'category'], - 'account_permission_element' => ['name' => 'account_permission_element', 'type' => 'int', 'internal' => 'element'], - 'account_permission_component' => ['name' => 'account_permission_component', 'type' => 'int', 'internal' => 'component'], - 'account_permission_hasread' => ['name' => 'account_permission_hasread', 'type' => 'bool', 'internal' => 'hasRead'], - 'account_permission_hascreate' => ['name' => 'account_permission_hascreate', 'type' => 'bool', 'internal' => 'hasCreate'], - 'account_permission_hasmodify' => ['name' => 'account_permission_hasmodify', 'type' => 'bool', 'internal' => 'hasCreate'], - 'account_permission_hasdelete' => ['name' => 'account_permission_hasdelete', 'type' => 'bool', 'internal' => 'hasDelete'], - 'account_permission_haspermission' => ['name' => 'account_permission_haspermission', 'type' => 'bool', 'internal' => 'hasPermission'], + 'account_permission_element' => ['name' => 'account_permission_element', 'type' => 'int', 'internal' => 'element'], + 'account_permission_component' => ['name' => 'account_permission_component', 'type' => 'int', 'internal' => 'component'], + 'account_permission_hasread' => ['name' => 'account_permission_hasread', 'type' => 'bool', 'internal' => 'hasRead'], + 'account_permission_hascreate' => ['name' => 'account_permission_hascreate', 'type' => 'bool', 'internal' => 'hasCreate'], + 'account_permission_hasmodify' => ['name' => 'account_permission_hasmodify', 'type' => 'bool', 'internal' => 'hasCreate'], + 'account_permission_hasdelete' => ['name' => 'account_permission_hasdelete', 'type' => 'bool', 'internal' => 'hasDelete'], + 'account_permission_haspermission' => ['name' => 'account_permission_haspermission', 'type' => 'bool', 'internal' => 'hasPermission'], ]; /** diff --git a/Models/GroupPermissionMapper.php b/Models/GroupPermissionMapper.php index be80b1f..c433612 100755 --- a/Models/GroupPermissionMapper.php +++ b/Models/GroupPermissionMapper.php @@ -33,20 +33,20 @@ final class GroupPermissionMapper extends DataMapperFactory * @since 1.0.0 */ public const COLUMNS = [ - 'group_permission_id' => ['name' => 'group_permission_id', 'type' => 'int', 'internal' => 'id'], - 'group_permission_group' => ['name' => 'group_permission_group', 'type' => 'int', 'internal' => 'group'], - 'group_permission_unit' => ['name' => 'group_permission_unit', 'type' => 'int', 'internal' => 'unit'], - 'group_permission_app' => ['name' => 'group_permission_app', 'type' => 'string', 'internal' => 'app'], - 'group_permission_module' => ['name' => 'group_permission_module', 'type' => 'string', 'internal' => 'module'], - 'group_permission_from' => ['name' => 'group_permission_from', 'type' => 'string', 'internal' => 'from'], + 'group_permission_id' => ['name' => 'group_permission_id', 'type' => 'int', 'internal' => 'id'], + 'group_permission_group' => ['name' => 'group_permission_group', 'type' => 'int', 'internal' => 'group'], + 'group_permission_unit' => ['name' => 'group_permission_unit', 'type' => 'int', 'internal' => 'unit'], + 'group_permission_app' => ['name' => 'group_permission_app', 'type' => 'string', 'internal' => 'app'], + 'group_permission_module' => ['name' => 'group_permission_module', 'type' => 'string', 'internal' => 'module'], + 'group_permission_from' => ['name' => 'group_permission_from', 'type' => 'string', 'internal' => 'from'], 'group_permission_category' => ['name' => 'group_permission_category', 'type' => 'int', 'internal' => 'category'], - 'group_permission_element' => ['name' => 'group_permission_element', 'type' => 'int', 'internal' => 'element'], - 'group_permission_component' => ['name' => 'group_permission_component', 'type' => 'int', 'internal' => 'component'], - 'group_permission_hasread' => ['name' => 'group_permission_hasread', 'type' => 'bool', 'internal' => 'hasRead'], - 'group_permission_hascreate' => ['name' => 'group_permission_hascreate', 'type' => 'bool', 'internal' => 'hasCreate'], - 'group_permission_hasmodify' => ['name' => 'group_permission_hasmodify', 'type' => 'bool', 'internal' => 'hasCreate'], - 'group_permission_hasdelete' => ['name' => 'group_permission_hasdelete', 'type' => 'bool', 'internal' => 'hasDelete'], - 'group_permission_haspermission' => ['name' => 'group_permission_haspermission', 'type' => 'bool', 'internal' => 'hasPermission'], + 'group_permission_element' => ['name' => 'group_permission_element', 'type' => 'int', 'internal' => 'element'], + 'group_permission_component' => ['name' => 'group_permission_component', 'type' => 'int', 'internal' => 'component'], + 'group_permission_hasread' => ['name' => 'group_permission_hasread', 'type' => 'bool', 'internal' => 'hasRead'], + 'group_permission_hascreate' => ['name' => 'group_permission_hascreate', 'type' => 'bool', 'internal' => 'hasCreate'], + 'group_permission_hasmodify' => ['name' => 'group_permission_hasmodify', 'type' => 'bool', 'internal' => 'hasCreate'], + 'group_permission_hasdelete' => ['name' => 'group_permission_hasdelete', 'type' => 'bool', 'internal' => 'hasDelete'], + 'group_permission_haspermission' => ['name' => 'group_permission_haspermission', 'type' => 'bool', 'internal' => 'hasPermission'], ]; /** diff --git a/Models/LocalizationMapper.php b/Models/LocalizationMapper.php index 9357109..afc69e1 100755 --- a/Models/LocalizationMapper.php +++ b/Models/LocalizationMapper.php @@ -100,19 +100,19 @@ final class LocalizationMapper extends DataMapperFactory 'mapper' => CountryMapper::class, 'external' => 'l11n_country', 'by' => 'code2', - 'column' => 'code2' + 'column' => 'code2', ], 'language' => [ 'mapper' => LanguageMapper::class, 'external' => 'l11n_language', 'by' => 'code2', - 'column' => 'code2' + 'column' => 'code2', ], 'currency' => [ 'mapper' => CurrencyMapper::class, 'external' => 'l11n_currency', 'by' => 'code', - 'column' => 'code' + 'column' => 'code', ], ]; diff --git a/Models/PermissionQueryBuilder.php b/Models/PermissionQueryBuilder.php index 4eb774b..4a60558 100644 --- a/Models/PermissionQueryBuilder.php +++ b/Models/PermissionQueryBuilder.php @@ -115,7 +115,6 @@ final class PermissionQueryBuilder */ public function groups(array $groups) : self { - $this->groups = $groups; return $this; @@ -204,7 +203,6 @@ final class PermissionQueryBuilder /** * Set permission flags * - * * @param int $permission Permission flags * * @return self diff --git a/Theme/Backend/Lang/da.lang.php b/Theme/Backend/Lang/da.lang.php index 5bdad7d..eadb1ed 100644 --- a/Theme/Backend/Lang/da.lang.php +++ b/Theme/Backend/Lang/da.lang.php @@ -177,7 +177,7 @@ return ['Admin' => [ 'Website' => 'Internet side', 'Weight' => 'Vægt', 'Zip' => 'Zip.', - 'i:LoginRetries' => 'Mængden af ​​tilladte retries (-1 = ubegrænset)', + 'i:LoginRetries' => "Mængden af \u{200b}\u{200b}tilladte retries (-1 = ubegrænset)", 'i:PasswordChangeInterval' => 'Interval, hvor passager skal ændres (-1 = aldrig)', 'i:PasswordHistory' => 'Ny adgangskode skal være forskellig fra de sidste N-adgangskoder', 'i:PasswordRegex' => 'Adgangskode krav til brugere', diff --git a/Theme/Backend/modules-hook-list.tpl.php b/Theme/Backend/modules-hook-list.tpl.php index 8678040..5986ffc 100644 --- a/Theme/Backend/modules-hook-list.tpl.php +++ b/Theme/Backend/modules-hook-list.tpl.php @@ -12,13 +12,12 @@ */ declare(strict_types=1); -use phpOMS\Message\Http\HttpHeader; use phpOMS\Router\RouteVerb; /** * @var \phpOMS\Views\View $this */ -$hooks = $this->getData('hooks') ?? []; +$hooks = $this->getData('hooks') ?? []; $module = $this->getData('module') ?? ''; echo $this->getData('nav')->render(); @@ -94,8 +93,8 @@ echo $this->getData('nav')->render(); ++$c; ?> -