File tree Expand file tree Collapse file tree 2 files changed +26
-14
lines changed Expand file tree Collapse file tree 2 files changed +26
-14
lines changed Original file line number Diff line number Diff line change @@ -9793,15 +9793,21 @@ private function parseBody(string $body) /*: ?object*/
9793
9793
9794
9794
private function addParsedBody (ServerRequestInterface $ request ): ServerRequestInterface
9795
9795
{
9796
- $ body = $ request ->getBody ();
9797
- if ($ body ->isReadable () && $ body ->isSeekable ()) {
9798
- $ contents = $ body ->getContents ();
9799
- $ body ->rewind ();
9800
- if ($ contents ) {
9801
- $ parsedBody = $ this ->parseBody ($ contents );
9802
- $ request = $ request ->withParsedBody ($ parsedBody );
9796
+ $ contents = '' ;
9797
+ $ parsedBody = $ request ->getParsedBody ();
9798
+ if ($ parsedBody ) {
9799
+ $ contents = json_encode ($ parsedBody );
9800
+ } else {
9801
+ $ body = $ request ->getBody ();
9802
+ if ($ body ->isReadable () && $ body ->isSeekable ()) {
9803
+ $ contents = $ body ->getContents ();
9804
+ $ body ->rewind ();
9803
9805
}
9804
9806
}
9807
+ if ($ contents ) {
9808
+ $ parsedBody = $ this ->parseBody ($ contents );
9809
+ $ request = $ request ->withParsedBody ($ parsedBody );
9810
+ }
9805
9811
return $ request ;
9806
9812
}
9807
9813
Original file line number Diff line number Diff line change @@ -160,15 +160,21 @@ private function parseBody(string $body) /*: ?object*/
160
160
161
161
private function addParsedBody (ServerRequestInterface $ request ): ServerRequestInterface
162
162
{
163
- $ body = $ request ->getBody ();
164
- if ($ body ->isReadable () && $ body ->isSeekable ()) {
165
- $ contents = $ body ->getContents ();
166
- $ body ->rewind ();
167
- if ($ contents ) {
168
- $ parsedBody = $ this ->parseBody ($ contents );
169
- $ request = $ request ->withParsedBody ($ parsedBody );
163
+ $ contents = '' ;
164
+ $ parsedBody = $ request ->getParsedBody ();
165
+ if ($ parsedBody ) {
166
+ $ contents = json_encode ($ parsedBody );
167
+ } else {
168
+ $ body = $ request ->getBody ();
169
+ if ($ body ->isReadable () && $ body ->isSeekable ()) {
170
+ $ contents = $ body ->getContents ();
171
+ $ body ->rewind ();
170
172
}
171
173
}
174
+ if ($ contents ) {
175
+ $ parsedBody = $ this ->parseBody ($ contents );
176
+ $ request = $ request ->withParsedBody ($ parsedBody );
177
+ }
172
178
return $ request ;
173
179
}
174
180
You can’t perform that action at this time.
0 commit comments