From 332b936088baf662c26e994a53863dd4e3f51142 Mon Sep 17 00:00:00 2001
From: Henning Leutz <leutz@pcsg.de>
Date: Wed, 3 Jan 2024 13:15:30 +0100
Subject: [PATCH] refactor: code style + psr12
---
ajax/memberships/users/getList.php | 6 ------
src/QUI/Memberships/Cron.php | 32 ++++++++++++++++++------------
src/QUI/Memberships/Handler.php | 13 +++---------
src/QUI/Memberships/Membership.php | 5 ++---
4 files changed, 24 insertions(+), 32 deletions(-)
diff --git a/ajax/memberships/users/getList.php b/ajax/memberships/users/getList.php
index d4df22d..61b696a 100644
--- a/ajax/memberships/users/getList.php
+++ b/ajax/memberships/users/getList.php
@@ -23,18 +23,12 @@ function ($membershipId, $searchParams) {
$Membership = $Memberships->getChild((int)$membershipId);
$membershipUsers = [];
-// $Membership->addUser(QUI::getUserBySession());
-
foreach ($Membership->searchUsers($searchParams) as $membershipUserId) {
/** @var MembershipUser $MembershipUser */
$MembershipUser = $MembershipUsers->getChild($membershipUserId);
$membershipUsers[] = $MembershipUser->getBackendViewData();
}
- /** @var \QUI\Memberships\Users\MembershipUser $TEST */
-// $TEST = $MembershipUsers->getChild(26);
-// $TEST->startManualCancel();
-
$Grid = new Grid($searchParams);
return $Grid->parseResult(
diff --git a/src/QUI/Memberships/Cron.php b/src/QUI/Memberships/Cron.php
index a8873e1..dcb5c9a 100644
--- a/src/QUI/Memberships/Cron.php
+++ b/src/QUI/Memberships/Cron.php
@@ -21,22 +21,22 @@ public static function checkMembershipUsers()
'select' => [
'id'
],
- 'from' => $MembershipUsers->getDataBaseTableName(),
- 'where' => [
+ 'from' => $MembershipUsers->getDataBaseTableName(),
+ 'where' => [
'archived' => 0
]
]);
- $now = time();
+ $now = time();
$cancelConfirmReminderAfterDays = (int)MembershipUsersHandler::getSetting('cancelReminderDays');
- $Now = date_create();
- $isLinkedToContracts = Handler::isLinkedToContracts();
+ $Now = date_create();
+ $isLinkedToContracts = Handler::isLinkedToContracts();
foreach ($result as $row) {
try {
/** @var MembershipUser $MembershipUser */
$MembershipUser = $MembershipUsers->getChild($row['id']);
- $Membership = $MembershipUser->getMembership();
+ $Membership = $MembershipUser->getMembership();
try {
$MembershipUser->getUser();
@@ -51,16 +51,22 @@ public static function checkMembershipUsers()
// Check if cancellation of membership has been started but NOT yet confirmed.
// Send reminder e-mail after X days of unconfirmed cancellation.
- if (!empty($cancelConfirmReminderAfterDays)
- && (int)$MembershipUser->getAttribute('cancelStatus') === MembershipUsersHandler::CANCEL_STATUS_CANCEL_CONFIRM_PENDING) {
+ if (
+ !empty($cancelConfirmReminderAfterDays)
+ && (int)$MembershipUser->getAttribute(
+ 'cancelStatus'
+ ) === MembershipUsersHandler::CANCEL_STATUS_CANCEL_CONFIRM_PENDING
+ ) {
$CancelDate = \date_create($MembershipUser->getAttribute('cancelDate'));
if ($CancelDate) {
- $RemindDate = $CancelDate->add(new \DateInterval('P'.$cancelConfirmReminderAfterDays.'D'));
- $User = $MembershipUser->getUser();
+ $RemindDate = $CancelDate->add(new \DateInterval('P' . $cancelConfirmReminderAfterDays . 'D'));
+ $User = $MembershipUser->getUser();
- if (!$User->getAttribute(MembershipUsersHandler::USER_ATTR_CANCEL_REMINDER_SENT)
- && $Now > $RemindDate) {
+ if (
+ !$User->getAttribute(MembershipUsersHandler::USER_ATTR_CANCEL_REMINDER_SENT)
+ && $Now > $RemindDate
+ ) {
$sent = $MembershipUser->sendConfirmCancelReminderMail();
if ($sent) {
@@ -107,7 +113,7 @@ public static function checkMembershipUsers()
$MembershipUser->expire();
} catch (\Exception $Exception) {
QUI\System\Log::addError(
- self::class.' :: checkMembershipUsers() -> '.$Exception->getMessage()
+ self::class . ' :: checkMembershipUsers() -> ' . $Exception->getMessage()
);
QUI\System\Log::writeException($Exception);
diff --git a/src/QUI/Memberships/Handler.php b/src/QUI/Memberships/Handler.php
index 392a1a4..b75cbb1 100644
--- a/src/QUI/Memberships/Handler.php
+++ b/src/QUI/Memberships/Handler.php
@@ -196,15 +196,11 @@ public function search($searchParams, $countOnly = false)
}
// ORDER
- if (!empty($searchParams['sortOn'])
- ) {
+ if (!empty($searchParams['sortOn'])) {
$sortOn = Orthos::clear($searchParams['sortOn']);
$order = "ORDER BY " . $sortOn;
- if (
- isset($searchParams['sortBy']) &&
- !empty($searchParams['sortBy'])
- ) {
+ if (!empty($searchParams['sortBy'])) {
$order .= " " . Orthos::clear($searchParams['sortBy']);
} else {
$order .= " ASC";
@@ -214,10 +210,7 @@ public function search($searchParams, $countOnly = false)
}
// LIMIT
- if (
- !empty($gridParams['limit'])
- && !$countOnly
- ) {
+ if (!empty($gridParams['limit']) && !$countOnly) {
$sql .= " LIMIT " . $gridParams['limit'];
} else {
if (!$countOnly) {
diff --git a/src/QUI/Memberships/Membership.php b/src/QUI/Memberships/Membership.php
index 78717f0..d561ca8 100644
--- a/src/QUI/Memberships/Membership.php
+++ b/src/QUI/Memberships/Membership.php
@@ -113,7 +113,7 @@ public function getContent($Locale = null)
*
* @return bool
*/
- public function isAutoExtend()
+ public function isAutoExtend(): bool
{
return $this->getAttribute('autoExtend') ? true : false;
}
@@ -129,8 +129,7 @@ public function update()
$attributes = $this->getAttributes();
// check groups
- if (empty($attributes['groupIds'])
- ) {
+ if (empty($attributes['groupIds'])) {
throw new QUI\Memberships\Exception([
'quiqqer/memberships',
'exception.handler.no.groups'
--
GitLab