From ebc270c84e56d68343674109fc669b66d555fc5d Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 9 Jun 2023 19:33:47 +0200 Subject: [PATCH] Simplify getData() --- Message/Cli/CliRequest.php | 3 +++ Message/RequestAbstract.php | 7 ++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Message/Cli/CliRequest.php b/Message/Cli/CliRequest.php index d806d2c92..8f91b5d0d 100755 --- a/Message/Cli/CliRequest.php +++ b/Message/Cli/CliRequest.php @@ -94,6 +94,9 @@ final class CliRequest extends RequestAbstract $key = \mb_strtolower($key); switch ($type) { + case null: + /* @phpstan-ignore-next-line */ + return ArrayUtils::getArg($key, $this->data); case 'int': /* @phpstan-ignore-next-line */ return (int) ArrayUtils::getArg($key, $this->data); diff --git a/Message/RequestAbstract.php b/Message/RequestAbstract.php index 22ffc5ad3..18612db15 100755 --- a/Message/RequestAbstract.php +++ b/Message/RequestAbstract.php @@ -99,16 +99,13 @@ abstract class RequestAbstract implements MessageInterface } $key = \mb_strtolower($key); - if (!isset($this->data[$key])) { return null; } - if ($type === null) { - return $this->data[$key]; - } - switch ($type) { + case null: + return $this->data[$key]; case 'int': return (int) $this->data[$key]; case 'string':