[Config] added existence check to some resource methods

everzet · everzet · commit 241aa92cc5db · 2012-06-20T10:19:09.000+02:00
* fixed DELETED event when starting to watch a file that does not exist yet
* fixed files that are deleted and then re-created

Conflicts:
	src/Symfony/Component/ResourceWatcher/StateChecker/ResourceStateChecker.php
	tests/Symfony/Tests/Component/ResourceWatcher/StateChecker/DirectoryStateCheckerTest.php
	tests/Symfony/Tests/Component/ResourceWatcher/StateChecker/FileStateCheckerTest.php
diff --git a/src/Symfony/Component/Config/Resource/DirectoryResource.php b/src/Symfony/Component/Config/Resource/DirectoryResource.php
@@ -75,6 +75,10 @@ public function getFilteredChilds()
      */
     public function getFilteredResources()
     {
+        if (!$this->exists()) {
+            return array();
+        }
+
         $iterator = new \DirectoryIterator($this->resource);
 
         $resources = array();
@@ -166,6 +170,10 @@ public function hasFile($file)
      */
     public function getModificationTime()
     {
+        if (!$this->exists()) {
+            return -1;
+        }
+
         clearstatcache(true, $this->resource);
         $newestMTime = filemtime($this->resource);
 
diff --git a/src/Symfony/Component/Config/Resource/FileResource.php b/src/Symfony/Component/Config/Resource/FileResource.php
@@ -29,7 +29,7 @@ class FileResource implements ResourceInterface
      */
     public function __construct($resource)
     {
-        $this->resource = realpath($resource);
+        $this->resource = file_exists($resource) ? realpath($resource) : $resource;
     }
 
     /**
@@ -59,6 +59,10 @@ public function getResource()
      */
     public function getModificationTime()
     {
+        if (!$this->exists()) {
+            return -1;
+        }
+
         clearstatcache(true, $this->resource);
 
         return filemtime($this->resource);

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class FileResource implements ResourceInterface`
`29`	`29`	`*/`
`30`	`30`	`public function __construct($resource)`
`31`	`31`	`{`
`32`		`- $this->resource = realpath($resource);`
	`32`	`+ $this->resource = file_exists($resource) ? realpath($resource) : $resource;`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`/**`
`@@ -59,6 +59,10 @@ public function getResource()`
`59`	`59`	`*/`
`60`	`60`	`public function getModificationTime()`
`61`	`61`	`{`
	`62`	`+ if (!$this->exists()) {`
	`63`	`+ return -1;`
	`64`	`+ }`
	`65`	`+`
`62`	`66`	`clearstatcache(true, $this->resource);`
`63`	`67`
`64`	`68`	`return filemtime($this->resource);`