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

remove some getter/setter

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-11-24 17:31:19 +01:00
parent 639ca300f0
commit fec0ecbca4
21 changed files with 193 additions and 375 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
Controller/ApiController.php
View File

@ -92,16 +92,16 @@ final class ApiController extends Controller
*/
public function apiLogin(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
$response->getHeader()->set('Content-Type', MimeType::M_JSON . '; charset=utf-8', true);
$response->header->set('Content-Type', MimeType::M_JSON . '; charset=utf-8', true);
$login = AccountMapper::login((string) ($request->getData('user') ?? ''), (string) ($request->getData('pass') ?? ''));
if ($login >= LoginReturnType::OK) {
$this->app->sessionManager->set('UID', $login, true);
$this->app->sessionManager->save();
$response->set($request->getUri()->__toString(), new Reload());
$response->set($request->uri->__toString(), new Reload());
} else {
$response->set($request->getUri()->__toString(), new Notify(
$response->set($request->uri->__toString(), new Notify(
'Login failed due to wrong login information',
NotifyType::INFO
));
@ -123,13 +123,13 @@ final class ApiController extends Controller
*/
public function apiLogout(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
$response->getHeader()->set('Content-Type', MimeType::M_JSON . '; charset=utf-8', true);
$response->header->set('Content-Type', MimeType::M_JSON . '; charset=utf-8', true);
$this->app->sessionManager->remove('UID');
$this->app->sessionManager->save();
$response->getHeader()->set('Content-Type', MimeType::M_JSON . '; charset=utf-8', true);
$response->set($request->getUri()->__toString(), [
$response->header->set('Content-Type', MimeType::M_JSON . '; charset=utf-8', true);
$response->set($request->uri->__toString(), [
'status' => NotificationLevel::OK,
'title' => 'Logout successfull',
'message' => 'You are redirected to the login page',
@ -174,7 +174,7 @@ final class ApiController extends Controller
$account = $request->getData('account');
$response->set(
$request->getUri()->__toString(),
$request->uri->__toString(),
[
'response' => $this->app->appSettings->get(
$id !== null ? (int) $id : $id,
@ -213,7 +213,7 @@ final class ApiController extends Controller
$account = isset($data['account']) ? (int) $data['account'] : null;
$this->updateModel(
$request->getHeader()->getAccount(),
$request->header->account,
$this->app->appSettings->get($id, $name, $module, $group, $account),
$data,
function () use ($id, $name, $content, $module, $group, $account) : void {
@ -251,7 +251,7 @@ final class ApiController extends Controller
*/
public function apiSettingsAccountLocalizationSet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
$requestAccount = $request->getHeader()->getAccount();
$requestAccount = $request->header->account;
$accountId = (int) $request->getData('account_id');
if ($requestAccount !== $accountId
@ -265,13 +265,13 @@ final class ApiController extends Controller
)
) {
$this->fillJsonResponse($request, $response, NotificationLevel::HIDDEN, '', '', []);
$response->getHeader()->setStatusCode(RequestStatusCode::R_403);
$response->header->status = RequestStatusCode::R_403;
return;
}
/** @var Localization $l11n */
$l11n = AccountMapper::get($accountId)->getL11n();
$l11n = AccountMapper::get($accountId)->l11n;
if ((bool) ($request->getData('load') ?? false)) {
$locale = \explode('_', $request->getData('localization_load'));
@ -396,7 +396,7 @@ final class ApiController extends Controller
$app = $request->getData('appSrc');
if (!\is_dir(__DIR__ . '/../../../' . $app)) {
$response->getHeader()->setStatusCode(RequestStatusCode::R_400);
$response->header->status = RequestStatusCode::R_400;
return;
}
@ -474,7 +474,7 @@ final class ApiController extends Controller
/** @var Group $old */
$old = clone GroupMapper::get((int) $request->getData('id'));
$new = $this->updateGroupFromRequest($request);
$this->updateModel($request->getHeader()->getAccount(), $old, $new, GroupMapper::class, 'group', $request->getOrigin());
$this->updateModel($request->header->account, $old, $new, GroupMapper::class, 'group', $request->getOrigin());
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Group', 'Group successfully updated', $new);
}
@ -490,10 +490,10 @@ final class ApiController extends Controller
private function updateGroupFromRequest(RequestAbstract $request) : Group
{
$group = GroupMapper::get((int) $request->getData('id'));
$group->setName((string) ($request->getData('name') ?? $group->getName()));
$group->name = (string) ($request->getData('name') ?? $group->name);
$group->setStatus((int) ($request->getData('status') ?? $group->getStatus()));
$group->setDescription(Markdown::parse((string) ($request->getData('description') ?? $group->getDescriptionRaw())));
$group->setDescriptionRaw((string) ($request->getData('description') ?? $group->getDescriptionRaw()));
$group->description = Markdown::parse((string) ($request->getData('description') ?? $group->descriptionRaw));
$group->descriptionRaw = (string) ($request->getData('description') ?? $group->descriptionRaw);
return $group;
}
@ -536,13 +536,13 @@ final class ApiController extends Controller
{
if (!empty($val = $this->validateGroupCreate($request))) {
$response->set('group_create', new FormValidation($val));
$response->getHeader()->setStatusCode(RequestStatusCode::R_400);
$response->header->status = RequestStatusCode::R_400;
return;
}
$group = $this->createGroupFromRequest($request);
$this->createModel($request->getHeader()->getAccount(), $group, GroupMapper::class, 'group', $request->getOrigin());
$this->createModel($request->header->account, $group, GroupMapper::class, 'group', $request->getOrigin());
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Group', 'Group successfully created', $group);
}
@ -558,11 +558,11 @@ final class ApiController extends Controller
private function createGroupFromRequest(RequestAbstract $request) : Group
{
$group = new Group();
$group->setCreatedBy(new NullAccount($request->getHeader()->getAccount()));
$group->setName((string) ($request->getData('name') ?? ''));
$group->createdBy = new NullAccount($request->header->account);
$group->name = (string) ($request->getData('name') ?? '');
$group->setStatus((int) ($request->getData('status') ?? GroupStatus::INACTIVE));
$group->setDescription(Markdown::parse((string) ($request->getData('description') ?? '')));
$group->setDescriptionRaw((string) ($request->getData('description') ?? ''));
$group->description = Markdown::parse((string) ($request->getData('description') ?? ''));
$group->descriptionRaw = (string) ($request->getData('description') ?? '');
return $group;
}
@ -583,7 +583,7 @@ final class ApiController extends Controller
public function apiGroupDelete(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
$group = GroupMapper::get((int) $request->getData('id'));
$this->deleteModel($request->getHeader()->getAccount(), $group, GroupMapper::class, 'group', $request->getOrigin());
$this->deleteModel($request->header->account, $group, GroupMapper::class, 'group', $request->getOrigin());
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Group', 'Group successfully deleted', $group);
}
@ -602,9 +602,9 @@ final class ApiController extends Controller
*/
public function apiGroupFind(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
$response->getHeader()->set('Content-Type', MimeType::M_JSON, true);
$response->header->set('Content-Type', MimeType::M_JSON, true);
$response->set(
$request->getUri()->__toString(),
$request->uri->__toString(),
\array_values(
GroupMapper::find((string) ($request->getData('search') ?? ''))
)
@ -646,9 +646,9 @@ final class ApiController extends Controller
*/
public function apiAccountFind(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
$response->getHeader()->set('Content-Type', MimeType::M_JSON, true);
$response->header->set('Content-Type', MimeType::M_JSON, true);
$response->set(
$request->getUri()->__toString(),
$request->uri->__toString(),
\array_values(
AccountMapper::find((string) ($request->getData('search') ?? ''))
)
@ -695,8 +695,8 @@ final class ApiController extends Controller
$data[] = $temp;
}
$response->getHeader()->set('Content-Type', MimeType::M_JSON, true);
$response->set($request->getUri()->__toString(), $data);
$response->header->set('Content-Type', MimeType::M_JSON, true);
$response->set($request->uri->__toString(), $data);
}
/**
@ -739,21 +739,21 @@ final class ApiController extends Controller
{
if (!empty($val = $this->validateAccountCreate($request))) {
$response->set('account_create', new FormValidation($val));
$response->getHeader()->setStatusCode(RequestStatusCode::R_400);
$response->header->status = RequestStatusCode::R_400;
return;
}
$account = $this->createAccountFromRequest($request);
$this->createModel($request->getHeader()->getAccount(), $account, AccountMapper::class, 'account', $request->getOrigin());
$this->createModel($request->header->account, $account, AccountMapper::class, 'account', $request->getOrigin());
$this->createProfileForAccount($account, $request);
$collection = new Collection();
$collection->setName(((string) $account->getId()) . ' ' . $account->getName());
$collection->name = ((string) $account->getId()) . ' ' . $account->login;
$collection->setVirtualPath('/Accounts');
$collection->setPath('/Modules/Media/Files/Accounts/' . ((string) $account->getId()));
$collection->setCreatedBy(new NullAccount($request->getHeader()->getAccount()));
$collection->createdBy = new NullAccount($request->header->account);
CollectionMapper::create($collection);
@ -787,7 +787,7 @@ final class ApiController extends Controller
$request
);
$this->updateModel($request->getHeader()->getAccount(), $old, $account, function () use ($account) : void {
$this->updateModel($request->header->account, $old, $account, function () use ($account) : void {
$account->setLoginTries((int) $this->app->appSettings->get(null, SettingsEnum::LOGIN_TRIES)['content']);
AccountMapper::update($account);
}, 'account', $request->getOrigin());
@ -807,23 +807,21 @@ final class ApiController extends Controller
$account = new Account();
$account->setStatus((int) ($request->getData('status') ?? AccountStatus::INACTIVE));
$account->setType((int) ($request->getData('type') ?? AccountType::USER));
$account->setName((string) ($request->getData('login') ?? ''));
$account->setName1((string) ($request->getData('name1') ?? ''));
$account->setName2((string) ($request->getData('name2') ?? ''));
$account->setName3((string) ($request->getData('name3') ?? ''));
$account->login = (string) ($request->getData('login') ?? '');
$account->name1 = (string) ($request->getData('name1') ?? '');
$account->name2 = (string) ($request->getData('name2') ?? '');
$account->name3 = (string) ($request->getData('name3') ?? '');
$account->setEmail((string) ($request->getData('email') ?? ''));
$account->generatePassword((string) ($request->getData('password') ?? ''));
if ($request->getData('locale') === null) {
$account->setL11n(
Localization::fromJson(
$this->app->l11nServer === null ? $request->getHeader()->getL11n()->jsonSerialize() : $this->app->l11nServer->jsonSerialize()
)
);
$account->l11n = Localization::fromJson(
$this->app->l11nServer === null ? $request->header->l11n->jsonSerialize() : $this->app->l11nServer->jsonSerialize()
);
} else {
$locale = \explode('_', $request->getData('locale') ?? '');
$account->getL11n()
$account->l11n
->loadFromLanguage(
$locale[0] ?? $this->app->l11nServer->getLanguage(),
$locale[1] ?? $this->app->l11nServer->getCountry()
@ -850,7 +848,7 @@ final class ApiController extends Controller
{
/** @var Account $account */
$account = AccountMapper::get((int) ($request->getData('id')));
$this->deleteModel($request->getHeader()->getAccount(), $account, AccountMapper::class, 'account', $request->getOrigin());
$this->deleteModel($request->header->account, $account, AccountMapper::class, 'account', $request->getOrigin());
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Account', 'Account successfully deleted', $account);
}
@ -872,7 +870,7 @@ final class ApiController extends Controller
/** @var Account $old */
$old = clone AccountMapper::get((int) $request->getData('id'));
$new = $this->updateAccountFromRequest($request);
$this->updateModel($request->getHeader()->getAccount(), $old, $new, AccountMapper::class, 'account', $request->getOrigin());
$this->updateModel($request->header->account, $old, $new, AccountMapper::class, 'account', $request->getOrigin());
if (\Modules\Profile\Models\ProfileMapper::getFor($new->getId(), 'account') instanceof \Modules\Profile\Models\NullProfile) {
$this->createProfileForAccount($new, $request);
@ -895,10 +893,10 @@ final class ApiController extends Controller
{
/** @var Account $account */
$account = AccountMapper::get((int) ($request->getData('id')));
$account->setName((string) ($request->getData('login') ?? $account->getName()));
$account->setName1((string) ($request->getData('name1') ?? $account->getName1()));
$account->setName2((string) ($request->getData('name2') ?? $account->getName2()));
$account->setName3((string) ($request->getData('name3') ?? $account->getName3()));
$account->login = (string) ($request->getData('login') ?? $account->login);
$account->name1 = (string) ($request->getData('name1') ?? $account->name1);
$account->name2 = (string) ($request->getData('name2') ?? $account->name2);
$account->name3 = (string) ($request->getData('name3') ?? $account->name3);
$account->setEmail((string) ($request->getData('email') ?? $account->getEmail()));
$account->setStatus((int) ($request->getData('status') ?? $account->getStatus()));
$account->setType((int) ($request->getData('type') ?? $account->getType()));
@ -929,14 +927,14 @@ final class ApiController extends Controller
$status = (int) $request->getData('status');
if (empty($module) || empty($status)) {
$response->set($request->getUri()->__toString(), [
$response->set($request->uri->__toString(), [
'status' => 'warning',
'title' => 'Module',
'message' => 'Invalid module or status',
'response' => [],
]);
$response->getHeader()->setStatusCode(RequestStatusCode::R_403);
$response->header->status = RequestStatusCode::R_403;
return;
}
@ -965,12 +963,12 @@ final class ApiController extends Controller
default:
$done = false;
$msg = 'Unknown module status change request.';
$response->getHeader()->setStatusCode(RequestStatusCode::R_400);
$response->header->status = RequestStatusCode::R_400;
}
$this->app->eventManager->trigger('POST:Module:Admin-module-status', '', ['status' => $status, 'module' => $module]);
if (!$done) {
$response->getHeader()->setStatusCode(RequestStatusCode::R_400);
$response->header->status = RequestStatusCode::R_400;
}
$this->fillJsonResponse(
@ -1037,7 +1035,7 @@ final class ApiController extends Controller
{
/** @var GroupPermission $permission */
$permission = GroupPermissionMapper::get((int) $request->getData('id'));
$this->deleteModel($request->getHeader()->getAccount(), $permission, GroupPermissionMapper::class, 'group-permission', $request->getOrigin());
$this->deleteModel($request->header->account, $permission, GroupPermissionMapper::class, 'group-permission', $request->getOrigin());
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Permission', 'Permission successfully deleted', $permission);
}
@ -1058,7 +1056,7 @@ final class ApiController extends Controller
{
/** @var AccountPermission $permission */
$permission = AccountPermissionMapper::get((int) $request->getData('id'));
$this->deleteModel($request->getHeader()->getAccount(), $permission, AccountPermissionMapper::class, 'user-permission', $request->getOrigin());
$this->deleteModel($request->header->account, $permission, AccountPermissionMapper::class, 'user-permission', $request->getOrigin());
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Permission', 'Permission successfully deleted', $permission);
}
@ -1079,7 +1077,7 @@ final class ApiController extends Controller
{
/** @var AccountPermission $permission */
$permission = AccountPermissionMapper::get((int) $request->getData('id'));
$this->deleteModel($request->getHeader()->getAccount(), $permission, AccountPermissionMapper::class, 'user-permission', $request->getOrigin());
$this->deleteModel($request->header->account, $permission, AccountPermissionMapper::class, 'user-permission', $request->getOrigin());
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Permission', 'Permission successfully deleted', $permission);
}
@ -1100,7 +1098,7 @@ final class ApiController extends Controller
{
if (!empty($val = $this->validatePermissionCreate($request))) {
$response->set('permission_create', new FormValidation($val));
$response->getHeader()->setStatusCode(RequestStatusCode::R_400);
$response->header->status = RequestStatusCode::R_400;
return;
}
@ -1109,12 +1107,12 @@ final class ApiController extends Controller
if (!($permission instanceof GroupPermission)) {
$response->set('permission_create', new FormValidation($val));
$response->getHeader()->setStatusCode(RequestStatusCode::R_400);
$response->header->status = RequestStatusCode::R_400;
return;
}
$this->createModel($request->getHeader()->getAccount(), $permission, GroupPermissionMapper::class, 'group-permission', $request->getOrigin());
$this->createModel($request->header->account, $permission, GroupPermissionMapper::class, 'group-permission', $request->getOrigin());
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Group', 'Group permission successfully created', $permission);
}
@ -1135,7 +1133,7 @@ final class ApiController extends Controller
{
if (!empty($val = $this->validatePermissionCreate($request))) {
$response->set('permission_create', new FormValidation($val));
$response->getHeader()->setStatusCode(RequestStatusCode::R_400);
$response->header->status = RequestStatusCode::R_400;
return;
}
@ -1144,12 +1142,12 @@ final class ApiController extends Controller
if (!($permission instanceof AccountPermission)) {
$response->set('permission_create', new FormValidation($val));
$response->getHeader()->setStatusCode(RequestStatusCode::R_400);
$response->header->status = RequestStatusCode::R_400;
return;
}
$this->createModel($request->getHeader()->getAccount(), $permission, AccountPermissionMapper::class, 'account-permission', $request->getOrigin());
$this->createModel($request->header->account, $permission, AccountPermissionMapper::class, 'account-permission', $request->getOrigin());
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Account', 'Account permission successfully created', $permission);
}
@ -1243,7 +1241,7 @@ final class ApiController extends Controller
/** @var AccountPermission $new */
$new = $this->updatePermissionFromRequest(AccountPermissionMapper::get((int) $request->getData('id')), $request);
$this->updateModel($request->getHeader()->getAccount(), $old, $new, AccountPermissionMapper::class, 'account-permission', $request->getOrigin());
$this->updateModel($request->header->account, $old, $new, AccountPermissionMapper::class, 'account-permission', $request->getOrigin());
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Permission', 'Permission successfully updated', $new);
}
@ -1268,7 +1266,7 @@ final class ApiController extends Controller
/** @var GroupPermission $new */
$new = $this->updatePermissionFromRequest(GroupPermissionMapper::get((int) $request->getData('id')), $request);
$this->updateModel($request->getHeader()->getAccount(), $old, $new, GroupPermissionMapper::class, 'group-permission', $request->getOrigin());
$this->updateModel($request->header->account, $old, $new, GroupPermissionMapper::class, 'group-permission', $request->getOrigin());
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Permission', 'Permission successfully updated', $new);
}
@ -1317,7 +1315,7 @@ final class ApiController extends Controller
$account = (int) $request->getData('account');
$groups = \array_map('intval', $request->getDataList('igroup-idlist'));
$this->createModelRelation($request->getHeader()->getAccount(), $account, $groups, AccountMapper::class, 'groups', 'account-group', $request->getOrigin());
$this->createModelRelation($request->header->account, $account, $groups, AccountMapper::class, 'groups', 'account-group', $request->getOrigin());
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Account', 'Relation added', []);
}
@ -1339,7 +1337,7 @@ final class ApiController extends Controller
$group = (int) $request->getData('group');
$accounts = \array_map('intval', $request->getDataList('iaccount-idlist'));
$this->createModelRelation($request->getHeader()->getAccount(), $group, $accounts, GroupMapper::class, 'accounts', 'group-account', $request->getOrigin());
$this->createModelRelation($request->header->account, $group, $accounts, GroupMapper::class, 'accounts', 'group-account', $request->getOrigin());
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Group', 'Relation added', []);
}
@ -1411,7 +1409,7 @@ final class ApiController extends Controller
// 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/Orange-Management/Updates/contents'));
$request->setMethod(RequestMethod::GET);
$request->getHeader()->set('User-Agent', 'spl1nes');
$request->header->set('User-Agent', 'spl1nes');
$updateFilesJson = Rest::request($request)->getJsonData();

4
Models/AccountMapper.php
View File

@ -48,7 +48,7 @@ final class AccountMapper extends DataMapperAbstract
'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' => 'localization'],
'account_localization' => ['name' => 'account_localization', 'type' => 'int', 'internal' => 'l11n'],
'account_created_at' => ['name' => 'account_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt', 'readonly' => true],
];
@ -59,7 +59,7 @@ final class AccountMapper extends DataMapperAbstract
* @since 1.0.0
*/
protected static array $ownsOne = [
'localization' => [
'l11n' => [
'mapper' => LocalizationMapper::class,
'external' => 'account_localization',
],

56
Models/Address.php
View File

@ -32,7 +32,7 @@ class Address extends Location
* @var string
* @since 1.0.0
*/
protected string $name = '';
public string $name = '';
/**
* Addition.
@ -40,57 +40,5 @@ class Address extends Location
* @var string
* @since 1.0.0
*/
protected string $addition = '';
/**
* Get name
*
* @return string
*
* @since 1.0.0
*/
public function getName() : string
{
return $this->name;
}
/**
* Set name
*
* @param string $name Name
*
* @return void
*
* @since 1.0.0
*/
public function setName(string $name) : void
{
$this->name = $name;
}
/**
* Get addition
*
* @return string
*
* @since 1.0.0
*/
public function getAddition() : string
{
return $this->addition;
}
/**
* Set addition
*
* @param string $addition Addition
*
* @return void
*
* @since 1.0.0
*/
public function setAddition(string $addition) : void
{
$this->addition = $addition;
}
public string $addition = '';
}

72
Models/Group.php
View File

@ -30,7 +30,7 @@ class Group extends \phpOMS\Account\Group
* @var \DateTimeImmutable
* @since 1.0.0
*/
protected \DateTimeImmutable $createdAt;
public \DateTimeImmutable $createdAt;
/**
* Created by.
@ -38,7 +38,7 @@ class Group extends \phpOMS\Account\Group
* @var Account
* @since 1.0.0
*/
protected Account $createdBy;
public Account $createdBy;
/**
* Group raw description.
@ -46,7 +46,7 @@ class Group extends \phpOMS\Account\Group
* @var string
* @since 1.0.0
*/
protected string $descriptionRaw = '';
public string $descriptionRaw = '';
/**
* Accounts
@ -67,71 +67,7 @@ class Group extends \phpOMS\Account\Group
{
$this->createdBy = new NullAccount();
$this->createdAt = new \DateTimeImmutable('now');
$this->setName($name);
}
/**
* Get created at.
*
* @return \DateTimeImmutable
*
* @since 1.0.0
*/
public function getCreatedAt() : \DateTimeImmutable
{
return $this->createdAt;
}
/**
* Get created by.
*
* @return Account
*
* @since 1.0.0
*/
public function getCreatedBy() : Account
{
return $this->createdBy;
}
/**
* Set created by
*
* @param Account $createdBy Group created by
*
* @return void
*
* @since 1.0.0
*/
public function setCreatedBy(Account $createdBy) : void
{
$this->createdBy = $createdBy;
}
/**
* Set raw description
*
* @param string $description Description
*
* @return void
*
* @since 1.0.0
*/
public function setDescriptionRaw(string $description) : void
{
$this->descriptionRaw = $description;
}
/**
* Get raw description
*
* @return string Raw description
*
* @since 1.0.0
*/
public function getDescriptionRaw() : string
{
return $this->descriptionRaw;
$this->name = $name;
}
/**

4
Models/LocalizationMapper.php
View File

@ -41,7 +41,7 @@ final class LocalizationMapper extends DataMapperAbstract
protected static array $columns = [
'l11n_id' => ['name' => 'l11n_id', 'type' => 'int', 'internal' => 'id'],
'l11n_country' => ['name' => 'l11n_country', 'type' => 'string', 'internal' => 'country'],
'l11n_language' => ['name' => 'l11n_language', 'type' => 'string', 'internal' => 'lang'],
'l11n_language' => ['name' => 'l11n_language', 'type' => 'string', 'internal' => 'language'],
'l11n_currency' => ['name' => 'l11n_currency', 'type' => 'string', 'internal' => 'currency'],
'l11n_currency_format' => ['name' => 'l11n_currency_format', 'type' => 'string', 'internal' => 'currencyFormat'],
'l11n_number_thousand' => ['name' => 'l11n_number_thousand', 'type' => 'string', 'internal' => 'thousands'],
@ -105,7 +105,7 @@ final class LocalizationMapper extends DataMapperAbstract
'column' => 'code2',
'conditional' => true,
],
'lang' => [
'language' => [
'mapper' => LanguageMapper::class,
'external' => 'l11n_language',
'by' => 'code2',

76
Models/Module.php
View File

@ -28,7 +28,7 @@ use phpOMS\Stdlib\Base\Exception\InvalidEnumValue;
class Module
{
/**
* Account id.
* Module id.
*
* @var int
* @since 1.0.0
@ -36,20 +36,20 @@ class Module
protected int $id = 0;
/**
* Account name.
* Module name.
*
* @var string
* @since 1.0.0
*/
protected string $name = '';
public string $name = '';
/**
* Account name.
* Module description.
*
* @var string
* @since 1.0.0
*/
protected string $description = '';
public string $description = '';
/**
* Group status.
@ -65,7 +65,7 @@ class Module
* @var \DateTimeImmutable
* @since 1.0.0
*/
protected \DateTimeImmutable $createdAt;
public \DateTimeImmutable $createdAt;
/**
* Constructor.
@ -89,70 +89,6 @@ class Module
return $this->id;
}
/**
* Get created at.
*
* @return \DateTimeImmutable
*
* @since 1.0.0
*/
public function getCreatedAt() : \DateTimeImmutable
{
return $this->createdAt;
}
/**
* Get module name.
*
* @return string
*
* @since 1.0.0
*/
public function getName() : string
{
return $this->name;
}
/**
* Set module name.
*
* @param string $name module name
*
* @return void
*
* @since 1.0.0
*/
public function setName(string $name) : void
{
$this->name = $name;
}
/**
* Get module description.
*
* @return string
*
* @since 1.0.0
*/
public function getDescription() : string
{
return $this->description;
}
/**
* Set module description.
*
* @param string $description Module description
*
* @return void
*
* @since 1.0.0
*/
public function setDescription(string $description) : void
{
$this->description = $description;
}
/**
* Get module status.
*

4
Theme/Backend/accounts-list.tpl.php
View File

@ -60,10 +60,10 @@ echo $this->getData('nav')->render(); ?>
<td data-label="<?= $this->getHtml('ID', '0', '0'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
<td data-label="<?= $this->getHtml('Status'); ?>"><a href="<?= $url; ?>"><span class="tag <?= $color; ?>"><?= $this->getHtml('Status'. $value->getStatus()); ?></span></a>
<td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml(
\sprintf('%3$s %2$s %1$s', $value->getName1(), $value->getName2(), $value->getName3())
\sprintf('%3$s %2$s %1$s', $value->name1, $value->name2, $value->name3)
); ?></a>
<td data-label="<?= $this->getHtml('Activity'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getLastActive()->format('Y-m-d H:i:s')); ?></a>
<td data-label="<?= $this->getHtml('Created'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getCreatedAt()->format('Y-m-d H:i:s')); ?></a>
<td data-label="<?= $this->getHtml('Created'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->createdAt->format('Y-m-d H:i:s')); ?></a>
<?php endforeach; ?>
<?php if ($c === 0) : ?>
<tr><td colspan="5" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>

18
Theme/Backend/accounts-single.tpl.php
View File

@ -54,7 +54,7 @@ echo $this->getData('nav')->render(); ?>
</ul>
</div>
<div class="tab-content">
<input type="radio" id="c-tab-1" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-1' ? ' checked' : ''; ?>>
<input type="radio" id="c-tab-1" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-1' ? ' checked' : ''; ?>>
<div class="tab">
<div class="row">
<div class="col-xs-12 col-md-6">
@ -82,25 +82,25 @@ echo $this->getData('nav')->render(); ?>
<tr><td>
<span class="input">
<button type="button"><i class="fa fa-user"></i></button>
<input id="iUsername" name="name" type="text" autocomplete="off" spellcheck="false" value="<?= $this->printHtml($account->getName()); ?>">
<input id="iUsername" name="name" type="text" autocomplete="off" spellcheck="false" value="<?= $this->printHtml($account->login); ?>">
</span>
<tr><td><label for="iName1"><?= $this->getHtml('Name1'); ?></label>
<tr><td>
<span class="input">
<button type="button"><i class="fa fa-user"></i></button>
<input id="iName1" name="name1" type="text" autocomplete="off" spellcheck="false" value="<?= $this->printHtml($account->getName1()); ?>" required>
<input id="iName1" name="name1" type="text" autocomplete="off" spellcheck="false" value="<?= $this->printHtml($account->name1); ?>" required>
</span>
<tr><td><label for="iName2"><?= $this->getHtml('Name2'); ?></label>
<tr><td>
<span class="input">
<button type="button"><i class="fa fa-user"></i></button>
<input id="iName2" name="name2" type="text" autocomplete="off" spellcheck="false" value="<?= $this->printHtml($account->getName2()); ?>">
<input id="iName2" name="name2" type="text" autocomplete="off" spellcheck="false" value="<?= $this->printHtml($account->name2); ?>">
</span>
<tr><td><label for="iName3"><?= $this->getHtml('Name3'); ?></label>
<tr><td>
<span class="input">
<button type="button"><i class="fa fa-user"></i></button>
<input id="iName3" name="name3" type="text" autocomplete="off" spellcheck="false" value="<?= $this->printHtml($account->getName3()); ?>">
<input id="iName3" name="name3" type="text" autocomplete="off" spellcheck="false" value="<?= $this->printHtml($account->name3); ?>">
</span>
<tr><td><label for="iEmail"><?= $this->getHtml('Email'); ?></label>
<tr><td>
@ -153,7 +153,7 @@ echo $this->getData('nav')->render(); ?>
<tr data-href="<?= $url; ?>">
<td><a href="#"><i class="fa fa-times"></i></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->name); ?></a>
<?php endforeach; ?>
<?php if ($c === 0) : ?>
<tr><td colspan="5" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
@ -275,7 +275,7 @@ echo $this->getData('nav')->render(); ?>
</div>
</div>
<input type="radio" id="c-tab-2" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-2' ? ' checked' : ''; ?>>
<input type="radio" id="c-tab-2" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-2' ? ' checked' : ''; ?>>
<div class="tab">
<div class="row">
<div class="col-xs-12">
@ -317,9 +317,9 @@ echo $this->getData('nav')->render(); ?>
<td><?= $this->printHtml($audit->getOld()); ?>
<td><?= $this->printHtml($audit->getNew()); ?>
<td><?= $this->printHtml($audit->getContent()); ?>
<td><?= $this->printHtml($audit->getCreatedBy()->getName()); ?>
<td><?= $this->printHtml($audit->createdBy->login); ?>
<td><?= $this->printHtml($audit->getRef()); ?>
<td><?= $audit->getCreatedAt()->format('Y-m-d H:i'); ?>
<td><?= $audit->createdAt->format('Y-m-d H:i'); ?>
<?php endforeach; ?>
<?php if ($count === 0) : ?>
<tr><td colspan="9" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>

2
Theme/Backend/groups-list.tpl.php
View File

@ -46,7 +46,7 @@ echo $this->getData('nav')->render(); ?>
<tr tabindex="0" data-href="<?= $url; ?>">
<td data-label="<?= $this->getHtml('ID', '0', '0'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
<td data-label="<?= $this->getHtml('Status'); ?>"><a href="<?= $url; ?>"><span class="tag <?= $color; ?>"><?= $this->getHtml('Status'. $value->getStatus()); ?></span></a>
<td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a>
<td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->name); ?></a>
<td data-label="<?= $this->getHtml('Members'); ?>">
<?php endforeach; ?>
<?php if ($c === 0) : ?>

16
Theme/Backend/groups-single.tpl.php
View File

@ -65,7 +65,7 @@ echo $this->getData('nav')->render(); ?>
</ul>
</div>
<div class="tab-content">
<input type="radio" id="c-tab-1" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-1' ? ' checked' : ''; ?>>
<input type="radio" id="c-tab-1" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-1' ? ' checked' : ''; ?>>
<div class="tab">
<div class="row">
<div class="col-xs-12 col-md-6">
@ -76,7 +76,7 @@ echo $this->getData('nav')->render(); ?>
<label for="iGid"><?= $this->getHtml('ID', '0', '0'); ?></label>
<input id="iGid" name="id" type="text" value="<?= $this->printHtml($group->getId()); ?>" disabled>
<label for="iGname"><?= $this->getHtml('Name'); ?></label>
<input id="iGname" name="name" type="text" spellcheck="false" autocomplete="off" placeholder="&#xf0c0; Guest" value="<?= $this->printHtml($group->getName()); ?>">
<input id="iGname" name="name" type="text" spellcheck="false" autocomplete="off" placeholder="&#xf0c0; Guest" value="<?= $this->printHtml($group->name); ?>">
<label for="iGstatus"><?= $this->getHtml('Status'); ?></label>
<select id="iGstatus" name="status">
<?php $status = GroupStatus::getConstants(); foreach ($status as $stat) : ?>
@ -88,8 +88,8 @@ echo $this->getData('nav')->render(); ?>
'group-editor',
'description',
'fGroupEdit',
$group->getDescriptionRaw(),
$group->getDescription()
$group->descriptionRaw,
$group->description
); ?>
</div>
<div class="portlet-foot">
@ -111,7 +111,7 @@ echo $this->getData('nav')->render(); ?>
<?php $c = 0; foreach ($accounts as $key => $value) : ++$c; $url = UriFactory::build('{/prefix}admin/account/settings?{?}&id=' . $value->getId()); ?>
<tr data-href="<?= $url; ?>">
<td><a href="#"><i class="fa fa-times"></i></a>
<td><a href="<?= $url; ?>"><?= $value->getName1(); ?></a>
<td><a href="<?= $url; ?>"><?= $value->name1; ?></a>
<?php endforeach; ?>
<?php if ($c === 0) : ?>
<tr><td colspan="2" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
@ -251,7 +251,7 @@ echo $this->getData('nav')->render(); ?>
</div>
</div>
<input type="radio" id="c-tab-2" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-2' ? ' checked' : ''; ?>>
<input type="radio" id="c-tab-2" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-2' ? ' checked' : ''; ?>>
<div class="tab">
<div class="row">
<div class="col-xs-12">
@ -293,9 +293,9 @@ echo $this->getData('nav')->render(); ?>
<td><?= $this->printHtml($audit->getOld()); ?>
<td><?= $this->printHtml($audit->getNew()); ?>
<td><?= $this->printHtml($audit->getContent()); ?>
<td><?= $this->printHtml($audit->getCreatedBy()->getName()); ?>
<td><?= $this->printHtml($audit->createdBy->login); ?>
<td><?= $this->printHtml($audit->getRef()); ?>
<td><?= $audit->getCreatedAt()->format('Y-m-d H:i'); ?>
<td><?= $audit->createdAt->format('Y-m-d H:i'); ?>
<?php endforeach; ?>
<?php if ($count === 0) : ?>
<tr><td colspan="9" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>

10
Theme/Backend/modules-single.tpl.php
View File

@ -42,7 +42,7 @@ if ($nav !== null) {
</ul>
</div>
<div class="tab-content">
<input type="radio" id="c-tab-1" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-1' ? ' checked' : ''; ?>>
<input type="radio" id="c-tab-1" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-1' ? ' checked' : ''; ?>>
<div class="tab">
<div class="row">
<div class="col-xs-12 col-md-4">
@ -131,7 +131,7 @@ if ($nav !== null) {
<tr data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>"><i class="fa fa-times"></i></a>
<td><a href="<?= $url; ?>">Group</a>
<td><a href="<?= $url; ?>"><?= $value->getName(); ?></a>
<td><a href="<?= $url; ?>"><?= $value->name; ?></a>
<?php endforeach; ?>
<?php if ($c === 0) : ?>
<tr><td colspan="3" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
@ -142,7 +142,7 @@ if ($nav !== null) {
</div>
</div>
<input type="radio" id="c-tab-2" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-2' ? ' checked' : ''; ?>>
<input type="radio" id="c-tab-2" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-2' ? ' checked' : ''; ?>>
<div class="tab">
<div class="row">
<div class="col-xs-12">
@ -184,9 +184,9 @@ if ($nav !== null) {
<td><?= $this->printHtml($audit->getOld()); ?>
<td><?= $this->printHtml($audit->getNew()); ?>
<td><?= $this->printHtml($audit->getContent()); ?>
<td><?= $this->printHtml($audit->getCreatedBy()->getName()); ?>
<td><?= $this->printHtml($audit->createdBy->login); ?>
<td><?= $this->printHtml($audit->getRef()); ?>
<td><?= $audit->getCreatedAt()->format('Y-m-d H:i'); ?>
<td><?= $audit->createdAt->format('Y-m-d H:i'); ?>
<?php endforeach; ?>
<?php if ($count === 0) : ?>
<tr><td colspan="9" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>

6
Theme/Backend/settings-general.tpl.php
View File

@ -47,7 +47,7 @@ $l11n = $this->getData('defaultlocalization') ?? new NullLocalization();
</ul>
</div>
<div class="tab-content">
<input type="radio" id="c-tab-1" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-1' ? ' checked' : ''; ?>>
<input type="radio" id="c-tab-1" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-1' ? ' checked' : ''; ?>>
<div class="tab">
<div class="row">
<div class="col-xs-12 col-md-6">
@ -61,7 +61,7 @@ $l11n = $this->getData('defaultlocalization') ?? new NullLocalization();
<tr><td>
<select id="iOname" name="settings_1000000009">
<?php $unit = UnitMapper::get((int) $settings[1000000009]); ?>
<option value="<?= $this->printHtml($unit->getId()); ?>"><?= $this->printHtml($unit->getName()); ?>
<option value="<?= $this->printHtml($unit->getId()); ?>"><?= $this->printHtml($unit->name); ?>
</select>
</table>
</div>
@ -127,7 +127,7 @@ $l11n = $this->getData('defaultlocalization') ?? new NullLocalization();
</div>
</div>
</div>
<input type="radio" id="c-tab-2" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-2' ? ' checked' : ''; ?>>
<input type="radio" id="c-tab-2" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-2' ? ' checked' : ''; ?>>
<div class="tab">
<div class="row">
<div class="col-xs-12 col-md-4">

26
tests/Controller/Api/ApiControllerAccountTrait.php
View File

@ -33,12 +33,12 @@ trait ApiControllerAccountTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('id', '1');
$this->module->apiAccountGet($request, $response);
self::assertEquals('admin', $response->get('')['response']->getName());
self::assertEquals('admin', $response->get('')['response']->login);
self::assertGreaterThan(0, $response->get('')['response']->getId());
}
@ -52,7 +52,7 @@ trait ApiControllerAccountTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('id', 1);
$request->setData('email', 'oms@orange-management.de');
$request->setData('password', 'orange');
@ -74,12 +74,12 @@ trait ApiControllerAccountTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('search', 'admin');
$this->module->apiAccountFind($request, $response);
self::assertCount(1, $response->get(''));
self::assertEquals('admin', $response->get('')[0]->getName1());
self::assertEquals('admin', $response->get('')[0]->name1);
}
/**
@ -92,7 +92,7 @@ trait ApiControllerAccountTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('login', 'guest');
$request->setData('password', 'guest');
$request->setData('name1', 'Guest');
@ -102,7 +102,7 @@ trait ApiControllerAccountTrait
$this->module->apiAccountCreate($request, $response);
self::assertEquals('guest', $response->get('')['response']->getName());
self::assertEquals('guest', $response->get('')['response']->login);
self::assertGreaterThan(0, $response->get('')['response']->getId());
}
@ -115,7 +115,7 @@ trait ApiControllerAccountTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('login', 'guest2');
$request->setData('password', 'guest2');
$request->setData('name1', 'Guest2');
@ -126,7 +126,7 @@ trait ApiControllerAccountTrait
$this->module->apiAccountCreate($request, $response);
self::assertEquals('guest2', $response->get('')['response']->getName());
self::assertEquals('guest2', $response->get('')['response']->login);
self::assertGreaterThan(0, $response->get('')['response']->getId());
}
@ -140,7 +140,7 @@ trait ApiControllerAccountTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
// mustn't create a profile otherwise it will not be possible to delete the account because of FK constraints
$request->setData('name1', 'Guest');
$request->setData('email', 'test@email.com');
@ -164,12 +164,12 @@ trait ApiControllerAccountTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('status', 999);
$request->setData('description', 'test description');
$this->module->apiAccountCreate($request, $response);
self::assertEquals(RequestStatusCode::R_400, $response->getHeader()->getStatusCode());
self::assertEquals(RequestStatusCode::R_400, $response->header->status);
}
/**
@ -182,7 +182,7 @@ trait ApiControllerAccountTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('account', 1);
$request->setData('igroup-idlist', '1');

4
tests/Controller/Api/ApiControllerApplicationTrait.php
View File

@ -30,10 +30,10 @@ trait ApiControllerApplicationTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('appSrc', 'invalid');
$this->module->apiInstallApplication($request, $response);
self::assertEquals(RequestStatusCode::R_400, $response->getHeader()->getStatusCode());
self::assertEquals(RequestStatusCode::R_400, $response->header->status);
}
}

24
tests/Controller/Api/ApiControllerGroupTrait.php
View File

@ -32,12 +32,12 @@ trait ApiControllerGroupTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('id', '3');
$this->module->apiGroupGet($request, $response);
self::assertEquals('admin', $response->get('')['response']->getName());
self::assertEquals('admin', $response->get('')['response']->name);
self::assertGreaterThan(0, $response->get('')['response']->getId());
}
@ -51,14 +51,14 @@ trait ApiControllerGroupTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('id', '3');
$request->setData('name', 'root');
$this->module->apiGroupUpdate($request, $response);
$this->module->apiGroupGet($request, $response);
self::assertEquals('root', $response->get('')['response']->getName());
self::assertEquals('root', $response->get('')['response']->name);
$request->setData('name', 'admin', true);
$this->module->apiGroupUpdate($request, $response);
@ -74,12 +74,12 @@ trait ApiControllerGroupTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('search', 'admin');
$this->module->apiGroupFind($request, $response);
self::assertCount(1, $response->get(''));
self::assertEquals('admin', $response->get('')[0]->getName());
self::assertEquals('admin', $response->get('')[0]->name);
}
/**
@ -92,14 +92,14 @@ trait ApiControllerGroupTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('name', 'test');
$request->setData('status', GroupStatus::INACTIVE);
$request->setData('description', 'test description');
$this->module->apiGroupCreate($request, $response);
self::assertEquals('test', $response->get('')['response']->getName());
self::assertEquals('test', $response->get('')['response']->name);
self::assertGreaterThan(0, $response->get('')['response']->getId());
// test delete
@ -119,12 +119,12 @@ trait ApiControllerGroupTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('status', 999);
$request->setData('description', 'test description');
$this->module->apiGroupCreate($request, $response);
self::assertEquals(RequestStatusCode::R_400, $response->getHeader()->getStatusCode());
self::assertEquals(RequestStatusCode::R_400, $response->header->status);
}
/**
@ -137,7 +137,7 @@ trait ApiControllerGroupTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('group', 1);
$request->setData('iaccount-idlist', '1');
@ -155,7 +155,7 @@ trait ApiControllerGroupTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('search', 'admin');
$this->module->apiAccountGroupFind($request, $response);

16
tests/Controller/Api/ApiControllerModuleTrait.php
View File

@ -32,7 +32,7 @@ trait ApiControllerModuleTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('module', 'TestModule');
$request->setData('status', ModuleStatusUpdateType::INSTALL);
@ -62,12 +62,12 @@ trait ApiControllerModuleTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('status', ModuleStatusUpdateType::INSTALL);
$this->module->apiModuleStatusUpdate($request, $response);
self::assertEquals(RequestStatusCode::R_403, $response->getHeader()->getStatusCode());
self::assertEquals(RequestStatusCode::R_403, $response->header->status);
self::assertNull($response->get('module_stutus_update'));
}
@ -81,12 +81,12 @@ trait ApiControllerModuleTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('module', 'TestModule');
$request->setData('status', 99);
$this->module->apiModuleStatusUpdate($request, $response);
self::assertEquals(RequestStatusCode::R_400, $response->getHeader()->getStatusCode());
self::assertEquals(RequestStatusCode::R_400, $response->header->status);
}
/**
@ -99,12 +99,12 @@ trait ApiControllerModuleTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('module', 'invalid');
$request->setData('status', ModuleStatusUpdateType::INSTALL);
$this->module->apiModuleStatusUpdate($request, $response);
self::assertEquals(RequestStatusCode::R_400, $response->getHeader()->getStatusCode());
self::assertEquals(RequestStatusCode::R_400, $response->header->status);
}
/**
@ -117,7 +117,7 @@ trait ApiControllerModuleTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$routes = include __DIR__ . '/../../../../../Web/Api/Routes.php';
$hooks = include __DIR__ . '/../../../../../Web/Api/Hooks.php';

32
tests/Controller/Api/ApiControllerPermissionTrait.php
View File

@ -33,7 +33,7 @@ trait ApiControllerPermissionTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('permissionowner', PermissionOwner::GROUP);
$request->setData('permissionref', 1);
@ -52,7 +52,7 @@ trait ApiControllerPermissionTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('id', '2');
$this->module->apiGroupPermissionGet($request, $response);
@ -71,7 +71,7 @@ trait ApiControllerPermissionTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('permissionowner', PermissionOwner::GROUP);
$request->setData('permissionref', 1);
@ -96,11 +96,11 @@ trait ApiControllerPermissionTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('permissionowner', PermissionOwner::GROUP);
$this->module->apiAddGroupPermission($request, $response);
self::assertEquals(RequestStatusCode::R_400, $response->getHeader()->getStatusCode());
self::assertEquals(RequestStatusCode::R_400, $response->header->status);
}
/**
@ -113,12 +113,12 @@ trait ApiControllerPermissionTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('permissionowner', PermissionOwner::ACCOUNT);
$request->setData('permissionref', 1);
$this->module->apiAddGroupPermission($request, $response);
self::assertEquals(RequestStatusCode::R_400, $response->getHeader()->getStatusCode());
self::assertEquals(RequestStatusCode::R_400, $response->header->status);
}
/**
@ -131,7 +131,7 @@ trait ApiControllerPermissionTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('id', 1);
$request->setData('permissionread', PermissionType::READ);
@ -158,7 +158,7 @@ trait ApiControllerPermissionTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('permissionowner', PermissionOwner::ACCOUNT);
$request->setData('permissionref', 1);
@ -177,7 +177,7 @@ trait ApiControllerPermissionTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('id', '1');
$this->module->apiAccountPermissionGet($request, $response);
@ -196,7 +196,7 @@ trait ApiControllerPermissionTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('permissionowner', PermissionOwner::ACCOUNT);
$request->setData('permissionref', 1);
@ -221,11 +221,11 @@ trait ApiControllerPermissionTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('permissionowner', PermissionOwner::ACCOUNT);
$this->module->apiAddAccountPermission($request, $response);
self::assertEquals(RequestStatusCode::R_400, $response->getHeader()->getStatusCode());
self::assertEquals(RequestStatusCode::R_400, $response->header->status);
}
/**
@ -238,12 +238,12 @@ trait ApiControllerPermissionTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('permissionowner', PermissionOwner::GROUP);
$request->setData('permissionref', 1);
$this->module->apiAddAccountPermission($request, $response);
self::assertEquals(RequestStatusCode::R_400, $response->getHeader()->getStatusCode());
self::assertEquals(RequestStatusCode::R_400, $response->header->status);
}
/**
@ -256,7 +256,7 @@ trait ApiControllerPermissionTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('id', 1);
$request->setData('permissionread', PermissionType::READ);

12
tests/Controller/Api/ApiControllerSettingsTrait.php
View File

@ -32,7 +32,7 @@ trait ApiControllerSettingsTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('name', SettingsEnum::PASSWORD_INTERVAL);
$this->module->apiSettingsGet($request, $response);
@ -49,7 +49,7 @@ trait ApiControllerSettingsTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('settings', \json_encode([['name' => SettingsEnum::PASSWORD_INTERVAL, 'content' => '60']]));
$this->module->apiSettingsSet($request, $response);
@ -70,7 +70,7 @@ trait ApiControllerSettingsTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('account_id', 1);
$request->setData('load', true);
$request->setData('localization_load', 'de_DE');
@ -95,7 +95,7 @@ trait ApiControllerSettingsTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1);
$request->header->account = 1;
$request->setData('account_id', 1);
$data = \json_decode('{"settings_country":"US","settings_language":"en","settings_temperature":"celsius","settings_timezone":"America\/New_York","settings_timeformat_vs":"d.m","settings_timeformat_s":"m.y","settings_timeformat_m":"Y.m.d","settings_timeformat_l":"Y.m.d h:i","settings_timeformat_vl":"Y.m.d h:i:s","settings_currency":"EUR","settings_currencyformat":"0","settings_decimal":".","settings_thousands":",","settings_precision_vs":"0","settings_precision_s":"1","settings_precision_m":"2","settings_precision_l":"3","settings_precision_vl":"5","settings_weight_vl":"mg","settings_weight_l":"g","settings_weight_m":"kg","settings_weight_h":"t","settings_weight_vh":"t","settings_speed_vs":"mps","settings_speed_s":"ms","settings_speed_m":"kph","settings_speed_f":"kph","settings_speed_vf":"mach","settings_speed_sea":"mpd","settings_length_vs":"micron","settings_length_s":"mm","settings_length_m":"cm","settings_length_l":"m","settings_length_vl":"km","settings_length_sea":"mi","settings_area_vs":"micron","settings_area_s":"mm","settings_area_m":"cm","settings_area_l":"m","settings_area_vl":"km","settings_volume_vs":"mul","settings_volume_s":"ml","settings_volume_m":"l","settings_volume_l":"cm","settings_volume_vl":"m","settings_volume_teaspoon":"Metric tsp","settings_volume_tablespoon":"Metric tblsp","settings_volume_glass":"Metric cup"}', true);
@ -119,10 +119,10 @@ trait ApiControllerSettingsTrait
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(2);
$request->header->account = 2;
$request->setData('account_id', 1);
$this->module->apiSettingsAccountLocalizationSet($request, $response);
self::assertEquals(RequestStatusCode::R_403, $response->getHeader()->getStatusCode());
self::assertEquals(RequestStatusCode::R_403, $response->header->status);
}
}

24
tests/Models/AccountMapperTest.php
View File

@ -37,10 +37,10 @@ class AccountMapperTest extends \PHPUnit\Framework\TestCase
{
$account = new Account();
$account->setName('TestLogin');
$account->setName1('Donald');
$account->setName2('Fauntleroy');
$account->setName3('Duck');
$account->login = 'TestLogin';
$account->name1 = 'Donald';
$account->name2 = 'Fauntleroy';
$account->name3 = 'Duck';
$account->setLoginTries(3);
$account->setEmail('d.duck@duckburg.com');
$account->setStatus(AccountStatus::ACTIVE);
@ -51,11 +51,11 @@ class AccountMapperTest extends \PHPUnit\Framework\TestCase
self::assertEquals($id, $account->getId());
$accountR = AccountMapper::get($account->getId());
self::assertEquals($account->getCreatedAt()->format('Y-m-d'), $accountR->getCreatedAt()->format('Y-m-d'));
self::assertEquals($account->getName(), $accountR->getName());
self::assertEquals($account->getName1(), $accountR->getName1());
self::assertEquals($account->getName2(), $accountR->getName2());
self::assertEquals($account->getName3(), $accountR->getName3());
self::assertEquals($account->createdAt->format('Y-m-d'), $accountR->createdAt->format('Y-m-d'));
self::assertEquals($account->login, $accountR->login);
self::assertEquals($account->name1, $accountR->name1);
self::assertEquals($account->name2, $accountR->name2);
self::assertEquals($account->name3, $accountR->name3);
self::assertEquals($account->getStatus(), $accountR->getStatus());
self::assertEquals($account->getType(), $accountR->getType());
self::assertEquals($account->getEmail(), $accountR->getEmail());
@ -112,7 +112,7 @@ class AccountMapperTest extends \PHPUnit\Framework\TestCase
$accountR->setLoginTries(0);
AccountMapper::update($accountR);
self::assertEquals(LoginReturnType::WRONG_INPUT_EXCEEDED, AccountMapper::login($accountR->getName(), 'orange'));
self::assertEquals(LoginReturnType::WRONG_INPUT_EXCEEDED, AccountMapper::login($accountR->login, 'orange'));
$accountR->setLoginTries(3);
AccountMapper::update($accountR);
@ -128,7 +128,7 @@ class AccountMapperTest extends \PHPUnit\Framework\TestCase
$accountR->setStatus(AccountStatus::BANNED);
AccountMapper::update($accountR);
self::assertEquals(LoginReturnType::INACTIVE, AccountMapper::login($accountR->getName(), 'orange'));
self::assertEquals(LoginReturnType::INACTIVE, AccountMapper::login($accountR->login, 'orange'));
$accountR->setStatus(AccountStatus::ACTIVE);
AccountMapper::update($accountR);
@ -144,7 +144,7 @@ class AccountMapperTest extends \PHPUnit\Framework\TestCase
TestUtils::setMember($accountR, 'password', '');
AccountMapper::update($accountR);
self::assertEquals(LoginReturnType::EMPTY_PASSWORD, AccountMapper::login($accountR->getName(), 'orange'));
self::assertEquals(LoginReturnType::EMPTY_PASSWORD, AccountMapper::login($accountR->login, 'orange'));
$accountR->generatePassword('orange');
AccountMapper::update($accountR);

14
tests/Models/GroupTest.php
View File

@ -32,9 +32,9 @@ class GroupTest extends \PHPUnit\Framework\TestCase
public function testDefault() : void
{
$group = new Group();
self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $group->getCreatedAt()->format('Y-m-d'));
self::assertEquals(0, $group->getCreatedBy()->getId());
self::assertEquals('', $group->getDescriptionRaw());
self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $group->createdAt->format('Y-m-d'));
self::assertEquals(0, $group->createdBy->getId());
self::assertEquals('', $group->descriptionRaw);
self::assertEquals([], $group->getAccounts());
}
@ -47,8 +47,8 @@ class GroupTest extends \PHPUnit\Framework\TestCase
{
$group = new Group();
$group->setDescriptionRaw('Some test');
self::assertEquals('Some test', $group->getDescriptionRaw());
$group->descriptionRaw = 'Some test';
self::assertEquals('Some test', $group->descriptionRaw);
}
/**
@ -60,7 +60,7 @@ class GroupTest extends \PHPUnit\Framework\TestCase
{
$group = new Group();
$group->setCreatedBy(new NullAccount(3));
self::assertEquals(3, $group->getCreatedBy()->getId());
$group->createdBy = new NullAccount(3);
self::assertEquals(3, $group->createdBy->getId());
}
}

14
tests/Models/ModuleTest.php
View File

@ -39,9 +39,9 @@ class ModuleTest extends \PHPUnit\Framework\TestCase
public function testDefault() : void
{
self::assertEquals(0, $this->module->getId());
self::assertInstanceOf('\DateTimeImmutable', $this->module->getCreatedAt());
self::assertEquals('', $this->module->getName());
self::assertEquals('', $this->module->getDescription());
self::assertInstanceOf('\DateTimeImmutable', $this->module->createdAt);
self::assertEquals('', $this->module->name);
self::assertEquals('', $this->module->description);
self::assertEquals(ModuleStatus::INACTIVE, $this->module->getStatus());
self::assertEquals(\json_encode($this->module->jsonSerialize()), $this->module->__toString());
self::assertEquals($this->module->jsonSerialize(), $this->module->toArray());
@ -54,8 +54,8 @@ class ModuleTest extends \PHPUnit\Framework\TestCase
*/
public function testNameInputOutput() : void
{
$this->module->setName('Name');
self::assertEquals('Name', $this->module->getName());
$this->module->name = 'Name';
self::assertEquals('Name', $this->module->name);
}
/**
@ -65,8 +65,8 @@ class ModuleTest extends \PHPUnit\Framework\TestCase
*/
public function testDescriptionInputOutput() : void
{
$this->module->setDescription('Desc');
self::assertEquals('Desc', $this->module->getDescription());
$this->module->description = 'Desc';
self::assertEquals('Desc', $this->module->description);
}
/**