Merge branch '2.7' into 2.8

* 2.7:
  revert typo fix
  [Form] Fix ChoiceType to ensure submitted data is not nested unnecessarily
  Test inline styles with non-decorated formatter
  Fix RuntimeException when an Emacs buffer is modified
  [Yaml] add tests for specific mapping keys

Author: fabpot

Resource/DirectoryResource.php

@@ -84,8 +84,15 @@ public function isFresh($timestamp)
                 continue;
             }
 
+            // for broken links
+            try {
+                $fileMTime = $file->getMTime();
+            } catch (\RuntimeException $e) {
+                continue;
+            }
+
             // early return if a file's mtime exceeds the passed timestamp
-            if ($timestamp < $file->getMTime()) {
+            if ($timestamp < $fileMTime) {
                 return false;
             }
         }