Jingga/oms-Admin
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Admin.git synced 2026-02-15 20:18:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

automated phpcs fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-05-31 13:21:46 +00:00
parent a3a5369f34
commit 143bf5ab3a
3 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Controller/ApiController.php
View File

@ -608,7 +608,7 @@ final class ApiController extends Controller
{ {
if (!empty($val = $this->validateSettingsCreate($request))) { if (!empty($val = $this->validateSettingsCreate($request))) {
$response->data['setting_create'] = new FormValidation($val); $response->data['setting_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
} }
@ -682,7 +682,7 @@ final class ApiController extends Controller
// has required data // has required data
if (!empty($val = $this->validatePasswordUpdate($request))) { if (!empty($val = $this->validatePasswordUpdate($request))) {
$response->data['password_update'] = new FormValidation($val); $response->data['password_update'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
} }
@ -950,7 +950,7 @@ final class ApiController extends Controller
{ {
if (!empty($val = $this->validateApplicationCreate($request))) { if (!empty($val = $this->validateApplicationCreate($request))) {
$response->data['application_create'] = new FormValidation($val); $response->data['application_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
} }
@ -1199,7 +1199,7 @@ final class ApiController extends Controller
{ {
if (!empty($val = $this->validateGroupCreate($request))) { if (!empty($val = $this->validateGroupCreate($request))) {
$response->data['group_create'] = new FormValidation($val); $response->data['group_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
} }
@ -1431,7 +1431,7 @@ final class ApiController extends Controller
{ {
if (!empty($val = $this->validateAccountCreate($request))) { if (!empty($val = $this->validateAccountCreate($request))) {
$response->data['account_create'] = new FormValidation($val); $response->data['account_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
} }
@ -1900,7 +1900,7 @@ final class ApiController extends Controller
{ {
if (!empty($val = $this->validateDataChange($request))) { if (!empty($val = $this->validateDataChange($request))) {
$response->data['data_change'] = new FormValidation($val); $response->data['data_change'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
} }
@ -2419,7 +2419,7 @@ final class ApiController extends Controller
if (!empty($val = $this->validatePermissionCreate($request))) { if (!empty($val = $this->validatePermissionCreate($request))) {
$response->data['permission_create'] = new FormValidation($val); $response->data['permission_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
} }
@ -2428,7 +2428,7 @@ final class ApiController extends Controller
if (!($permission instanceof GroupPermission)) { if (!($permission instanceof GroupPermission)) {
$response->data['permission_create'] = new FormValidation($val); $response->data['permission_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
} }
@ -2454,7 +2454,7 @@ final class ApiController extends Controller
{ {
if (!empty($val = $this->validatePermissionCreate($request))) { if (!empty($val = $this->validatePermissionCreate($request))) {
$response->data['permission_create'] = new FormValidation($val); $response->data['permission_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
} }
@ -2463,7 +2463,7 @@ final class ApiController extends Controller
if (!($permission instanceof AccountPermission)) { if (!($permission instanceof AccountPermission)) {
$response->data['permission_create'] = new FormValidation($val); $response->data['permission_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
} }
@ -2917,7 +2917,7 @@ final class ApiController extends Controller
{ {
if (!empty($val = $this->validateContactCreate($request))) { if (!empty($val = $this->validateContactCreate($request))) {
$response->data['contact_create'] = new FormValidation($val); $response->data['contact_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
} }

34
Controller/BackendController.php
View File

@ -132,7 +132,7 @@ final class BackendController extends Controller
} }
} }
$pageLimit = 25; $pageLimit = 25;
$view->data['pageLimit'] = $pageLimit; $view->data['pageLimit'] = $pageLimit;
$mapper = AccountMapper::getAll()->with('createdBy'); $mapper = AccountMapper::getAll()->with('createdBy');
@ -218,7 +218,7 @@ final class BackendController extends Controller
$view->data['permissions'] = $permissions; $view->data['permissions'] = $permissions;
$accGrpSelector = new \Modules\Admin\Theme\Backend\Components\GroupTagSelector\GroupTagSelectorView($this->app->l11nManager, $request, $response); $accGrpSelector = new \Modules\Admin\Theme\Backend\Components\GroupTagSelector\GroupTagSelectorView($this->app->l11nManager, $request, $response);
$view->data['grpSelector'] = $accGrpSelector; $view->data['grpSelector'] = $accGrpSelector;
// audit log // audit log
@ -300,7 +300,7 @@ final class BackendController extends Controller
} }
} }
$pageLimit = 25; $pageLimit = 25;
$view->data['pageLimit'] = $pageLimit; $view->data['pageLimit'] = $pageLimit;
$mapper = GroupMapper::getAll()->with('createdBy'); $mapper = GroupMapper::getAll()->with('createdBy');
@ -319,7 +319,7 @@ final class BackendController extends Controller
$view->data['groups'] = $list['data']; $view->data['groups'] = $list['data'];
$memberCount = GroupMapper::countMembers(); $memberCount = GroupMapper::countMembers();
$view->data['memberCount'] = $memberCount; $view->data['memberCount'] = $memberCount;
/** @var \Model\Setting[] $exportTemplates */ /** @var \Model\Setting[] $exportTemplates */
@ -388,10 +388,10 @@ final class BackendController extends Controller
$view->data['permissions'] = $permissions; $view->data['permissions'] = $permissions;
$accGrpSelector = new \Modules\Profile\Theme\Backend\Components\AccountGroupSelector\BaseView($this->app->l11nManager, $request, $response); $accGrpSelector = new \Modules\Profile\Theme\Backend\Components\AccountGroupSelector\BaseView($this->app->l11nManager, $request, $response);
$view->data['accGrpSelector'] = $accGrpSelector; $view->data['accGrpSelector'] = $accGrpSelector;
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response); $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
$view->data['editor'] = $editor; $view->data['editor'] = $editor;
$mapperQuery = AuditMapper::getAll() $mapperQuery = AuditMapper::getAll()
@ -430,7 +430,7 @@ final class BackendController extends Controller
$view->setTemplate('/Modules/Admin/Theme/Backend/groups-create'); $view->setTemplate('/Modules/Admin/Theme/Backend/groups-create');
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000103001, $request, $response); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000103001, $request, $response);
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response); $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
$view->data['editor'] = $editor; $view->data['editor'] = $editor;
return $view; return $view;
@ -456,8 +456,8 @@ final class BackendController extends Controller
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Admin/Theme/Backend/modules-list'); $view->setTemplate('/Modules/Admin/Theme/Backend/modules-list');
$view->data['modules'] = $this->app->moduleManager->getAllModules(); $view->data['modules'] = $this->app->moduleManager->getAllModules();
$view->data['active'] = $this->app->moduleManager->getActiveModules(); $view->data['active'] = $this->app->moduleManager->getActiveModules();
$view->data['installed'] = $this->app->moduleManager->getInstalledModules(); $view->data['installed'] = $this->app->moduleManager->getInstalledModules();
/** @var \Model\Setting[] $exportTemplates */ /** @var \Model\Setting[] $exportTemplates */
@ -510,11 +510,11 @@ final class BackendController extends Controller
$view->setTemplate('/Modules/Admin/Theme/Backend/modules-info'); $view->setTemplate('/Modules/Admin/Theme/Backend/modules-info');
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response);
$id = $request->getDataString('id') ?? ''; $id = $request->getDataString('id') ?? '';
$view->data['modules'] = $this->app->moduleManager->getAllModules(); $view->data['modules'] = $this->app->moduleManager->getAllModules();
$view->data['active'] = $this->app->moduleManager->getActiveModules(); $view->data['active'] = $this->app->moduleManager->getActiveModules();
$view->data['installed'] = $this->app->moduleManager->getInstalledModules(); $view->data['installed'] = $this->app->moduleManager->getInstalledModules();
$view->data['id'] = $id; $view->data['id'] = $id;
$type = 'Help'; $type = 'Help';
$page = 'introduction'; $page = 'introduction';
@ -595,7 +595,7 @@ final class BackendController extends Controller
$view->setTemplate('/Modules/Admin/Theme/Backend/modules-route-list'); $view->setTemplate('/Modules/Admin/Theme/Backend/modules-route-list');
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response);
$module = $request->getDataString('id') ?? ''; $module = $request->getDataString('id') ?? '';
$view->data['module'] = $module; $view->data['module'] = $module;
$appPath = __DIR__ . '/../../../Web'; $appPath = __DIR__ . '/../../../Web';
@ -644,7 +644,7 @@ final class BackendController extends Controller
$view->setTemplate('/Modules/Admin/Theme/Backend/modules-hook-list'); $view->setTemplate('/Modules/Admin/Theme/Backend/modules-hook-list');
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response);
$module = $request->getDataString('id') ?? ''; $module = $request->getDataString('id') ?? '';
$view->data['module'] = $module; $view->data['module'] = $module;
$appPath = __DIR__ . '/../../../Web'; $appPath = __DIR__ . '/../../../Web';
@ -689,7 +689,7 @@ final class BackendController extends Controller
*/ */
public function viewModuleSettings(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface public function viewModuleSettings(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response);
$id = $request->getDataString('id') ?? ''; $id = $request->getDataString('id') ?? '';
@ -725,7 +725,7 @@ final class BackendController extends Controller
module: 'Admin' module: 'Admin'
); );
$view->data['generalSettings'] = $generalSettings; $view->data['generalSettings'] = $generalSettings;
$view->data['defaultlocalization'] = LocalizationMapper::get()->where('id', (int) $generalSettings[SettingsEnum::DEFAULT_LOCALIZATION]->content)->execute(); $view->data['defaultlocalization'] = LocalizationMapper::get()->where('id', (int) $generalSettings[SettingsEnum::DEFAULT_LOCALIZATION]->content)->execute();
return $view; return $view;

1
Models/App.php
View File

@ -75,7 +75,6 @@ class App implements \JsonSerializable
*/ */
public ?int $defaultUnit = null; public ?int $defaultUnit = null;
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */