minor #26031 [Config] Only using filemtime to check file freshness (dmifedorenko)

nicolas-grekas · nicolas-grekas · commit cb6c48cc3644 · 2018-02-04T15:53:45.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [Config] Only using filemtime to check file freshness | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #25999 | License | MIT Commits ------- 52c9cb4 [Config] Only using filemtime to check file freshness
diff --git a/src/Symfony/Component/Config/Resource/FileResource.php b/src/Symfony/Component/Config/Resource/FileResource.php
@@ -60,7 +60,7 @@ public function getResource()
      */
     public function isFresh($timestamp)
     {
-        return file_exists($this->resource) && @filemtime($this->resource) <= $timestamp;
+        return false !== ($filemtime = @filemtime($this->resource)) && $filemtime <= $timestamp;
     }
 
     public function serialize()
diff --git a/src/Symfony/Component/Config/Resource/ReflectionClassResource.php b/src/Symfony/Component/Config/Resource/ReflectionClassResource.php
@@ -40,11 +40,11 @@ public function isFresh($timestamp)
         }
 
         foreach ($this->files as $file => $v) {
-            if (!file_exists($file)) {
+            if (false === $filemtime = @filemtime($file)) {
                 return false;
             }
 
-            if (@filemtime($file) > $timestamp) {
+            if ($filemtime > $timestamp) {
                 return $this->hash === $this->computeHash();
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public function getResource()`
`60`	`60`	`*/`
`61`	`61`	`public function isFresh($timestamp)`
`62`	`62`	`{`
`63`		`- return file_exists($this->resource) && @filemtime($this->resource) <= $timestamp;`
	`63`	`+ return false !== ($filemtime = @filemtime($this->resource)) && $filemtime <= $timestamp;`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`public function serialize()`
Original file line number	Diff line number	Diff line change
`@@ -40,11 +40,11 @@ public function isFresh($timestamp)`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`foreach ($this->files as $file => $v) {`
`43`		`- if (!file_exists($file)) {`
	`43`	`+ if (false === $filemtime = @filemtime($file)) {`
`44`	`44`	`return false;`
`45`	`45`	`}`
`46`	`46`
`47`		`- if (@filemtime($file) > $timestamp) {`
	`47`	`+ if ($filemtime > $timestamp) {`
`48`	`48`	`return $this->hash === $this->computeHash();`
`49`	`49`	`}`
`50`	`50`	`}`