Skip to content

Commit 741d6d4

Browse files
committed
Merge branch '2.8' into 3.2
* 2.8: fixed tests 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
2 parents a2c48cd + 06ce6bb commit 741d6d4

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

Resource/DirectoryResource.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,15 @@ public function isFresh($timestamp)
9090
continue;
9191
}
9292

93+
// for broken links
94+
try {
95+
$fileMTime = $file->getMTime();
96+
} catch (\RuntimeException $e) {
97+
continue;
98+
}
99+
93100
// early return if a file's mtime exceeds the passed timestamp
94-
if ($timestamp < $file->getMTime()) {
101+
if ($timestamp < $fileMTime) {
95102
return false;
96103
}
97104
}

0 commit comments

Comments
 (0)