Skip to content

Commit 9f0b155

Browse files
committed
Merge branch '2.0'
2 parents d30effc + 6eaedcf commit 9f0b155

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

src/EventListener/AddFormatListener.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,11 @@ public function onKernelRequest(GetResponseEvent $event)
8686
}
8787

8888
// Finally, if no Accept header nor Symfony request format is set, return the default format
89-
reset($this->formats);
90-
$request->setRequestFormat(each($this->formats)['key']);
89+
foreach ($this->formats as $format => $mimeType) {
90+
$request->setRequestFormat($format);
91+
92+
return;
93+
}
9194
}
9295

9396
/**

src/Util/ErrorFormatGuesser.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,10 @@ public static function guessErrorFormat(Request $request, array $errorFormats):
3939
return ['key' => $requestFormat, 'value' => $errorFormats[$requestFormat]];
4040
}
4141

42-
reset($errorFormats);
42+
foreach ($errorFormats as $key => $value) {
43+
return ['key' => $key, 'value' => $value];
44+
}
4345

44-
return each($errorFormats);
46+
return [];
4547
}
4648
}

0 commit comments

Comments
 (0)