doc fixes

This commit is contained in:
Dennis Eichhorn 2022-04-21 23:52:00 +02:00
parent 54ba185148
commit 8c8f949248
11 changed files with 89 additions and 63 deletions

View File

@ -142,6 +142,10 @@ final class Installer extends InstallerAbstract
$querySqlite = new Builder($sqlite); $querySqlite = new Builder($sqlite);
$countries = $querySqlite->select('*')->from('country')->execute(); $countries = $querySqlite->select('*')->from('country')->execute();
if ($countries === null) {
return;
}
foreach ($countries as $country) { foreach ($countries as $country) {
$query->values( $query->values(
$country['country_name'] === null ? null : \trim($country['country_name']), $country['country_name'] === null ? null : \trim($country['country_name']),
@ -177,6 +181,10 @@ final class Installer extends InstallerAbstract
$querySqlite = new Builder($sqlite); $querySqlite = new Builder($sqlite);
$languages = $querySqlite->select('*')->from('language')->execute(); $languages = $querySqlite->select('*')->from('language')->execute();
if ($languages === null) {
return;
}
foreach ($languages as $language) { foreach ($languages as $language) {
$query->values( $query->values(
$language['language_name'] === null ? null : \trim($language['language_name']), $language['language_name'] === null ? null : \trim($language['language_name']),
@ -212,6 +220,10 @@ final class Installer extends InstallerAbstract
$querySqlite = new Builder($sqlite); $querySqlite = new Builder($sqlite);
$currencies = $querySqlite->select('*')->from('currency')->execute(); $currencies = $querySqlite->select('*')->from('currency')->execute();
if ($currencies === null) {
return;
}
foreach ($currencies as $currency) { foreach ($currencies as $currency) {
$query->values( $query->values(
$currency['currency_id'], $currency['currency_id'],
@ -253,7 +265,7 @@ final class Installer extends InstallerAbstract
} }
$adminData = \json_decode($adminFile, true) ?? []; $adminData = \json_decode($adminFile, true) ?? [];
if ($adminData === false) { if (!\is_array($adminData)) {
throw new \Exception(); // @codeCoverageIgnore throw new \Exception(); // @codeCoverageIgnore
} }

View File

@ -16,7 +16,7 @@ Generally, the development philosophy is result orientated. This means that anyo
Developers are encouraged to pick open tasks with high priorities according to their own skill level. Senior developers may directly assign tasks to developers based on their importance. New developers may find it easier to start with a task that has a low priority as they often also have a lower difficulty. Developers are encouraged to pick open tasks with high priorities according to their own skill level. Senior developers may directly assign tasks to developers based on their importance. New developers may find it easier to start with a task that has a low priority as they often also have a lower difficulty.
Open tasks can be found in the project overview: [PROJECT.md](../Project/PROJECT.md) Open tasks can be found in the project overview: [PROJECT.md](https://github.com/Karaka-Management/Organization-Guide/blob/master/Project/PROJECT.md)
Tasks currently in development are prefixed in the priority column with an asterisk `*` and a name tag in the task description of the developer who is working on the task. Tasks currently in development are prefixed in the priority column with an asterisk `*` and a name tag in the task description of the developer who is working on the task.

View File

@ -100,7 +100,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiLogin(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiLogin(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
$response->header->set('Content-Type', MimeType::M_JSON . '; charset=utf-8', true); $response->header->set('Content-Type', MimeType::M_JSON . '; charset=utf-8', true);
@ -131,7 +131,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiLogout(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiLogout(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
$response->header->set('Content-Type', MimeType::M_JSON . '; charset=utf-8', true); $response->header->set('Content-Type', MimeType::M_JSON . '; charset=utf-8', true);
@ -195,7 +195,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiForgot(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiForgot(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
$account = AccountMapper::get()->where('login', (string) $request->getData('login'))->execute(); $account = AccountMapper::get()->where('login', (string) $request->getData('login'))->execute();
$forgotten = $this->app->appSettings->get( $forgotten = $this->app->appSettings->get(
@ -291,7 +291,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiResetPassword(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiResetPassword(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
$forgotten = $this->app->appSettings->get( $forgotten = $this->app->appSettings->get(
names: [SettingsEnum::LOGIN_FORGOTTEN_DATE, SettingsEnum::LOGIN_FORGOTTEN_TOKEN], names: [SettingsEnum::LOGIN_FORGOTTEN_DATE, SettingsEnum::LOGIN_FORGOTTEN_TOKEN],
@ -396,7 +396,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiSettingsGet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiSettingsGet(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
$id = $request->getData('id'); $id = $request->getData('id');
$group = $request->getData('group'); $group = $request->getData('group');
@ -430,7 +430,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiSettingsSet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiSettingsSet(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
$dataSettings = $request->getDataJson('settings'); $dataSettings = $request->getDataJson('settings');
@ -481,7 +481,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiSettingsAccountLocalizationSet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiSettingsAccountLocalizationSet(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
$requestAccount = $request->header->account; $requestAccount = $request->header->account;
$accountId = (int) $request->getData('account_id'); $accountId = (int) $request->getData('account_id');
@ -626,7 +626,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiSettingsDesignSet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiSettingsDesignSet(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
$uploadedFiles = $request->getFiles(); $uploadedFiles = $request->getFiles();
@ -654,7 +654,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiInstallApplication(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiInstallApplication(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
$appManager = new ApplicationManager($this->app); $appManager = new ApplicationManager($this->app);
@ -720,7 +720,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiGroupGet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiGroupGet(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
/** @var \Modules\Admin\Models\Group $group */ /** @var \Modules\Admin\Models\Group $group */
$group = GroupMapper::get()->where('id', (int) $request->getData('id'))->execute(); $group = GroupMapper::get()->where('id', (int) $request->getData('id'))->execute();
@ -740,7 +740,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiGroupUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiGroupUpdate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
/** @var \Modules\Admin\Models\Group $old */ /** @var \Modules\Admin\Models\Group $old */
$old = clone GroupMapper::get()->where('id', (int) $request->getData('id'))->execute(); $old = clone GroupMapper::get()->where('id', (int) $request->getData('id'))->execute();
@ -804,7 +804,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiGroupCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiGroupCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (!empty($val = $this->validateGroupCreate($request))) { if (!empty($val = $this->validateGroupCreate($request))) {
$response->set('group_create', new FormValidation($val)); $response->set('group_create', new FormValidation($val));
@ -852,7 +852,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiGroupDelete(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiGroupDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (((int) $request->getData('id')) === 3) { if (((int) $request->getData('id')) === 3) {
// admin group cannot be deleted // admin group cannot be deleted
@ -880,7 +880,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiGroupFind(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiGroupFind(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
$response->header->set('Content-Type', MimeType::M_JSON, true); $response->header->set('Content-Type', MimeType::M_JSON, true);
$response->set( $response->set(
@ -904,7 +904,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiAccountGet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiAccountGet(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
/** @var Account $account */ /** @var Account $account */
$account = AccountMapper::get()->where('id', (int) $request->getData('id'))->execute(); $account = AccountMapper::get()->where('id', (int) $request->getData('id'))->execute();
@ -924,7 +924,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiAccountFind(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiAccountFind(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
$response->header->set('Content-Type', MimeType::M_JSON, true); $response->header->set('Content-Type', MimeType::M_JSON, true);
$response->set( $response->set(
@ -954,7 +954,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiAccountGroupFind(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiAccountGroupFind(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
/** @var Account[] $accounts */ /** @var Account[] $accounts */
$accounts = \array_values( $accounts = \array_values(
@ -1029,7 +1029,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiAccountCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiAccountCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (!empty($val = $this->validateAccountCreate($request))) { if (!empty($val = $this->validateAccountCreate($request))) {
$response->set('account_create', new FormValidation($val)); $response->set('account_create', new FormValidation($val));
@ -1148,7 +1148,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiAccountDelete(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiAccountDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
/** @var Account $account */ /** @var Account $account */
$account = AccountMapper::get()->where('id', (int) ($request->getData('id')))->execute(); $account = AccountMapper::get()->where('id', (int) ($request->getData('id')))->execute();
@ -1169,7 +1169,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiAccountUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiAccountUpdate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
/** @var Account $old */ /** @var Account $old */
$old = clone AccountMapper::get()->where('id', (int) $request->getData('id'))->execute(); $old = clone AccountMapper::get()->where('id', (int) $request->getData('id'))->execute();
@ -1225,7 +1225,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiModuleStatusUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiModuleStatusUpdate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
$module = $request->getData('module'); $module = $request->getData('module');
$status = (int) $request->getData('status'); $status = (int) $request->getData('status');
@ -1401,7 +1401,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiAccountPermissionGet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiAccountPermissionGet(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
/** @var AccountPermission $account */ /** @var AccountPermission $account */
$account = AccountPermissionMapper::get()->where('id', (int) $request->getData('id'))->execute(); $account = AccountPermissionMapper::get()->where('id', (int) $request->getData('id'))->execute();
@ -1421,7 +1421,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiGroupPermissionGet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiGroupPermissionGet(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
/** @var GroupPermission $group */ /** @var GroupPermission $group */
$group = GroupPermissionMapper::get()->where('id', (int) $request->getData('id'))->execute(); $group = GroupPermissionMapper::get()->where('id', (int) $request->getData('id'))->execute();
@ -1441,7 +1441,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiGroupPermissionDelete(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiGroupPermissionDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
/** @var GroupPermission $permission */ /** @var GroupPermission $permission */
$permission = GroupPermissionMapper::get()->where('id', (int) $request->getData('id'))->execute(); $permission = GroupPermissionMapper::get()->where('id', (int) $request->getData('id'))->execute();
@ -1470,7 +1470,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiAccountPermissionDelete(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiAccountPermissionDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
/** @var AccountPermission $permission */ /** @var AccountPermission $permission */
$permission = AccountPermissionMapper::get()->where('id', (int) $request->getData('id'))->execute(); $permission = AccountPermissionMapper::get()->where('id', (int) $request->getData('id'))->execute();
@ -1491,7 +1491,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiAddGroupPermission(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiAddGroupPermission(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (((int) $request->getData('permissionref')) === 3) { if (((int) $request->getData('permissionref')) === 3) {
// admin group cannot be deleted // admin group cannot be deleted
@ -1533,7 +1533,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiAddAccountPermission(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiAddAccountPermission(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (!empty($val = $this->validatePermissionCreate($request))) { if (!empty($val = $this->validatePermissionCreate($request))) {
$response->set('permission_create', new FormValidation($val)); $response->set('permission_create', new FormValidation($val));
@ -1637,7 +1637,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiAccountPermissionUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiAccountPermissionUpdate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
/** @var AccountPermission $old */ /** @var AccountPermission $old */
$old = clone AccountPermissionMapper::get()->where('id', (int) $request->getData('id'))->execute(); $old = clone AccountPermissionMapper::get()->where('id', (int) $request->getData('id'))->execute();
@ -1662,7 +1662,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiGroupPermissionUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiGroupPermissionUpdate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
/** @var GroupPermission $old */ /** @var GroupPermission $old */
$old = clone GroupPermissionMapper::get()->where('id', (int) $request->getData('id'))->execute(); $old = clone GroupPermissionMapper::get()->where('id', (int) $request->getData('id'))->execute();
@ -1721,7 +1721,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiAddGroupToAccount(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiAddGroupToAccount(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
$account = (int) $request->getData('account'); $account = (int) $request->getData('account');
$groups = \array_map('intval', $request->getDataList('igroup-idlist')); $groups = \array_map('intval', $request->getDataList('igroup-idlist'));
@ -1743,7 +1743,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiAddAccountToGroup(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiAddAccountToGroup(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
$group = (int) $request->getData('group'); $group = (int) $request->getData('group');
$accounts = \array_map('intval', $request->getDataList('iaccount-idlist')); $accounts = \array_map('intval', $request->getDataList('iaccount-idlist'));
@ -1765,7 +1765,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiDeleteGroupFromAccount(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiDeleteGroupFromAccount(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
$account = (int) $request->getData('account'); $account = (int) $request->getData('account');
$groups = \array_map('intval', $request->getDataList('igroup-idlist')); $groups = \array_map('intval', $request->getDataList('igroup-idlist'));
@ -1794,7 +1794,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiDeleteAccountFromGroup(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiDeleteAccountFromGroup(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
$group = (int) $request->getData('group'); $group = (int) $request->getData('group');
$accounts = \array_map('intval', $request->getDataList('iaccount-idlist')); $accounts = \array_map('intval', $request->getDataList('iaccount-idlist'));
@ -1823,7 +1823,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiReInit(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiReInit(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
$directories = \glob(__DIR__ . '/../../../Web/*', \GLOB_ONLYDIR); $directories = \glob(__DIR__ . '/../../../Web/*', \GLOB_ONLYDIR);
@ -1871,7 +1871,7 @@ final class ApiController extends Controller
* @since 1.0.0 * @since 1.0.0
* @todo implement * @todo implement
*/ */
public function apiCheckForUpdates(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiCheckForUpdates(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
// this is only a temp... in the future this logic will change but for current purposes this is the easiest way to implement updates // this is only a temp... in the future this logic will change but for current purposes this is the easiest way to implement updates
$request = new HttpRequest(new HttpUri('https://api.github.com/repos/Karaka/Updates/contents')); $request = new HttpRequest(new HttpUri('https://api.github.com/repos/Karaka/Updates/contents'));
@ -1923,7 +1923,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function apiUpdateFile(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiUpdateFile(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
$this->apiUpdate([[ $this->apiUpdate([[
'name' => 'temp.json', 'name' => 'temp.json',

View File

@ -58,7 +58,7 @@ final class BackendController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function viewForgot(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewForgot(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
{ {
return new View(); return new View();
} }
@ -77,7 +77,7 @@ final class BackendController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function viewEmptyCommand(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewEmptyCommand(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->setTemplate('/Modules/Admin/Theme/Cli/empty-command'); $view->setTemplate('/Modules/Admin/Theme/Cli/empty-command');
@ -96,7 +96,7 @@ final class BackendController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function viewAccountList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewAccountList(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->setTemplate('/Modules/Admin/Theme/Backend/accounts-list'); $view->setTemplate('/Modules/Admin/Theme/Backend/accounts-list');
@ -124,7 +124,7 @@ final class BackendController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function viewAccountSettings(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewAccountSettings(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->setTemplate('/Modules/Admin/Theme/Backend/accounts-single'); $view->setTemplate('/Modules/Admin/Theme/Backend/accounts-single');
@ -138,6 +138,7 @@ final class BackendController extends Controller
$view->addData('account', $account); $view->addData('account', $account);
/** @var \Modules\Admin\Models\AccountPermission[] $permissions */
$permissions = AccountPermissionMapper::getAll()->where('account', (int) $request->getData('id'))->execute(); $permissions = AccountPermissionMapper::getAll()->where('account', (int) $request->getData('id'))->execute();
if (!isset($permissions) || $permissions instanceof NullAccountPermission) { if (!isset($permissions) || $permissions instanceof NullAccountPermission) {
@ -180,7 +181,7 @@ final class BackendController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function viewAccountCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewAccountCreate(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->setTemplate('/Modules/Admin/Theme/Backend/accounts-create'); $view->setTemplate('/Modules/Admin/Theme/Backend/accounts-create');
@ -200,7 +201,7 @@ final class BackendController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function viewGroupList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewGroupList(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->setTemplate('/Modules/Admin/Theme/Backend/groups-list'); $view->setTemplate('/Modules/Admin/Theme/Backend/groups-list');
@ -231,7 +232,7 @@ final class BackendController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function viewGroupSettings(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewGroupSettings(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->setTemplate('/Modules/Admin/Theme/Backend/groups-single'); $view->setTemplate('/Modules/Admin/Theme/Backend/groups-single');
@ -240,9 +241,10 @@ final class BackendController extends Controller
GroupMapper::get()->with('accounts')->where('id', (int) $request->getData('id'))->execute() GroupMapper::get()->with('accounts')->where('id', (int) $request->getData('id'))->execute()
); );
/** @var null|\Modules\Admin\Models\GroupPermission[] $permissions */
$permissions = GroupPermissionMapper::getAll()->where('group', (int) $request->getData('id'))->execute(); $permissions = GroupPermissionMapper::getAll()->where('group', (int) $request->getData('id'))->execute();
if (!isset($permissions) || $permissions instanceof NullGroupPermission) { if ($permissions === null || $permissions instanceof NullGroupPermission) {
$permissions = []; $permissions = [];
} elseif (!\is_array($permissions)) { } elseif (!\is_array($permissions)) {
$permissions = [$permissions]; $permissions = [$permissions];
@ -286,7 +288,7 @@ final class BackendController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function viewGroupCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewGroupCreate(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->setTemplate('/Modules/Admin/Theme/Backend/groups-create'); $view->setTemplate('/Modules/Admin/Theme/Backend/groups-create');
@ -309,7 +311,7 @@ final class BackendController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function viewModuleList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewModuleList(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->setTemplate('/Modules/Admin/Theme/Backend/modules-list'); $view->setTemplate('/Modules/Admin/Theme/Backend/modules-list');
@ -332,7 +334,7 @@ final class BackendController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function viewModuleInfo(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewModuleInfo(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->setTemplate('/Modules/Admin/Theme/Backend/modules-info'); $view->setTemplate('/Modules/Admin/Theme/Backend/modules-info');
@ -382,7 +384,7 @@ final class BackendController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function viewModuleLog(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewModuleLog(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->setTemplate('/Modules/Admin/Theme/Backend/modules-log'); $view->setTemplate('/Modules/Admin/Theme/Backend/modules-log');
@ -413,7 +415,7 @@ final class BackendController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function viewModuleRouteList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewModuleRouteList(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->setTemplate('/Modules/Admin/Theme/Backend/modules-route-list'); $view->setTemplate('/Modules/Admin/Theme/Backend/modules-route-list');
@ -462,7 +464,7 @@ final class BackendController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function viewModuleHookList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewModuleHookList(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->setTemplate('/Modules/Admin/Theme/Backend/modules-hook-list'); $view->setTemplate('/Modules/Admin/Theme/Backend/modules-hook-list');
@ -511,13 +513,14 @@ final class BackendController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function viewModuleSettings(RequestAbstract $request, ResponseAbstract $response, $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->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response)); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response));
$id = $request->getData('id') ?? ''; $id = $request->getData('id') ?? '';
/** @var \Model\Setting[] $settings */
$settings = SettingMapper::getAll()->where('module', $id)->execute(); $settings = SettingMapper::getAll()->where('module', $id)->execute();
if (!($settings instanceof NullSetting)) { if (!($settings instanceof NullSetting)) {
$view->setData('settings', !\is_array($settings) ? [$settings] : $settings); $view->setData('settings', !\is_array($settings) ? [$settings] : $settings);

View File

@ -46,7 +46,7 @@ final class CliController extends Controller
* @since 1.0.0 * @since 1.0.0
* @codeCoverageIgnore * @codeCoverageIgnore
*/ */
public function viewEmptyCommand(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewEmptyCommand(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
@ -73,7 +73,7 @@ final class CliController extends Controller
* @since 1.0.0 * @since 1.0.0
* @codeCoverageIgnore * @codeCoverageIgnore
*/ */
public function cliRunEvent(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function cliRunEvent(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
{ {
$event = $this->app->eventManager->triggerSimilar( $event = $this->app->eventManager->triggerSimilar(
$request->getData('g'), $request->getData('g'),

View File

@ -130,6 +130,7 @@ class AccountMapper extends DataMapperFactory
$account = self::get()->with('groups')->with('groups/permissions')->with('l11n')->where('id', $id)->execute(); $account = self::get()->with('groups')->with('groups/permissions')->with('l11n')->where('id', $id)->execute();
$groups = \array_keys($account->getGroups()); $groups = \array_keys($account->getGroups());
/** @var \Modules\Admin\Models\GroupPermission[] $groupPermissions */
$groupPermissions = empty($groups) $groupPermissions = empty($groups)
? [] ? []
: GroupPermissionMapper::getAll() : GroupPermissionMapper::getAll()
@ -141,6 +142,7 @@ class AccountMapper extends DataMapperFactory
$account->addPermissions(\is_array($permission) ? $permission : [$permission]); $account->addPermissions(\is_array($permission) ? $permission : [$permission]);
} }
/** @var \Modules\Admin\Models\AccountPermission[] $accountPermission */
$accountPermissions = AccountPermissionMapper::getAll() $accountPermissions = AccountPermissionMapper::getAll()
->where('account', $id) ->where('account', $id)
->where('element', null) ->where('element', null)
@ -178,9 +180,9 @@ class AccountMapper extends DataMapperFactory
->from('account') ->from('account')
->where('account_login', '=', $login) ->where('account_login', '=', $login)
->execute() ->execute()
->fetchAll(); ?->fetchAll();
if (!isset($result[0])) { if ($result === null || !isset($result[0])) {
return LoginReturnType::WRONG_USERNAME; return LoginReturnType::WRONG_USERNAME;
} }

View File

@ -44,7 +44,7 @@ final class AccountPermissionMapper extends DataMapperFactory
'account_permission_component' => ['name' => 'account_permission_component', 'type' => 'int', 'internal' => 'component'], 'account_permission_component' => ['name' => 'account_permission_component', 'type' => 'int', 'internal' => 'component'],
'account_permission_hasread' => ['name' => 'account_permission_hasread', 'type' => 'bool', 'internal' => 'hasRead'], 'account_permission_hasread' => ['name' => 'account_permission_hasread', 'type' => 'bool', 'internal' => 'hasRead'],
'account_permission_hascreate' => ['name' => 'account_permission_hascreate', 'type' => 'bool', 'internal' => 'hasCreate'], 'account_permission_hascreate' => ['name' => 'account_permission_hascreate', 'type' => 'bool', 'internal' => 'hasCreate'],
'account_permission_hasmodify' => ['name' => 'account_permission_hasmodify', 'type' => 'bool', 'internal' => 'hasCreate'], 'account_permission_hasmodify' => ['name' => 'account_permission_hasmodify', 'type' => 'bool', 'internal' => 'hasModify'],
'account_permission_hasdelete' => ['name' => 'account_permission_hasdelete', 'type' => 'bool', 'internal' => 'hasDelete'], 'account_permission_hasdelete' => ['name' => 'account_permission_hasdelete', 'type' => 'bool', 'internal' => 'hasDelete'],
'account_permission_haspermission' => ['name' => 'account_permission_haspermission', 'type' => 'bool', 'internal' => 'hasPermission'], 'account_permission_haspermission' => ['name' => 'account_permission_haspermission', 'type' => 'bool', 'internal' => 'hasPermission'],
]; ];

View File

@ -78,7 +78,15 @@ class Address extends Location
{ {
parent::unserialize($serialized); parent::unserialize($serialized);
if (!\is_string($serialized)) {
return;
}
/** @var array{name:string, addition:string} $data */
$data = \json_decode($serialized, true); $data = \json_decode($serialized, true);
if (!\is_array($data)) {
return;
}
$this->name = $data['name']; $this->name = $data['name'];
$this->addition = $data['addition']; $this->addition = $data['addition'];

View File

@ -135,9 +135,8 @@ final class GroupMapper extends DataMapperFactory
$query->where(self::HAS_MANY['accounts']['self'], '=', $group); $query->where(self::HAS_MANY['accounts']['self'], '=', $group);
} }
$result = $query->execute() $result = $query->execute()?->fetchAll(\PDO::FETCH_KEY_PAIR);
->fetchAll(\PDO::FETCH_KEY_PAIR);
return $result; return $result === null ? [] : $result;
} }
} }

View File

@ -44,7 +44,7 @@ final class GroupPermissionMapper extends DataMapperFactory
'group_permission_component' => ['name' => 'group_permission_component', 'type' => 'int', 'internal' => 'component'], 'group_permission_component' => ['name' => 'group_permission_component', 'type' => 'int', 'internal' => 'component'],
'group_permission_hasread' => ['name' => 'group_permission_hasread', 'type' => 'bool', 'internal' => 'hasRead'], 'group_permission_hasread' => ['name' => 'group_permission_hasread', 'type' => 'bool', 'internal' => 'hasRead'],
'group_permission_hascreate' => ['name' => 'group_permission_hascreate', 'type' => 'bool', 'internal' => 'hasCreate'], 'group_permission_hascreate' => ['name' => 'group_permission_hascreate', 'type' => 'bool', 'internal' => 'hasCreate'],
'group_permission_hasmodify' => ['name' => 'group_permission_hasmodify', 'type' => 'bool', 'internal' => 'hasCreate'], 'group_permission_hasmodify' => ['name' => 'group_permission_hasmodify', 'type' => 'bool', 'internal' => 'hasModify'],
'group_permission_hasdelete' => ['name' => 'group_permission_hasdelete', 'type' => 'bool', 'internal' => 'hasDelete'], 'group_permission_hasdelete' => ['name' => 'group_permission_hasdelete', 'type' => 'bool', 'internal' => 'hasDelete'],
'group_permission_haspermission' => ['name' => 'group_permission_haspermission', 'type' => 'bool', 'internal' => 'hasPermission'], 'group_permission_haspermission' => ['name' => 'group_permission_haspermission', 'type' => 'bool', 'internal' => 'hasPermission'],
]; ];

View File

@ -289,8 +289,10 @@ echo $this->getData('nav')->render(); ?>
</form> </form>
</div> </div>
</div> </div>
</div>
<div class="col-xs-12 col-md-6"> <div class="row">
<div class="col-xs-12">
<div class="portlet"> <div class="portlet">
<div class="portlet-head"><?= $this->getHtml('Permissions'); ?><i class="fa fa-download floatRight download btn"></i></div> <div class="portlet-head"><?= $this->getHtml('Permissions'); ?><i class="fa fa-download floatRight download btn"></i></div>
<div style="overflow-x:auto;"> <div style="overflow-x:auto;">