8000 [Config] additions from ResourceWatcher by everzet · Pull Request #4619 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Config] additions from ResourceWatcher #4619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Jun 20, 2012
Merged

[Config] additions from ResourceWatcher #4619

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
45df2e6
[Config] updated resources API to be more explicit
everzet Nov 19, 2011
6b39688
[Config] moved DirectoryResource childs retrieving to the special get…
everzet Nov 19, 2011
1f9ba38
[Config] getFilteredChildResources() method added to DirectoryResource
everzet Nov 19, 2011
45a45ba
[Config] updated DirectoryResource tests
everzet Nov 25, 2011
9fe0d00
[Config] update FileResourceTest
everzet Nov 25, 2011
d7c24eb
[Config] added new methods and their tests to File and Directory reso…
everzet Nov 29, 2011
c9eaa72
[Config] made ResourceInterface extends Serializable
fabpot Dec 5, 2011
ece489f
[Config] skip dots in getFilteredChilds() (fixes test suite on Linux)
everzet Apr 20, 2012
ff9c132
[Config] added type prefixes to resource ids
everzet Jun 9, 2012
56b60c8
[Config] use is_file in FileResource::exists()
everzet Jun 9, 2012
241aa92
[Config] added existence check to some resource methods
everzet Jun 20, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[Config] updated DirectoryResource tests
  • Loading branch information
@everzet
everzet committed Jun 20, 2012
commit 45a45baf2f0cd4eb052640ed394a45385d3b4a8b
27 changes: 12 additions & 15 deletions src/Symfony/Component/Config/Resource/DirectoryResource.php
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public function getFilteredChilds()
$childs = array();
foreach (new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->resource), \RecursiveIteratorIterator::SELF_FIRST) as $file) {
// if regex filtering is enabled only return matching files
if (!$this->isFileMatchesFilters($file)) {
if ($file->isFile() && !$this->isFileMatchesPattern($file)) {
continue;
}

Expand Down Expand Up @@ -71,7 +71,7 @@ public function getFilteredChildResources()
$resources = array();
foreach ($iterator as $file) {
// if regex filtering is enabled only return matching files
if (!$this->isFileMatchesFilters($file)) {
if ($file->isFile() && !$this->isFileMatchesPattern($file)) {
continue;
}

Expand Down Expand Up @@ -109,6 +109,11 @@ public function getResource()
return $this->resource;
}

/**
* Returns check pattern.
*
* @return mixed
*/
public function getPattern()
{
return $this->pattern;
Expand Down Expand Up @@ -145,7 +150,7 @@ public function isFresh($timestamp)
return false;
}

return $this->getModificationTime() <= $timestamp;
return $this->getModificationTime() < $timestamp;
}

/**
Expand All @@ -155,7 +160,7 @@ public function isFresh($timestamp)
*/
public function exists()
{
return file_exists($this->resource);
return is_dir($this->resource);
}

public function serialize()
Expand All @@ -175,18 +180,10 @@ public function unserialize($serialized)
*
* @return Boolean
*/
private function isFileMatchesFilters(\SplFileInfo $file)
private function isFileMatchesPattern(\SplFileInfo $file)
{
if (isset($this->filterRegexList) && $file->isFile()) {
$regexMatched = false;
foreach ($this->filterRegexList as $regex) {
if (preg_match($regex, (string) $file)) {
$regexMatched = true;
}
}
if (!$regexMatched) {
return false;
}
if ($this->pattern) {
return preg_match($this->pattern, $file->getBasename());
}

return true;
Expand Down
45 changes: 32 additions & 13 deletions src/Symfony/Component/Config/Tests/Resource/DirectoryResourceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,20 +118,8 @@ public function testIsFreshDeleteDirectory()
$this->assertFalse($resource->isFresh(time()), '->isFresh() returns false if the whole resource is removed');
}

/**
* @covers Symfony\Component\Config\Resource\DirectoryResource::exists
*/
public function testExists()
{
$this->assertTrue($this->resource->exists(), '->exists() returns true if the directory still exist');

$this->removeDirectory($this->directory);
$this->assertFalse($this->resource->exists(), '->exists() returns false if the directory does not exist');
}

/**
* @covers Symfony\Component\Config\Resource\DirectoryResource::isFresh
* @covers Symfony\Component\Config\Resource\DirectoryResource::getModificationTime
*/
public function testIsFreshCreateFileInSubdirectory()
{
Expand Down Expand Up @@ -161,7 +149,6 @@ public function testIsFreshModifySubdirectory()

/**
* @covers Symfony\Component\Config\Resource\DirectoryResource::isFresh
* @covers Symfony\Component\Config\Resource\DirectoryResource::getFilteredChilds
*/
public function testFilterRegexListNoMatch()
{
Expand All @@ -181,4 +168,36 @@ public function testFilterRegexListMatch()
touch($this->directory.'/new.xml', time() + 20);
$this->assertFalse($resource->isFresh(time() + 10), '->isFresh() returns false if an new file matching the filter regex is created ');
}

/**
* @covers Symfony\Component\Config\Resource\DirectoryResource::exists
*/
public function testDirectoryExists()
{
$resource = new DirectoryResource($this->directory);

$this->assertTrue($resource->exists(), '->exists() returns true if directory exists ');

unlink($this->directory.'/tmp.xml');
rmdir($this->directory);

$this->assertFalse($resource->exists(), '->exists() returns false if directory does not exists');
}

/**
* @covers Symfony\Component\Config\Resource\DirectoryResource::getModificationTime
*/
public function testGetModificationTime()
{
$resource = new DirectoryResource($this->directory, '/\.(foo|xml)$/');

touch($this->directory.'/new.xml', $time = time() + 20);
$this->assertSame($time, $resource->getModificationTime(), '->getModificationTime() returns time of the last modificated resource');

touch($this->directory.'/some', time() + 60);
$this->assertSame($time, $resource->getModificationTime(), '->getModificationTime() returns time of last modificated resource, that only matches pattern');

touch($this->directory, $time2 = time() + 90);
$this->assertSame($time2, $resource->getModificationTime(), '->getModificationTime() returns modification time of the directory itself');
}
}
0