Skip to content

Commit b972e7c

Browse files
committed
fix merge
1 parent 62e1f0f commit b972e7c

File tree

1 file changed

+2
-18
lines changed

1 file changed

+2
-18
lines changed

Response/TraceableResponse.php

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -83,19 +83,11 @@ public function getContent(bool $throw = true): string
8383
if (false === $this->content) {
8484
return $this->response->getContent($throw);
8585
}
86-
87-
$this->content = $this->response->getContent(false);
88-
89-
if ($throw) {
90-
$this->checkStatusCode($this->response->getStatusCode());
91-
}
92-
93-
return $this->content;
86+
return $this->content = $this->response->getContent(false);
9487
} finally {
9588
if ($this->event && $this->event->isStarted()) {
9689
$this->event->stop();
9790
}
98-
9991
if ($throw) {
10092
$this->checkStatusCode($this->response->getStatusCode());
10193
}
@@ -108,19 +100,11 @@ public function toArray(bool $throw = true): array
108100
if (false === $this->content) {
109101
return $this->response->toArray($throw);
110102
}
111-
112-
$this->content = $this->response->toArray(false);
113-
114-
if ($throw) {
115-
$this->checkStatusCode($this->response->getStatusCode());
116-
}
117-
118-
return $this->content;
103+
return $this->content = $this->response->toArray(false);
119104
} finally {
120105
if ($this->event && $this->event->isStarted()) {
121106
$this->event->stop();
122107
}
123-
124108
if ($throw) {
125109
$this->checkStatusCode($this->response->getStatusCode());
126110
}

0 commit comments

Comments
 (0)