Merge branch '2.0'

api-platform · Feb 16, 2017 · 9f0b155 · 9f0b155
2 parents d30effc + 6eaedcf
commit 9f0b155
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/EventListener/AddFormatListener.php b/src/EventListener/AddFormatListener.php
@@ -86,8 +86,11 @@ public function onKernelRequest(GetResponseEvent $event)
         }
 
         // Finally, if no Accept header nor Symfony request format is set, return the default format
-        reset($this->formats);
-        $request->setRequestFormat(each($this->formats)['key']);
+        foreach ($this->formats as $format => $mimeType) {
+            $request->setRequestFormat($format);
+
+            return;
+        }
     }
 
     /**

diff --git a/src/Util/ErrorFormatGuesser.php b/src/Util/ErrorFormatGuesser.php
@@ -39,8 +39,10 @@ public static function guessErrorFormat(Request $request, array $errorFormats):
             return ['key' => $requestFormat, 'value' => $errorFormats[$requestFormat]];
         }
 
-        reset($errorFormats);
+        foreach ($errorFormats as $key => $value) {
+            return ['key' => $key, 'value' => $value];
+        }
 
-        return each($errorFormats);
+        return [];
     }
 }