Skip to content
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

FIX: Prevent unnecessary cache writes (fixes #34) #58

Closed
wants to merge 1 commit into from
Closed

FIX: Prevent unnecessary cache writes (fixes #34) #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 1 addition & 16 deletions src/Collections/CachedConfigCollection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,26 +141,11 @@ public function getCollection()
$this->building = false;
}

// Save immediately.
// Note additional deferred save will occur in _destruct()
// Save collection in cache
$this->cache->set(self::CACHE_KEY, $this->collection);
return $this->collection;
}

/**
* Commits the cache
*/
public function __destruct()
{
// Ensure back-end cache is updated
if ($this->collection) {
$this->cache->set(self::CACHE_KEY, $this->collection);

// Prevent double-destruct
$this->collection = null;
}
}

public function nest()
{
$collection = $this->getCollection();
Expand Down
16 changes: 2 additions & 14 deletions tests/Collections/CachedConfigCollectionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,6 @@ public function testCacheHit()
->with(CachedConfigCollection::CACHE_KEY)
->willReturn($mockCollection);

// Set called in __destruct
$mockCache
->expects($this->once())
->method('set')
->with(CachedConfigCollection::CACHE_KEY, $mockCollection);

$collection = new CachedConfigCollection();
$collection->setCollectionCreator(function () {
$this->fail("Invalid cache miss");
Expand All @@ -51,9 +45,6 @@ public function testCacheHit()
// Check
$this->assertTrue($collection->exists('test', 'name'));
$this->assertEquals('value', $collection->get('test', 'name'));

// Write back changes to cache
$collection->__destruct();
}

public function testCacheMiss()
Expand All @@ -80,9 +71,9 @@ public function testCacheMiss()
->with('test', 'name', 0)
->willReturn(true);

// Cache will be generated, saved, and then saved again on __destruct()
// Cache will be generated, then saved
$mockCache
->expects($this->exactly(2))
->expects($this->once())
->method('set')
->with(CachedConfigCollection::CACHE_KEY, $mockCollection);

Expand All @@ -95,9 +86,6 @@ public function testCacheMiss()
// Check
$this->assertTrue($collection->exists('test', 'name'));
$this->assertEquals('value', $collection->get('test', 'name'));

// Write back changes to cache
$collection->__destruct();
}

public function testInfiniteLoop()
Expand Down