FileJournal: fixed 'Link is not in node' exception [Closes #12]

That bug occur only in debug mode
nette · Dec 21, 2014 · 3076b11 · 3076b11
1 parent d071e06
commit 3076b11
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/Caching/Storages/FileJournal.php b/src/Caching/Storages/FileJournal.php
@@ -381,13 +381,13 @@ private function cleanLinks(array $data, array & $toDelete)
  do {
  $link = $data[$i];
 
- if (!isset($node[$link])) {
+ if (isset($this->deletedLinks[$link])) {
+ continue;
+ } elseif (!isset($node[$link])) {
  if (self::$debug) {
  throw new Nette\InvalidStateException("Link with ID $searchLink is not in node $nodeId.");
  }
  continue;
- } elseif (isset($this->deletedLinks[$link])) {
- continue;
  }
 
  $nodeLink = & $node[$link];

diff --git a/tests/Caching/FileJournal.phpt b/tests/Caching/FileJournal.phpt
@@ -17,7 +17,7 @@ function check($result, $condition, $name)
  Assert::true($condition, $name . ($condition === TRUE ? '' : 'Count: ' . count($result)));
 }
 
-
+FileJournal::$debug = TRUE;
 $journal = new FileJournal(TEMP_DIR);
 
 $journal->write('ok_test1', array(
@@ -177,3 +177,8 @@ $journal->write('ok_test_all_priority', array(
 $result = $journal->clean(array(Cache::ALL => TRUE));
 $result2 = $journal->clean(array(Cache::TAGS => 'test:all'));
 check($result, ($result === NULL and empty($result2)), 'Clean ALL');
+
+$journal->write('a', array(Cache::TAGS => array('gamma')));
+$journal->write('b', array(Cache::TAGS => array('alpha', 'beta', 'gamma')));
+$result = $journal->clean(array(Cache::TAGS => array('alpha', 'beta', 'gamma')));
+check($result, count($result) === 2, 'Remove item with multiple tags');