From 70eeb1995fa2772352b07e32b0db36e39efafadf Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Mon, 28 Aug 2023 22:06:33 +0000 Subject: [PATCH] update --- Controller/ApiController.php | 8 ++++---- Controller/BackendController.php | 2 +- Models/Module.php | 2 ++ tests/Autoloader.php | 4 +--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 86d50ff..2dbd637 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -1152,10 +1152,10 @@ final class ApiController extends Controller */ private function updateGroupFromRequest(RequestAbstract $request, Group $group) : Group { - $group->name = (string) ($request->getData('name') ?? $group->name); + $group->name = $request->getDataString('name') ?? $group->name; $group->setStatus($request->getDataInt('status') ?? $group->getStatus()); - $group->description = Markdown::parse((string) ($request->getData('description') ?? $group->descriptionRaw)); - $group->descriptionRaw = (string) ($request->getData('description') ?? $group->descriptionRaw); + $group->description = Markdown::parse($request->getDataString('description') ?? $group->descriptionRaw); + $group->descriptionRaw = $request->getDataString('description') ?? $group->descriptionRaw; return $group; } @@ -2100,7 +2100,7 @@ final class ApiController extends Controller public function apiAccountDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { /** @var Account $account */ - $account = AccountMapper::get()->where('id', (int) ($request->getData('id')))->execute(); + $account = AccountMapper::get()->where('id', (int) $request->getData('id'))->execute(); $this->deleteModel($request->header->account, $account, AccountMapper::class, 'account', $request->getOrigin()); $this->createStandardDeleteResponse($request, $response, $account); } diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 1681bba..bedb9fc 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -398,7 +398,7 @@ final class BackendController extends Controller ->with('createdBy') ->where('module', self::NAME) ->where('type', StringUtils::intHash(GroupMapper::class)) - ->where('ref', (string) ($request->getData('id') ?? '0')) + ->where('ref', $request->getDataString('id') ?? '0') ->limit(25); // audit log diff --git a/Models/Module.php b/Models/Module.php index 5d46534..8c8e159 100755 --- a/Models/Module.php +++ b/Models/Module.php @@ -124,6 +124,8 @@ class Module * * @return void * + * @throws InvalidEnumValue + * * @since 1.0.0 */ public function setStatus(int $status) : void diff --git a/tests/Autoloader.php b/tests/Autoloader.php index 80a0a1e..d2d0080 100755 --- a/tests/Autoloader.php +++ b/tests/Autoloader.php @@ -71,14 +71,12 @@ final class Autoloader * * @return void * - * @throws AutoloadException Throws this exception if the class to autoload doesn't exist. This could also be related to a wrong namespace/file path correlation. - * * @since 1.0.0 */ public static function defaultAutoloader(string $class) : void { $class = \ltrim($class, '\\'); - $class = \str_replace(['_', '\\'], '/', $class); + $class = \strtr($class, '_\\', '//'); foreach (self::$paths as $path) { $file = $path . $class . '.php';