Automated formatting changes

This commit is contained in:
Formatter Bot 2020-10-06 19:54:45 +00:00
parent 0524fcadfb
commit 3b3421ceff
3 changed files with 51 additions and 53 deletions

View File

@ -90,7 +90,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiLogin(RequestAbstract $request, ResponseAbstract $response, $data = null): void
public function apiLogin(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
$response->getHeader()->set('Content-Type', MimeType::M_JSON . '; charset=utf-8', true);
@ -121,7 +121,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiLogout(RequestAbstract $request, ResponseAbstract $response, $data = null): void
public function apiLogout(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
$response->getHeader()->set('Content-Type', MimeType::M_JSON . '; charset=utf-8', true);
@ -150,7 +150,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiForgot(RequestAbstract $request, ResponseAbstract $response, $data = null): void
public function apiForgot(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
}
@ -167,7 +167,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiSettingsGet(RequestAbstract $request, ResponseAbstract $response, $data = null): void
public function apiSettingsGet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
$id = $request->getData('id');
$group = $request->getData('group');
@ -200,7 +200,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiSettingsSet(RequestAbstract $request, ResponseAbstract $response, $data = null): void
public function apiSettingsSet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
$dataSettings = $request->getDataJson('settings');
@ -216,7 +216,7 @@ final class ApiController extends Controller
$request->getHeader()->getAccount(),
$this->app->appSettings->get($id, $name, $module, $group, $account),
$data,
function () use ($id, $name, $content, $module, $group, $account): void {
function () use ($id, $name, $content, $module, $group, $account) : void {
$this->app->appSettings->set([
[
'id' => $id,
@ -249,7 +249,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiSettingsAccountLocalizationSet(RequestAbstract $request, ResponseAbstract $response, $data = null): void
public function apiSettingsAccountLocalizationSet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
$requestAccount = $request->getHeader()->getAccount();
$accountId = (int) $request->getData('account_id');
@ -391,7 +391,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiInstallApplication(RequestAbstract $request, ResponseAbstract $response, $data = null): void
public function apiInstallApplication(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
$appManager = new ApplicationManager($this->app->moduleManager);
@ -423,7 +423,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiActivateTheme(RequestAbstract $request, ResponseAbstract $response, $data = null): void
public function apiActivateTheme(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
if (\file_exists(__DIR__ . '/../../../' . $request->getData('appDest') . '/css')) {
Directory::delete(__DIR__ . '/../../../' . $request->getData('appDest') . '/css');
@ -451,7 +451,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiGroupGet(RequestAbstract $request, ResponseAbstract $response, $data = null): void
public function apiGroupGet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
$group = GroupMapper::get((int) $request->getData('id'));
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Group', 'Group successfully returned', $group);
@ -470,7 +470,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiGroupUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null): void
public function apiGroupUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
/** @var Group $old */
$old = clone GroupMapper::get((int) $request->getData('id'));
@ -488,7 +488,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
private function updateGroupFromRequest(RequestAbstract $request): Group
private function updateGroupFromRequest(RequestAbstract $request) : Group
{
$group = GroupMapper::get((int) $request->getData('id'));
$group->setName((string) ($request->getData('name') ?? $group->getName()));
@ -508,7 +508,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
private function validateGroupCreate(RequestAbstract $request): array
private function validateGroupCreate(RequestAbstract $request) : array
{
$val = [];
if (($val['name'] = empty($request->getData('name')))
@ -533,7 +533,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiGroupCreate(RequestAbstract $request, ResponseAbstract $response, $data = null): void
public function apiGroupCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
if (!empty($val = $this->validateGroupCreate($request))) {
$response->set('group_create', new FormValidation($val));
@ -556,7 +556,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
private function createGroupFromRequest(RequestAbstract $request): Group
private function createGroupFromRequest(RequestAbstract $request) : Group
{
$group = new Group();
$group->setCreatedBy(new NullAccount($request->getHeader()->getAccount()));
@ -581,7 +581,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiGroupDelete(RequestAbstract $request, ResponseAbstract $response, $data = null): void
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());
@ -601,7 +601,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiGroupFind(RequestAbstract $request, ResponseAbstract $response, $data = null): void
public function apiGroupFind(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
$response->getHeader()->set('Content-Type', MimeType::M_JSON, true);
$response->set(
@ -625,7 +625,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiAccountGet(RequestAbstract $request, ResponseAbstract $response, $data = null): void
public function apiAccountGet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
/** @var Account $account */
$account = AccountMapper::get((int) $request->getData('id'));
@ -645,7 +645,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiAccountFind(RequestAbstract $request, ResponseAbstract $response, $data = null): void
public function apiAccountFind(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
$response->getHeader()->set('Content-Type', MimeType::M_JSON, true);
$response->set(
@ -669,7 +669,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiAccountGroupFind(RequestAbstract $request, ResponseAbstract $response, $data = null): void
public function apiAccountGroupFind(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
/** @var Account[] $accounts */
$accounts = \array_values(AccountMapper::find((string) ($request->getData('search') ?? '')));
@ -709,7 +709,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
private function validateAccountCreate(RequestAbstract $request): array
private function validateAccountCreate(RequestAbstract $request) : array
{
$val = [];
if (($val['name1'] = empty($request->getData('name1')))
@ -736,7 +736,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiAccountCreate(RequestAbstract $request, ResponseAbstract $response, $data = null): void
public function apiAccountCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
if (!empty($val = $this->validateAccountCreate($request))) {
$response->set('account_create', new FormValidation($val));
@ -773,7 +773,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
private function createProfileForAccount(Account $account, RequestAbstract $request): void
private function createProfileForAccount(Account $account, RequestAbstract $request) : void
{
if (((string) ($request->getData('password') ?? '')) === ''
|| ((string) ($request->getData('login') ?? '')) === ''
@ -788,7 +788,7 @@ final class ApiController extends Controller
$request
);
$this->updateModel($request->getHeader()->getAccount(), $old, $account, function () use ($account): void {
$this->updateModel($request->getHeader()->getAccount(), $old, $account, function () use ($account) : void {
$account->setLoginTries((int) $this->app->appSettings->get(null, SettingsEnum::LOGIN_TRIES)['content']);
AccountMapper::update($account);
}, 'account', $request->getOrigin());
@ -803,7 +803,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
private function createAccountFromRequest(RequestAbstract $request): Account
private function createAccountFromRequest(RequestAbstract $request) : Account
{
$account = new Account();
$account->setStatus((int) ($request->getData('status') ?? AccountStatus::INACTIVE));
@ -847,7 +847,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiAccountDelete(RequestAbstract $request, ResponseAbstract $response, $data = null): void
public function apiAccountDelete(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
/** @var Account $account */
$account = AccountMapper::get((int) ($request->getData('id')));
@ -868,7 +868,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiAccountUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null): void
public function apiAccountUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
/** @var Account $old */
$old = clone AccountMapper::get((int) $request->getData('id'));
@ -892,7 +892,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
private function updateAccountFromRequest(RequestAbstract $request, bool $allowPassword = false): Account
private function updateAccountFromRequest(RequestAbstract $request, bool $allowPassword = false) : Account
{
/** @var Account $account */
$account = AccountMapper::get((int) ($request->getData('id')));
@ -924,7 +924,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiModuleStatusUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null): void
public function apiModuleStatusUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
$module = $request->getData('module');
$status = (int) $request->getData('status');
@ -994,7 +994,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiAccountPermissionGet(RequestAbstract $request, ResponseAbstract $response, $data = null): void
public function apiAccountPermissionGet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
/** @var AccountPermission $account */
$account = AccountPermissionMapper::get((int) $request->getData('id'));
@ -1014,7 +1014,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiGroupPermissionGet(RequestAbstract $request, ResponseAbstract $response, $data = null): void
public function apiGroupPermissionGet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
/** @var GroupPermission $group */
$group = GroupPermissionMapper::get((int) $request->getData('id'));
@ -1034,7 +1034,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiGroupPermissionDelete(RequestAbstract $request, ResponseAbstract $response, $data = null): void
public function apiGroupPermissionDelete(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
/** @var GroupPermission $permission */
$permission = GroupPermissionMapper::get((int) $request->getData('id'));
@ -1055,7 +1055,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiAccountPermissionDelete(RequestAbstract $request, ResponseAbstract $response, $data = null): void
public function apiAccountPermissionDelete(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
/** @var AccountPermission $permission */
$permission = AccountPermissionMapper::get((int) $request->getData('id'));
@ -1076,7 +1076,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiUserPermissionDelete(RequestAbstract $request, ResponseAbstract $response, $data = null): void
public function apiUserPermissionDelete(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
/** @var AccountPermission $permission */
$permission = AccountPermissionMapper::get((int) $request->getData('id'));
@ -1097,7 +1097,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiAddGroupPermission(RequestAbstract $request, ResponseAbstract $response, $data = null): void
public function apiAddGroupPermission(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
if (!empty($val = $this->validatePermissionCreate($request))) {
$response->set('permission_create', new FormValidation($val));
@ -1132,7 +1132,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiAddAccountPermission(RequestAbstract $request, ResponseAbstract $response, $data = null): void
public function apiAddAccountPermission(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
if (!empty($val = $this->validatePermissionCreate($request))) {
$response->set('permission_create', new FormValidation($val));
@ -1167,7 +1167,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function createAccountModelPermission(PermissionAbstract $permission, int $account, string $ip): void
public function createAccountModelPermission(PermissionAbstract $permission, int $account, string $ip) : void
{
$this->createModel($account, $permission, AccountPermissionMapper::class, 'account-permission', $ip);
}
@ -1181,7 +1181,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
private function validatePermissionCreate(RequestAbstract $request): array
private function validatePermissionCreate(RequestAbstract $request) : array
{
$val = [];
if (($val['permissionowner'] = !PermissionOwner::isValidValue((int) $request->getData('permissionowner')))
@ -1202,7 +1202,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function createPermissionFromRequest(RequestAbstract $request): PermissionAbstract
public function createPermissionFromRequest(RequestAbstract $request) : PermissionAbstract
{
/** @var AccountPermission|GroupPermission $permission */
$permission = ((int) $request->getData('permissionowner')) === PermissionOwner::GROUP ? new GroupPermission((int) $request->getData('permissionref')) : new AccountPermission((int) $request->getData('permissionref'));
@ -1236,7 +1236,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiAccountPermissionUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null): void
public function apiAccountPermissionUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
/** @var AccountPermission $old */
$old = clone AccountPermissionMapper::get((int) $request->getData('id'));
@ -1261,7 +1261,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiGroupPermissionUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null): void
public function apiGroupPermissionUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
/** @var GroupPermission $old */
$old = clone GroupPermissionMapper::get((int) $request->getData('id'));
@ -1283,7 +1283,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
private function updatePermissionFromRequest(PermissionAbstract $permission, RequestAbstract $request): PermissionAbstract
private function updatePermissionFromRequest(PermissionAbstract $permission, RequestAbstract $request) : PermissionAbstract
{
$permission->setUnit(empty($request->getData('permissionunit')) ? $permission->getUnit() : (int) $request->getData('permissionunit'));
$permission->setApp(empty($request->getData('permissionapp')) ? $permission->getApp() : (string) $request->getData('permissionapp'));
@ -1313,7 +1313,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiAddGroupToAccount(RequestAbstract $request, ResponseAbstract $response, $data = null): void
public function apiAddGroupToAccount(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
$account = (int) $request->getData('account');
$groups = \array_map('intval', $request->getDataList('igroup-idlist'));
@ -1335,7 +1335,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiAddAccountToGroup(RequestAbstract $request, ResponseAbstract $response, $data = null): void
public function apiAddAccountToGroup(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
$group = (int) $request->getData('group');
$accounts = \array_map('intval', $request->getDataList('iaccount-idlist'));
@ -1357,7 +1357,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiReInit(RequestAbstract $request, ResponseAbstract $response, $data = null): void
public function apiReInit(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
$directories = \glob(__DIR__ . '/../../../Web/*', \GLOB_ONLYDIR);
@ -1407,7 +1407,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiCheckForUpdates(RequestAbstract $request, ResponseAbstract $response, $data = null): void
public function apiCheckForUpdates(RequestAbstract $request, ResponseAbstract $response, $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
$request = new HttpRequest(new HttpUri('https://api.github.com/repos/Orange-Management/Updates/contents'));
@ -1459,7 +1459,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiUpdateFile(RequestAbstract $request, ResponseAbstract $response, $data = null): void
public function apiUpdateFile(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
$this->apiUpdate([[
'name' => 'temp.json',
@ -1476,7 +1476,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
private function apiUpdate(array $toUpdate): void
private function apiUpdate(array $toUpdate) : 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
@ -1498,7 +1498,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
private function downloadUpdate(string $url, string $dest): void
private function downloadUpdate(string $url, string $dest) : 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
$request = new HttpRequest(new HttpUri($url));
@ -1517,7 +1517,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
private function runUpdate(string $updateFile): void
private function runUpdate(string $updateFile) : void
{
}
}

View File

@ -32,8 +32,6 @@ class Account extends \phpOMS\Account\Account
*/
protected int $tries = 0;
/**
* Get remaining login tries
*

View File

@ -17,6 +17,7 @@ namespace Modules\Admin\tests\Controller;
use Model\CoreSettings;
use Modules\Admin\Models\AccountPermission;
use Modules\Admin\tests\Controller\Api\ApiControllerAccountTrait;
use Modules\Admin\tests\Controller\Api\ApiControllerApplicationTrait;
use Modules\Admin\tests\Controller\Api\ApiControllerGroupTrait;
use Modules\Admin\tests\Controller\Api\ApiControllerModuleTrait;
use Modules\Admin\tests\Controller\Api\ApiControllerPermissionTrait;
@ -31,7 +32,6 @@ use phpOMS\Module\ModuleAbstract;
use phpOMS\Module\ModuleManager;
use phpOMS\Router\WebRouter;
use phpOMS\Utils\TestUtils;
use Modules\Admin\tests\Controller\Api\ApiControllerApplicationTrait;
/**
* @testdox Modules\Admin\tests\Controller\ApiControllerTest: Admin api controller