From 843b4d8518e2a1badd2afbe698f6ec5541464d00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20M=C3=BCller?= <p.mueller@pcsg.de>
Date: Tue, 24 Sep 2024 12:37:26 +0200
Subject: [PATCH] fix: changes for v2
---
.../Memberships/Controls/Profile/Memberships.php | 6 +++---
src/QUI/Memberships/Handler.php | 8 ++++----
src/QUI/Memberships/Membership.php | 4 ++--
src/QUI/Memberships/Products/MembershipField.php | 10 +++++-----
.../Memberships/Users/AbortCancelVerification.php | 14 +++++++-------
src/QUI/Memberships/Users/CancelVerification.php | 14 +++++++-------
src/QUI/Memberships/Users/Handler.php | 12 ++++++------
src/QUI/Memberships/Users/MembershipUser.php | 4 ++--
8 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/src/QUI/Memberships/Controls/Profile/Memberships.php b/src/QUI/Memberships/Controls/Profile/Memberships.php
index 2910879..8bab61d 100644
--- a/src/QUI/Memberships/Controls/Profile/Memberships.php
+++ b/src/QUI/Memberships/Controls/Profile/Memberships.php
@@ -25,7 +25,7 @@ public function __construct(array $attributes = [])
* @return string
* @throws \QUI\Exception
*/
- public function getBody()
+ public function getBody(): string
{
$Engine = QUI::getTemplateManager()->getEngine();
return $Engine->fetch(dirname(__FILE__) . '/Memberships.html');
@@ -36,7 +36,7 @@ public function getBody()
*
* @return mixed|void
*/
- public function onSave()
+ public function onSave(): void
{
}
@@ -46,7 +46,7 @@ public function onSave()
* @return mixed|void
* @throws \Exception
*/
- public function validate()
+ public function validate(): void
{
}
}
diff --git a/src/QUI/Memberships/Handler.php b/src/QUI/Memberships/Handler.php
index b75cbb1..aa68cf4 100644
--- a/src/QUI/Memberships/Handler.php
+++ b/src/QUI/Memberships/Handler.php
@@ -25,7 +25,7 @@ class Handler extends Factory
* @inheritdoc
* @throws QUI\Memberships\Exception
*/
- public function createChild($data = [])
+ public function createChild($data = []): QUI\CRUD\Child
{
Permission::checkPermission(self::PERMISSION_CREATE);
@@ -87,7 +87,7 @@ public function createChild($data = [])
* @inheritdoc
* @return string
*/
- public function getDataBaseTableName()
+ public function getDataBaseTableName(): string
{
return 'quiqqer_memberships';
}
@@ -96,7 +96,7 @@ public function getDataBaseTableName()
* @inheritdoc
* @return string
*/
- public function getChildClass()
+ public function getChildClass(): string
{
return Membership::class;
}
@@ -105,7 +105,7 @@ public function getChildClass()
* @inheritdoc
* @return array
*/
- public function getChildAttributes()
+ public function getChildAttributes(): array
{
return [
'title',
diff --git a/src/QUI/Memberships/Membership.php b/src/QUI/Memberships/Membership.php
index d561ca8..93f0178 100644
--- a/src/QUI/Memberships/Membership.php
+++ b/src/QUI/Memberships/Membership.php
@@ -122,7 +122,7 @@ public function isAutoExtend(): bool
* @inheritdoc
* @throws QUI\Memberships\Exception
*/
- public function update()
+ public function update(): void
{
Permission::checkPermission(Handler::PERMISSION_EDIT, $this->EditUser);
@@ -181,7 +181,7 @@ public function update()
* @throws \QUI\Permissions\Exception
* @throws \QUI\Exception
*/
- public function delete()
+ public function delete(): void
{
Permission::checkPermission(Handler::PERMISSION_DELETE, $this->EditUser);
diff --git a/src/QUI/Memberships/Products/MembershipField.php b/src/QUI/Memberships/Products/MembershipField.php
index 2b71b9f..98d78de 100644
--- a/src/QUI/Memberships/Products/MembershipField.php
+++ b/src/QUI/Memberships/Products/MembershipField.php
@@ -26,14 +26,14 @@ class MembershipField extends Products\Field\Field
/**
* @var bool
*/
- public $searchable = true;
+ public bool $searchable = true;
/**
* Column type for database table (cache column)
*
* @var string
*/
- protected $columnType = 'BIGINT';
+ protected string $columnType = 'BIGINT';
/**
* Cleanup the value, the value is valid now
@@ -41,7 +41,7 @@ class MembershipField extends Products\Field\Field
* @param mixed $value
* @return int
*/
- public function cleanup($value)
+ public function cleanup($value): mixed
{
return (int)$value;
}
@@ -53,7 +53,7 @@ public function cleanup($value)
* @param mixed $value
* @throws \QUI\ERP\Products\Field\Exception
*/
- public function validate($value)
+ public function validate($value): void
{
if (empty($value)) {
return;
@@ -79,7 +79,7 @@ public function validate($value)
/**
* @return string
*/
- public function getJavaScriptControl()
+ public function getJavaScriptControl(): string
{
return 'package/quiqqer/memberships/bin/controls/MembershipSelect';
}
diff --git a/src/QUI/Memberships/Users/AbortCancelVerification.php b/src/QUI/Memberships/Users/AbortCancelVerification.php
index e676129..7ff2493 100644
--- a/src/QUI/Memberships/Users/AbortCancelVerification.php
+++ b/src/QUI/Memberships/Users/AbortCancelVerification.php
@@ -20,7 +20,7 @@ class AbortCancelVerification extends QUI\Verification\AbstractVerification
* if this method returns false use the module setting default value
* @throws \QUI\Exception
*/
- public function getValidDuration()
+ public function getValidDuration(): bool|int
{
$MembershipUser = MembershipUsersHandler::getInstance()->getChild($this->getIdentifier());
$endDate = $MembershipUser->getAttribute('endDate');
@@ -36,7 +36,7 @@ public function getValidDuration()
* @return void
* @throws \QUI\Exception
*/
- public function onSuccess()
+ public function onSuccess(): void
{
/** @var MembershipUser $MembershipUser */
$MembershipUser = MembershipUsersHandler::getInstance()->getChild($this->getIdentifier());
@@ -49,7 +49,7 @@ public function onSuccess()
*
* @return void
*/
- public function onError()
+ public function onError(): void
{
// nothing
}
@@ -60,7 +60,7 @@ public function onError()
* @return string
* @throws \QUI\Exception
*/
- public function getSuccessMessage()
+ public function getSuccessMessage(): string
{
/** @var MembershipUser $MembershipUser */
$MembershipUser = MembershipUsersHandler::getInstance()->getChild($this->getIdentifier());
@@ -96,7 +96,7 @@ public function getSuccessMessage()
* @param string $reason - The reason for the error (see \QUI\Verification\Verifier::REASON_)
* @return string
*/
- public function getErrorMessage($reason)
+ public function getErrorMessage($reason): string
{
switch ($reason) {
case Verifier::ERROR_REASON_EXPIRED:
@@ -128,7 +128,7 @@ public function getErrorMessage($reason)
*
* @return string|false - If this method returns false, no redirection takes place
*/
- public function getOnSuccessRedirectUrl()
+ public function getOnSuccessRedirectUrl(): bool|string
{
return false;
}
@@ -140,7 +140,7 @@ public function getOnSuccessRedirectUrl()
*
* @return string|false - If this method returns false, no redirection takes place
*/
- public function getOnErrorRedirectUrl()
+ public function getOnErrorRedirectUrl(): bool|string
{
return false;
}
diff --git a/src/QUI/Memberships/Users/CancelVerification.php b/src/QUI/Memberships/Users/CancelVerification.php
index 8bbfcc0..0e3fc87 100644
--- a/src/QUI/Memberships/Users/CancelVerification.php
+++ b/src/QUI/Memberships/Users/CancelVerification.php
@@ -19,7 +19,7 @@ class CancelVerification extends QUI\Verification\AbstractVerification
* @return int|false - duration in minutes;
* if this method returns false use the module setting default value
*/
- public function getValidDuration()
+ public function getValidDuration(): bool|int
{
return (int)MembershipUsersHandler::getSetting('cancelDuration');
}
@@ -29,7 +29,7 @@ public function getValidDuration()
*
* @return void
*/
- public function onSuccess()
+ public function onSuccess(): void
{
/** @var MembershipUser $MembershipUser */
$MembershipUser = MembershipUsersHandler::getInstance()->getChild($this->getIdentifier());
@@ -42,7 +42,7 @@ public function onSuccess()
*
* @return void
*/
- public function onError()
+ public function onError(): void
{
// nothing
}
@@ -52,7 +52,7 @@ public function onError()
*
* @return string
*/
- public function getSuccessMessage()
+ public function getSuccessMessage(): string
{
return QUI::getLocale()->get(
'quiqqer/memberships',
@@ -66,7 +66,7 @@ public function getSuccessMessage()
* @param string $reason - The reason for the error (see \QUI\Verification\Verifier::REASON_)
* @return string
*/
- public function getErrorMessage($reason)
+ public function getErrorMessage($reason): string
{
switch ($reason) {
case Verifier::ERROR_REASON_EXPIRED:
@@ -98,7 +98,7 @@ public function getErrorMessage($reason)
*
* @return string|false - If this method returns false, no redirection takes place
*/
- public function getOnSuccessRedirectUrl()
+ public function getOnSuccessRedirectUrl(): bool|string
{
return false;
}
@@ -110,7 +110,7 @@ public function getOnSuccessRedirectUrl()
*
* @return string|false - If this method returns false, no redirection takes place
*/
- public function getOnErrorRedirectUrl()
+ public function getOnErrorRedirectUrl(): bool|string
{
return false;
}
diff --git a/src/QUI/Memberships/Users/Handler.php b/src/QUI/Memberships/Users/Handler.php
index afb09d6..ce2842c 100644
--- a/src/QUI/Memberships/Users/Handler.php
+++ b/src/QUI/Memberships/Users/Handler.php
@@ -78,7 +78,7 @@ class Handler extends Factory
* @param QUI\Users\User $PermissionUser (optional)
* @throws QUI\Memberships\Exception
*/
- public function createChild($data = [], $PermissionUser = null)
+ public function createChild($data = [], $PermissionUser = null): QUI\CRUD\Child
{
if (is_null($PermissionUser)) {
$PermissionUser = QUI::getUserBySession();
@@ -294,7 +294,7 @@ public function getMembershipUserByContractId(int $contractId)
* @inheritdoc
* @return string
*/
- public function getDataBaseTableName()
+ public function getDataBaseTableName(): string
{
return 'quiqqer_memberships_users';
}
@@ -303,7 +303,7 @@ public function getDataBaseTableName()
* @inheritdoc
* @return string
*/
- public function getChildClass()
+ public function getChildClass(): string
{
return MembershipUser::class;
}
@@ -312,7 +312,7 @@ public function getChildClass()
* @inheritdoc
* @return array
*/
- public function getChildAttributes()
+ public function getChildAttributes(): array
{
return [
'membershipId',
@@ -355,7 +355,7 @@ public static function getSetting($key)
*
* @return string
*/
- public static function getExtendMode()
+ public static function getExtendMode(): string
{
try {
return self::getSetting('extendMode');
@@ -372,7 +372,7 @@ public static function getExtendMode()
*
* @return string
*/
- public static function getDurationMode()
+ public static function getDurationMode(): string
{
try {
return QUI\Memberships\Handler::getSetting('durationMode');
diff --git a/src/QUI/Memberships/Users/MembershipUser.php b/src/QUI/Memberships/Users/MembershipUser.php
index b97fc67..752d16b 100644
--- a/src/QUI/Memberships/Users/MembershipUser.php
+++ b/src/QUI/Memberships/Users/MembershipUser.php
@@ -51,7 +51,7 @@ public function setEditUser(QUIUserInterface $EditUser)
* @inheritdoc
* @param bool $withPermission - check permissions on update [default: true]
*/
- public function update()
+ public function update(): void
{
Permission::checkPermission(MembershipUsersHandler::PERMISSION_EDIT_USERS, $this->EditUser);
@@ -619,7 +619,7 @@ public function isCancelled()
*
* @return void
*/
- public function delete()
+ public function delete(): void
{
Permission::checkPermission(MembershipUsersHandler::PERMISSION_EDIT_USERS, $this->EditUser);
--
GitLab