fix directory resource considers same timestamp not fresh

robfrawley · robfrawley · commit d5746ecfd283 · 2017-01-30T13:31:59.000-05:00
diff --git a/src/Symfony/Component/Config/Resource/DirectoryResource.php b/src/Symfony/Component/Config/Resource/DirectoryResource.php
@@ -68,7 +68,7 @@ public function isFresh($timestamp)
             return false;
         }
 
-        if ($timestamp <= filemtime($this->resource)) {
+        if ($timestamp < filemtime($this->resource)) {
             return false;
         }
 
@@ -85,7 +85,7 @@ public function isFresh($timestamp)
             }
 
             // early return if a file's mtime exceeds the passed timestamp
-            if ($timestamp <= $file->getMTime()) {
+            if ($timestamp < $file->getMTime()) {
                 return false;
             }
         }
diff --git a/src/Symfony/Component/Config/Tests/Resource/DirectoryResourceTest.php b/src/Symfony/Component/Config/Tests/Resource/DirectoryResourceTest.php
@@ -96,8 +96,10 @@ public function testIsFreshNewFileWithDifferentPattern()
     public function testIsFreshDeleteFile()
     {
         $resource = new DirectoryResource($this->directory);
+        $time = time();
+        sleep(1);
         unlink($this->directory.'/tmp.xml');
-        $this->assertFalse($resource->isFresh(time()), '->isFresh() returns false if an existing file is removed');
+        $this->assertFalse($resource->isFresh($time), '->isFresh() returns false if an existing file is removed');
     }
 
     public function testIsFreshDeleteDirectory()

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public function isFresh($timestamp)`
`68`	`68`	`return false;`
`69`	`69`	`}`
`70`	`70`
`71`		`- if ($timestamp <= filemtime($this->resource)) {`
	`71`	`+ if ($timestamp < filemtime($this->resource)) {`
`72`	`72`	`return false;`
`73`	`73`	`}`
`74`	`74`
`@@ -85,7 +85,7 @@ public function isFresh($timestamp)`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`// early return if a file's mtime exceeds the passed timestamp`
`88`		`- if ($timestamp <= $file->getMTime()) {`
	`88`	`+ if ($timestamp < $file->getMTime()) {`
`89`	`89`	`return false;`
`90`	`90`	`}`
`91`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,8 +96,10 @@ public function testIsFreshNewFileWithDifferentPattern()`
`96`	`96`	`public function testIsFreshDeleteFile()`
`97`	`97`	`{`
`98`	`98`	`$resource = new DirectoryResource($this->directory);`
	`99`	`+ $time = time();`
	`100`	`+ sleep(1);`
`99`	`101`	`unlink($this->directory.'/tmp.xml');`
`100`		`- $this->assertFalse($resource->isFresh(time()), '->isFresh() returns false if an existing file is removed');`
	`102`	`+ $this->assertFalse($resource->isFresh($time), '->isFresh() returns false if an existing file is removed');`
`101`	`103`	`}`
`102`	`104`
`103`	`105`	`public function testIsFreshDeleteDirectory()`