[DependencyInjection] fixed Resource interface

fabpot · fabpot · commit 63e7dda4c892 · 2010-01-18T12:00:00.000+01:00
diff --git a/src/Symfony/Components/DependencyInjection/FileResource.php b/src/Symfony/Components/DependencyInjection/FileResource.php
@@ -49,18 +49,13 @@ public function getResource()
    *
    * @return Boolean true if the resource has not been updated, false otherwise
    */
-  public function isUptodate($timestamp = null)
+  public function isUptodate($timestamp)
   {
     if (!file_exists($this->resource))
     {
       return false;
     }
 
-    if (null === $timestamp)
-    {
-      $timestamp = time();
-    }
-
     return filemtime($this->resource) < $timestamp;
   }
 }
diff --git a/src/Symfony/Components/DependencyInjection/ResourceInterface.php b/src/Symfony/Components/DependencyInjection/ResourceInterface.php
@@ -27,7 +27,7 @@ interface ResourceInterface
    *
    * @return Boolean true if the resource has not been updated, false otherwise
    */
-  function isUptodate($timestamp = null);
+  function isUptodate($timestamp);
 
   /**
    * Returns the resource tied to this Resource.
diff --git a/tests/unit/Symfony/Components/DependencyInjection/FileResourceTest.php b/tests/unit/Symfony/Components/DependencyInjection/FileResourceTest.php
@@ -12,7 +12,7 @@
 
 use Symfony\Components\DependencyInjection\FileResource;
 
-$t = new LimeTest(5);
+$t = new LimeTest(4);
 
 // ->getResource()
 $t->diag('->getResource()');
@@ -23,11 +23,9 @@
 
 // ->isUptodate()
 $t->diag('->isUptodate()');
-sleep(1);
-$t->ok($resource->isUptodate(), '->isUptodate() returns true if the resource has not changed');
 $t->ok($resource->isUptodate(time() + 10), '->isUptodate() returns true if the resource has not changed');
 $t->ok(!$resource->isUptodate(time() - 86400), '->isUptodate() returns false if the resource has been updated');
 unlink($file);
 
 $resource = new FileResource('/____foo/foobar'.rand(1, 999999));
-$t->ok(!$resource->isUptodate(), '->isUptodate() returns false if the resource does not exist');
+$t->ok(!$resource->isUptodate(time()), '->isUptodate() returns false if the resource does not exist');

Original file line number	Diff line number	Diff line change
`@@ -49,18 +49,13 @@ public function getResource()`
`49`	`49`	`*`
`50`	`50`	`* @return Boolean true if the resource has not been updated, false otherwise`
`51`	`51`	`*/`
`52`		`- public function isUptodate($timestamp = null)`
	`52`	`+ public function isUptodate($timestamp)`
`53`	`53`	`{`
`54`	`54`	`if (!file_exists($this->resource))`
`55`	`55`	`{`
`56`	`56`	`return false;`
`57`	`57`	`}`
`58`	`58`
`59`		`- if (null === $timestamp)`
`60`		`- {`
`61`		`- $timestamp = time();`
`62`		`- }`
`63`		`-`
`64`	`59`	`return filemtime($this->resource) < $timestamp;`
`65`	`60`	`}`
`66`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ interface ResourceInterface`
`27`	`27`	`*`
`28`	`28`	`* @return Boolean true if the resource has not been updated, false otherwise`
`29`	`29`	`*/`
`30`		`- function isUptodate($timestamp = null);`
	`30`	`+ function isUptodate($timestamp);`
`31`	`31`
`32`	`32`	`/**`
`33`	`33`	`* Returns the resource tied to this Resource.`