return false early from directory resource

robfrawley · robfrawley · commit 96107e21f14d · 2017-01-29T19:05:04.000-05:00
diff --git a/src/Symfony/Component/Config/Resource/DirectoryResource.php b/src/Symfony/Component/Config/Resource/DirectoryResource.php
@@ -68,7 +68,10 @@ public function isFresh($timestamp)
             return false;
         }
 
-        $newestMTime = filemtime($this->resource);
+        if ($timestamp <= filemtime($this->resource)) {
+            return false;
+        }
+
         foreach (new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->resource), \RecursiveIteratorIterator::SELF_FIRST) as $file) {
             // if regex filtering is enabled only check matching files
             if ($this->pattern && $file->isFile() && !preg_match($this->pattern, $file->getBasename())) {
@@ -81,10 +84,13 @@ public function isFresh($timestamp)
                 continue;
             }
 
-            $newestMTime = max($file->getMTime(), $newestMTime);
+            // early return if a file's mtime exceeds the passed timestamp
+            if ($timestamp <= $file->getMTime()) {
+                return false;
+            }
         }
 
-        return $newestMTime < $timestamp;
+        return true;
     }
 
     public function serialize()

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,10 @@ public function isFresh($timestamp)`
`68`	`68`	`return false;`
`69`	`69`	`}`
`70`	`70`
`71`		`- $newestMTime = filemtime($this->resource);`
	`71`	`+ if ($timestamp <= filemtime($this->resource)) {`
	`72`	`+ return false;`
	`73`	`+ }`
	`74`	`+`
`72`	`75`	`foreach (new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->resource), \RecursiveIteratorIterator::SELF_FIRST) as $file) {`
`73`	`76`	`// if regex filtering is enabled only check matching files`
`74`	`77`	`if ($this->pattern && $file->isFile() && !preg_match($this->pattern, $file->getBasename())) {`
`@@ -81,10 +84,13 @@ public function isFresh($timestamp)`
`81`	`84`	`continue;`
`82`	`85`	`}`
`83`	`86`
`84`		`- $newestMTime = max($file->getMTime(), $newestMTime);`
	`87`	`+ // early return if a file's mtime exceeds the passed timestamp`
	`88`	`+ if ($timestamp <= $file->getMTime()) {`
	`89`	`+ return false;`
	`90`	`+ }`
`85`	`91`	`}`
`86`	`92`
`87`		`- return $newestMTime < $timestamp;`
	`93`	`+ return true;`
`88`	`94`	`}`
`89`	`95`
`90`	`96`	`public function serialize()`