Skip to content
Code-Schnipsel Gruppen Projekte
Bestätigt Commit e031d2fd erstellt von Henning Leutz's avatar Henning Leutz :martial_arts_uniform:
Dateien durchsuchen

refactor: code style + psr12

Übergeordneter 77e26d6a
No related branches found
No related tags found
2 Merge Requests!3Next,!2feat: new versioning
Pipeline #5543 mit Warnungen bestanden mit Phase
in 11 Sekunden
Dieser Commit ist Teil des Merge Request !2. Hier erstellte Kommentare werden im Kontext dieses Merge Request erstellt.
werden angezeigt mit 187 Ergänzungen und 167 Löschungen
<?php
use QUI\Permissions\Permission;
use QUI\Memberships\Handler as MembershipsHandler;
/**
* Checks if a user has the necessary permisssions to unlock a locked membership panel
*
* @return bool
*/
use QUI\Memberships\Handler as MembershipsHandler;
use QUI\Permissions\Permission;
QUI::$Ajax->registerFunction(
'package_quiqqer_memberships_ajax_memberships_canUnlock',
function () {
......@@ -16,6 +17,6 @@ function () {
QUI::getUserBySession()
);
},
array(),
[],
'Permission::checkAdminUser'
);
<?php
use QUI\Memberships\Handler as MembershipsHandler;
use QUI\Utils\Security\Orthos;
/**
* Create a new QUIQQER membership
*
......@@ -10,6 +7,10 @@
* @param array $groupIds - IDs of all groups belonging to the new membership
* @return integer|false - ID of new membership or false on error
*/
use QUI\Memberships\Handler as MembershipsHandler;
use QUI\Utils\Security\Orthos;
QUI::$Ajax->registerFunction(
'package_quiqqer_memberships_ajax_memberships_create',
function ($title, $groupIds) {
......@@ -17,18 +18,18 @@ function ($title, $groupIds) {
$Memberships = MembershipsHandler::getInstance();
/** @var \QUI\Memberships\Membership $NewMembership */
$NewMembership = $Memberships->createChild(array(
'title' => Orthos::clear($title),
$NewMembership = $Memberships->createChild([
'title' => Orthos::clear($title),
'groupIds' => Orthos::clearArray(json_decode($groupIds, true))
));
]);
} catch (QUI\Memberships\Exception $Exception) {
QUI::getMessagesHandler()->addError(
QUI::getLocale()->get(
'quiqqer/memberships',
'message.ajax.memberships.create.error',
array(
[
'error' => $Exception->getMessage()
)
]
)
);
......@@ -41,9 +42,9 @@ function ($title, $groupIds) {
QUI::getLocale()->get(
'quiqqer/memberships',
'message.ajax.general.error',
array(
[
'error' => $Exception->getMessage()
)
]
)
);
......@@ -54,14 +55,14 @@ function ($title, $groupIds) {
QUI::getLocale()->get(
'quiqqer/memberships',
'message.ajax.memberships.create.success',
array(
[
'title' => $title
)
]
)
);
return $NewMembership->getId();
},
array('title', 'groupIds'),
['title', 'groupIds'],
'Permission::checkAdminUser'
);
<?php
use QUI\Memberships\Handler as MembershipsHandler;
/**
* Delete multiple memberships
*
* @param array $membershipsIds - Membership IDs
* @return bool - success
*/
use QUI\Memberships\Handler as MembershipsHandler;
QUI::$Ajax->registerFunction(
'package_quiqqer_memberships_ajax_memberships_delete',
function ($membershipIds) {
try {
$membershipIds = json_decode($membershipIds, true);
$Memberships = new MembershipsHandler();
$Memberships = new MembershipsHandler();
foreach ($membershipIds as $membershipId) {
$Membership = $Memberships->getChild((int)$membershipId);
......@@ -24,9 +25,9 @@ function ($membershipIds) {
QUI::getLocale()->get(
'quiqqer/memberships',
'message.ajax.memberships.delete.error',
array(
[
'error' => $Exception->getMessage()
)
]
)
);
......@@ -39,9 +40,9 @@ function ($membershipIds) {
QUI::getLocale()->get(
'quiqqer/memberships',
'message.ajax.general.error',
array(
[
'error' => $Exception->getMessage()
)
]
)
);
......@@ -57,6 +58,6 @@ function ($membershipIds) {
return true;
},
array('membershipIds'),
['membershipIds'],
'Permission::checkAdminUser'
);
<?php
use QUI\Memberships\Handler as MembershipsHandler;
/**
* Get data of single membership
*
* @return array
*/
use QUI\Memberships\Handler as MembershipsHandler;
QUI::$Ajax->registerFunction(
'package_quiqqer_memberships_ajax_memberships_get',
function ($id) {
$Memberships = MembershipsHandler::getInstance();
$Membership = $Memberships->getChild((int)$id);
$attributes = $Membership->getAttributes();
$Membership = $Memberships->getChild((int)$id);
$attributes = $Membership->getAttributes();
$attributes['groupIds'] = trim($attributes['groupIds'], ',');
$attributes['groupIds'] = trim($attributes['groupIds'], ',');
$attributes['uniqueGroupIds'] = $Membership->getUniqueGroupIds();
return $attributes;
},
array('id'),
['id'],
'Permission::checkAdminUser'
);
<?php
use QUI\Memberships\Utils;
/**
* Get all installed packages that are relevant for quiqqer/memberships
*
* @return array
*/
use QUI\Memberships\Utils;
QUI::$Ajax->registerFunction(
'package_quiqqer_memberships_ajax_memberships_getInstalledMembershipPackages',
function () {
return Utils::getInstalledMembershipPackages();
},
array(),
[],
'Permission::checkAdminUser'
);
<?php
use QUI\Memberships\Handler as MembershipsHandler;
use QUI\Utils\Security\Orthos;
use QUI\Utils\Grid;
use QUI\Memberships\Membership;
/**
* Get/search QUIQQER memberships
*
* @return array
*/
use QUI\Memberships\Handler as MembershipsHandler;
use QUI\Memberships\Membership;
use QUI\Utils\Grid;
use QUI\Utils\Security\Orthos;
QUI::$Ajax->registerFunction(
'package_quiqqer_memberships_ajax_memberships_getList',
function ($searchParams) {
$searchParams = Orthos::clearArray(json_decode($searchParams, true));
$Memberships = MembershipsHandler::getInstance();
$memberships = array();
$Memberships = MembershipsHandler::getInstance();
$memberships = [];
foreach ($Memberships->search($searchParams) as $membershipId) {
/** @var Membership $Membership */
$Membership = $Memberships->getChild($membershipId);
$data = $Membership->getAttributes();
$memberships[] = array(
'id' => $data['id'],
'title' => $Membership->getTitle(),
$Membership = $Memberships->getChild($membershipId);
$data = $Membership->getAttributes();
$memberships[] = [
'id' => $data['id'],
'title' => $Membership->getTitle(),
'description' => $Membership->getDescription(),
'duration' => $data['duration'],
'userCount' => count($Membership->getMembershipUserIds()),
'autoExtend' => boolval($data['autoExtend'])
);
'duration' => $data['duration'],
'userCount' => count($Membership->getMembershipUserIds()),
'autoExtend' => boolval($data['autoExtend'])
];
}
$Grid = new Grid($searchParams);
......@@ -38,6 +39,6 @@ function ($searchParams) {
$Memberships->countChildren() // @todo ggf. andere methode
);
},
array('searchParams'),
['searchParams'],
'Permission::checkAdminUser'
);
<?php
use QUI\Memberships\Handler as MembershipsHandler;
/**
* Get membership setting
*
* @return mixed
*/
use QUI\Memberships\Handler as MembershipsHandler;
QUI::$Ajax->registerFunction(
'package_quiqqer_memberships_ajax_memberships_getSetting',
function ($key) {
return MembershipsHandler::getSetting($key);
},
array('key'),
['key'],
'Permission::checkAdminUser'
);
<?php
use QUI\Memberships\Handler as MembershipsHandler;
/**
* Get data of single membership
*
* @return array
*/
use QUI\Memberships\Handler as MembershipsHandler;
QUI::$Ajax->registerFunction(
'package_quiqqer_memberships_ajax_memberships_getView',
function ($id) {
$Memberships = MembershipsHandler::getInstance();
$Membership = $Memberships->getChild((int)$id);
$Membership = $Memberships->getChild((int)$id);
return $Membership->getBackendViewData();
},
array('id'),
['id'],
'Permission::checkAdminUser'
);
<?php
use QUI\Memberships\Handler as MembershipsHandler;
use QUI\Watcher;
/**
* Locks a membership panel if the user has the necessary permission(s)
*
......@@ -10,6 +7,10 @@
* @param string $lockKey - Membership panel lock key
* @return bool - success
*/
use QUI\Memberships\Handler as MembershipsHandler;
use QUI\Watcher;
QUI::$Ajax->registerFunction(
'package_quiqqer_memberships_ajax_memberships_lock',
function ($id) {
......@@ -25,9 +26,9 @@ function ($id) {
QUI::getLocale()->get(
'quiqqer/memberships',
'watcher.membership.force.edit',
array(
[
'id' => $id
)
]
),
'package_quiqqer_memberships_ajax_memberships_lock'
);
......@@ -53,6 +54,6 @@ function ($id) {
return true;
},
array('id'),
['id'],
'Permission::checkAdminUser'
);
<?php
use QUI\Memberships\Handler as MembershipsHandler;
/**
* Create a new Product from a Membership
*
* @param int $membershipId
* @return bool - success
*/
use QUI\Memberships\Handler as MembershipsHandler;
QUI::$Ajax->registerFunction(
'package_quiqqer_memberships_ajax_memberships_products_createMembershipProducts',
function ($membershipId) {
try {
$Memberships = MembershipsHandler::getInstance();
$Membership = $Memberships->getChild((int)$membershipId);
$Membership = $Memberships->getChild((int)$membershipId);
$Membership->createProduct();
} catch (QUI\Memberships\Exception $Exception) {
QUI::getMessagesHandler()->addError(
QUI::getLocale()->get(
'quiqqer/memberships',
'message.ajax.memberships.products.createMembershipProducts.error',
array(
[
'error' => $Exception->getMessage()
)
]
)
);
return false;
} catch (\Exception $Exception) {
QUI\System\Log::addError('AJAX :: package_quiqqer_memberships_ajax_memberships_products_createMembershipProducts');
QUI\System\Log::addError(
'AJAX :: package_quiqqer_memberships_ajax_memberships_products_createMembershipProducts'
);
QUI\System\Log::writeException($Exception);
QUI::getMessagesHandler()->addError(
QUI::getLocale()->get(
'quiqqer/memberships',
'message.ajax.general.error',
array(
[
'error' => $Exception->getMessage()
)
]
)
);
......@@ -53,6 +56,6 @@ function ($membershipId) {
return true;
},
array('membershipId'),
['membershipId'],
'Permission::checkAdminUser'
);
<?php
use QUI\Memberships\Handler as MembershipsHandler;
use QUI\ERP\Products\Handler\Fields as ProductFields;
/**
* Get list of Products that have a specific Membership assigned
*
* @param int $membershipId
* @return array
*/
use QUI\ERP\Products\Handler\Fields as ProductFields;
use QUI\Memberships\Handler as MembershipsHandler;
QUI::$Ajax->registerFunction(
'package_quiqqer_memberships_ajax_memberships_products_getMembershipProducts',
function ($membershipId) {
$Memberships = MembershipsHandler::getInstance();
$Membership = $Memberships->getChild((int)$membershipId);
$productData = array();
$Membership = $Memberships->getChild((int)$membershipId);
$productData = [];
/** @var \QUI\ERP\Products\Product\Product $Product */
foreach ($Membership->getProducts() as $Product) {
$productData[] = array(
'id' => $Product->getId(),
'title' => $Product->getTitle(),
$productData[] = [
'id' => $Product->getId(),
'title' => $Product->getTitle(),
'articleNo' => $Product->getFieldValue(ProductFields::FIELD_PRODUCT_NO)
);
];
}
return $productData;
},
array('membershipId'),
['membershipId'],
'Permission::checkAdminUser'
);
<?php
use QUI\Memberships\Handler as MembershipsHandler;
use QUI\Lock\Locker;
use QUI\Watcher;
/**
* Unlocks a location panel if the user has the necessary permission(s)
*
......@@ -12,6 +8,10 @@
*
* @throws \QUI\Permissions\Exception
*/
use QUI\Memberships\Handler as MembershipsHandler;
use QUI\Watcher;
QUI::$Ajax->registerFunction(
'package_quiqqer_memberships_ajax_memberships_unlock',
function ($id) {
......@@ -27,9 +27,9 @@ function ($id) {
QUI::getLocale()->get(
'quiqqer/memberships',
'watcher.location.force.edit',
array(
[
'id' => $Membership->getId()
)
]
),
'package_quiqqer_memberships_ajax_memberships_lock'
);
......@@ -55,6 +55,6 @@ function ($id) {
return true;
},
array('id'),
['id'],
'Permission::checkAdminUser'
);
<?php
use QUI\Memberships\Handler as MembershipsHandler;
use QUI\Memberships\Utils;
/**
* Update a membership
*
......@@ -10,6 +7,10 @@
* @param array $attributes - Update attributes
* @return array|false - License data or false on error
*/
use QUI\Memberships\Handler as MembershipsHandler;
use QUI\Memberships\Utils;
QUI::$Ajax->registerFunction(
'package_quiqqer_memberships_ajax_memberships_update',
function ($id, $attributes) {
......@@ -19,10 +20,10 @@ function ($id, $attributes) {
$Membership = $Memberships->getChild((int)$id);
if ($Membership->isLocked()) {
throw new QUI\Memberships\Exception(array(
throw new QUI\Memberships\Exception([
'quiqqer/memberships',
'exception.membership.cannot.update.when.locked'
));
]);
}
$attributes = json_decode($attributes, true);
......@@ -53,9 +54,9 @@ function ($id, $attributes) {
QUI::getLocale()->get(
'quiqqer/memberships',
'message.ajax.memberships.update.error',
array(
[
'error' => $Exception->getMessage()
)
]
)
);
......@@ -68,9 +69,9 @@ function ($id, $attributes) {
QUI::getLocale()->get(
'quiqqer/memberships',
'message.ajax.general.error',
array(
[
'error' => $Exception->getMessage()
)
]
)
);
......@@ -81,15 +82,15 @@ function ($id, $attributes) {
QUI::getLocale()->get(
'quiqqer/memberships',
'message.ajax.memberships.update.success',
array(
'id' => $Membership->getId(),
[
'id' => $Membership->getId(),
'title' => $Membership->getTitle()
)
]
)
);
return true;
},
array('id', 'attributes'),
['id', 'attributes'],
'Permission::checkAdminUser'
);
<?php
use QUI\Memberships\Users\Handler as MembershipUsersHandler;
use QUI\Memberships\Handler as MembershipsHandler;
/**
* Add user(s) to a QUIQQER membership
*
......@@ -10,27 +7,31 @@
* @param array $userIds - QUIQQER user IDs
* @return bool - success
*/
use QUI\Memberships\Handler as MembershipsHandler;
use QUI\Memberships\Users\Handler as MembershipUsersHandler;
QUI::$Ajax->registerFunction(
'package_quiqqer_memberships_ajax_memberships_users_create',
function ($membershipId, $userIds) {
try {
$MembershipUsers = MembershipUsersHandler::getInstance();
$userIds = json_decode($userIds, true);
$userIds = json_decode($userIds, true);
foreach ($userIds as $userId) {
$MembershipUsers->createChild(array(
$MembershipUsers->createChild([
'membershipId' => (int)$membershipId,
'userId' => (int)$userId
));
'userId' => (int)$userId
]);
}
} catch (QUI\Memberships\Exception $Exception) {
QUI::getMessagesHandler()->addError(
QUI::getLocale()->get(
'quiqqer/memberships',
'message.ajax.memberships.users.create.error',
array(
[
'error' => $Exception->getMessage()
)
]
)
);
......@@ -43,9 +44,9 @@ function ($membershipId, $userIds) {
QUI::getLocale()->get(
'quiqqer/memberships',
'message.ajax.general.error',
array(
[
'error' => $Exception->getMessage()
)
]
)
);
......@@ -58,15 +59,15 @@ function ($membershipId, $userIds) {
QUI::getLocale()->get(
'quiqqer/memberships',
'message.ajax.memberships.users.create.success',
array(
'membershipId' => $Membership->getId(),
[
'membershipId' => $Membership->getId(),
'membershipTitle' => $Membership->getTitle()
)
]
)
);
return true;
},
array('membershipId', 'userIds'),
['membershipId', 'userIds'],
'Permission::checkAdminUser'
);
<?php
use QUI\Memberships\Handler as MembershipsHandler;
use QUI\Memberships\Users\Handler as MembershipUsersHandler;
/**
* Delete user(s) from a membership
*
* @param array $membershipsIds - Membership IDs
* @return bool - success
*/
use QUI\Memberships\Users\Handler as MembershipUsersHandler;
QUI::$Ajax->registerFunction(
'package_quiqqer_memberships_ajax_memberships_users_delete',
function ($userIds) {
try {
$MembershipUsers = MembershipUsersHandler::getInstance();
$userIds = json_decode($userIds, true);
$userIds = json_decode($userIds, true);
foreach ($userIds as $userId) {
$MembershipUsers->getChild((int)$userId)->delete();
......@@ -24,9 +24,9 @@ function ($userIds) {
QUI::getLocale()->get(
'quiqqer/memberships',
'message.ajax.memberships.users.delete.error',
array(
[
'error' => $Exception->getMessage()
)
]
)
);
......@@ -39,9 +39,9 @@ function ($userIds) {
QUI::getLocale()->get(
'quiqqer/memberships',
'message.ajax.general.error',
array(
[
'error' => $Exception->getMessage()
)
]
)
);
......@@ -57,6 +57,6 @@ function ($userIds) {
return true;
},
array('userIds'),
['userIds'],
'Permission::checkAdminUser'
);
<?php
use QUI\Memberships\Users\Handler as MembershipUsersHandler;
use QUI\Memberships\Users\MembershipUser;
/**
* Get general data of a MembershipUser
*
* @param int $membershipUserId
* @return array|false - history data or false on error
*/
use QUI\Memberships\Users\Handler as MembershipUsersHandler;
use QUI\Memberships\Users\MembershipUser;
QUI::$Ajax->registerFunction(
'package_quiqqer_memberships_ajax_memberships_users_get',
function ($membershipUserId) {
......@@ -25,15 +26,15 @@ function ($membershipUserId) {
QUI::getLocale()->get(
'quiqqer/memberships',
'message.ajax.general.error',
array(
[
'error' => $Exception->getMessage()
)
]
)
);
return false;
}
},
array('membershipUserId'),
['membershipUserId'],
'Permission::checkAdminUser'
);
<?php
use QUI\Memberships\Handler as MembershipsHandler;
use QUI\Memberships\Users\Handler as MembershipUsersHandler;
use QUI\Utils\Security\Orthos;
use QUI\Utils\Grid;
use QUI\Memberships\Users\MembershipUser;
/**
* Get/search QUIQQER membership users (archived)
*
......@@ -13,18 +7,25 @@
* @param array $searchParams - Search params
* @return array
*/
use QUI\Memberships\Handler as MembershipsHandler;
use QUI\Memberships\Users\Handler as MembershipUsersHandler;
use QUI\Memberships\Users\MembershipUser;
use QUI\Utils\Grid;
use QUI\Utils\Security\Orthos;
QUI::$Ajax->registerFunction(
'package_quiqqer_memberships_ajax_memberships_users_getArchiveList',
function ($membershipId, $searchParams) {
$searchParams = Orthos::clearArray(json_decode($searchParams, true));
$Memberships = MembershipsHandler::getInstance();
$searchParams = Orthos::clearArray(json_decode($searchParams, true));
$Memberships = MembershipsHandler::getInstance();
$MembershipUsers = MembershipUsersHandler::getInstance();
$Membership = $Memberships->getChild((int)$membershipId);
$membershipUsers = array();
$Membership = $Memberships->getChild((int)$membershipId);
$membershipUsers = [];
foreach ($Membership->searchUsers($searchParams, true) as $membershipUserId) {
/** @var MembershipUser $MembershipUser */
$MembershipUser = $MembershipUsers->getChild($membershipUserId);
$MembershipUser = $MembershipUsers->getChild($membershipUserId);
$membershipUsers[] = $MembershipUser->getBackendViewData();
}
......@@ -35,6 +36,6 @@ function ($membershipId, $searchParams) {
$Membership->searchUsers($searchParams, true, true)
);
},
array('membershipId', 'searchParams'),
['membershipId', 'searchParams'],
'Permission::checkAdminUser'
);
<?php
use QUI\Memberships\Users\Handler as MembershipUsersHandler;
use QUI\Memberships\Users\MembershipUser;
/**
* Get history of a MembershipUser
*
* @param int $membershipUserId
* @return array|false - history data or false on error
*/
use QUI\Memberships\Users\Handler as MembershipUsersHandler;
use QUI\Memberships\Users\MembershipUser;
QUI::$Ajax->registerFunction(
'package_quiqqer_memberships_ajax_memberships_users_getHistory',
function ($membershipUserId) {
......@@ -16,7 +17,7 @@ function ($membershipUserId) {
$MembershipUsers = MembershipUsersHandler::getInstance();
/** @var MembershipUser $MembershipUser */
$MembershipUser = $MembershipUsers->getChild((int)$membershipUserId);
$history = $MembershipUser->getHistory();
$history = $MembershipUser->getHistory();
// reverse history entries so the latest entries come first
return array_reverse($history);
......@@ -28,15 +29,15 @@ function ($membershipUserId) {
QUI::getLocale()->get(
'quiqqer/memberships',
'message.ajax.general.error',
array(
[
'error' => $Exception->getMessage()
)
]
)
);
return false;
}
},
array('membershipUserId'),
['membershipUserId'],
'Permission::checkAdminUser'
);
<?php
use QUI\Memberships\Handler as MembershipsHandler;
use QUI\Memberships\Users\Handler as MembershipUsersHandler;
use QUI\Utils\Security\Orthos;
use QUI\Utils\Grid;
use QUI\Memberships\Users\MembershipUser;
/**
* Get/search QUIQQER membership users
*
......@@ -13,20 +7,27 @@
* @param array $searchParams - Search params
* @return array
*/
use QUI\Memberships\Handler as MembershipsHandler;
use QUI\Memberships\Users\Handler as MembershipUsersHandler;
use QUI\Memberships\Users\MembershipUser;
use QUI\Utils\Grid;
use QUI\Utils\Security\Orthos;
QUI::$Ajax->registerFunction(
'package_quiqqer_memberships_ajax_memberships_users_getList',
function ($membershipId, $searchParams) {
$searchParams = Orthos::clearArray(json_decode($searchParams, true));
$Memberships = MembershipsHandler::getInstance();
$searchParams = Orthos::clearArray(json_decode($searchParams, true));
$Memberships = MembershipsHandler::getInstance();
$MembershipUsers = MembershipUsersHandler::getInstance();
$Membership = $Memberships->getChild((int)$membershipId);
$membershipUsers = array();
$Membership = $Memberships->getChild((int)$membershipId);
$membershipUsers = [];
// $Membership->addUser(QUI::getUserBySession());
foreach ($Membership->searchUsers($searchParams) as $membershipUserId) {
/** @var MembershipUser $MembershipUser */
$MembershipUser = $MembershipUsers->getChild($membershipUserId);
$MembershipUser = $MembershipUsers->getChild($membershipUserId);
$membershipUsers[] = $MembershipUser->getBackendViewData();
}
......@@ -41,6 +42,6 @@ function ($membershipId, $searchParams) {
$Membership->searchUsers($searchParams, false, true)
);
},
array('membershipId', 'searchParams'),
['membershipId', 'searchParams'],
'Permission::checkAdminUser'
);
<?php
use QUI\Memberships\Users\Handler as MembershipUsersHandler;
use QUI\Memberships\Handler as MembershipsHandler;
/**
* Get all MembershipUser Objects data for the current session user (for frontend)
*
* @return array - view data for all relevant MembershipUser objects
*/
use QUI\Memberships\Handler as MembershipsHandler;
use QUI\Memberships\Users\Handler as MembershipUsersHandler;
QUI::$Ajax->registerFunction(
'package_quiqqer_memberships_ajax_memberships_users_getProfileData',
function () {
......
0% oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren