bug #21731 Fix emacs link (rubenrua)

fabpot · fabpot · commit ffc1cd507bcc · 2017-03-01T06:05:48.000-08:00
This PR was merged into the 2.7 branch. Discussion ---------- Fix emacs link | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes (minor) | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | none | License | MIT | Doc PR | none When an Emacs buffer is modified, by default Emacs automatically creates a temporary symlink in the same directory as the file being edited (e.g. Controller.php): ``` .#Controller.php -> user@host.12345:1296583136 ``` where '12345' is [the Emacs' PID][1]. In this case Symfony breaks with a RuntimeException: ``` SplFileInfo::getMTime(): stat failed for ...Bundle/Controller/.#APIController.php ``` in vendor/symfony/symfony/src/Symfony/Component/Config/Resource/DirectoryResource.php at line 89 ``` $newestMTime = max($file->getMTime(), $newestMTime); ``` [1]: https://www.gnu.org/software/emacs/manual/html_node/emacs/Interlocking.html Commits ------- c6f7ca6 Fix RuntimeException when an Emacs buffer is modified
diff --git a/src/Symfony/Component/Config/Resource/DirectoryResource.php b/src/Symfony/Component/Config/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;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -84,8 +84,15 @@ public function isFresh($timestamp)`
`84`	`84`	`continue;`
`85`	`85`	`}`
`86`	`86`
	`87`	`+ // for broken links`
	`88`	`+ try {`
	`89`	`+ $fileMTime = $file->getMTime();`
	`90`	`+ } catch (\RuntimeException $e) {`
	`91`	`+ continue;`
	`92`	`+ }`
	`93`	`+`
`87`	`94`	`// early return if a file's mtime exceeds the passed timestamp`
`88`		`- if ($timestamp < $file->getMTime()) {`
	`95`	`+ if ($timestamp < $fileMTime) {`
`89`	`96`	`return false;`
`90`	`97`	`}`
`91`	`98`	`}`