Skip to content

Commit 49010da

Browse files
committed
Psalm fixes
1 parent d6782ce commit 49010da

File tree

1 file changed

+5
-12
lines changed

1 file changed

+5
-12
lines changed

src/MessageAccessor.php

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public function isJson(MessageInterface $message): bool
9999
public function getJson(MessageInterface $message): ?array
100100
{
101101
return $this->replaceParameters(
102-
json_decode($message->getBody(), true),
102+
json_decode($message->getBody()->__toString(), true),
103103
$this->jsonFilters,
104104
$this->values,
105105
$this->replace
@@ -111,9 +111,9 @@ public function getContent(MessageInterface $message): string
111111
if ($this->isJson($message)) {
112112
$body = json_encode($this->getJson($message));
113113
} else {
114-
$body = $message->getBody()->getContents();
114+
$body = $message->getBody()->__toString();
115115
foreach($this->values as $value) {
116-
$body = $this->replace($value, $this->replace, $body);
116+
$body = str_replace($value, $this->replace, $body);
117117
}
118118
}
119119

@@ -122,14 +122,7 @@ public function getContent(MessageInterface $message): string
122122

123123
public function filter(MessageInterface $message): MessageInterface
124124
{
125-
if ($this->isJson($message)) {
126-
$body = json_encode($this->getJson($message));
127-
} else {
128-
$body = $message->getBody()->getContents();
129-
foreach ($this->values as $value) {
130-
$body = $this->replace($value, $this->replace, $body);
131-
}
132-
}
125+
$body = $this->getContent($message);
133126

134127
foreach ($this->getHeaders($message) as $header => $values) {
135128
$message = $message->withHeader($header, $values);
@@ -146,7 +139,7 @@ protected function replaceParameters(array $array, array $parameters, array $val
146139
}
147140
}
148141

149-
array_walk_recursive( $array, function (&$item, $key) use ($values, $replace, $strict) {
142+
array_walk_recursive( $array, function (&$item) use ($values, $replace, $strict) {
150143
foreach ($values as $value) {
151144
if (! $strict && str_contains($item, $value)) {
152145
$item = str_replace($value, $replace, $item);

0 commit comments

Comments
 (0)