hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 07:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some test failures

Browse Source
This commit is contained in:
Thibaud Fabre
2015-07-09 16:20:41 +02:00
parent d1b8b7f84e
commit 6b516618aa
2 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
lib/Alchemy/Phrasea/Collection/ArrayCacheCollectionRepository.php
View File

@@ -45,6 +45,35 @@ class ArrayCacheCollectionRepository implements CollectionRepository
$this->baseIdMap[$baseId] = [ $databoxId, $collectionId ];
}
private function getCollectionInCache($databoxId, $collectionId)
{
if (isset($this->collectionCache[$databoxId][$collectionId])) {
return $this->collectionCache[$databoxId][$collectionId];
}
return null;
}
private function getCollectionInCacheByBaseId($baseId)
{
if (isset($this->baseIdMap[$baseId])) {
list ($databoxId, $collectionId) = $this->baseIdMap[$baseId];
return $this->getCollectionInCache($databoxId, $collectionId);
}
return null;
}
private function getCollectionsInCache($databoxId)
{
if (isset($this->collectionCache[$databoxId])) {
return $this->collectionCache[$databoxId];
}
return [];
}
/**
* @param int $databoxId
* @return \collection[]
@@ -56,7 +85,7 @@ class ArrayCacheCollectionRepository implements CollectionRepository
$this->databoxFlags[$databoxId] = true;
}
return $this->collectionCache[$databoxId];
return $this->getCollectionsInCache($databoxId);
}
/**
@@ -69,9 +98,7 @@ class ArrayCacheCollectionRepository implements CollectionRepository
$this->putCollectionInCache($this->collectionRepository->find($baseId));
}
list ($databoxId, $collectionId) = $this->baseIdMap[$baseId];
return $this->collectionCache[$databoxId][$collectionId];
return $this->getCollectionInCacheByBaseId($baseId);
}
/**
@@ -85,6 +112,6 @@ class ArrayCacheCollectionRepository implements CollectionRepository
$this->putCollectionInCache($this->collectionRepository->findByCollectionId($databoxId, $collectionId));
}
return $this->collectionCache[$databoxId][$collectionId];
return $this->getCollectionInCache($databoxId, $collectionId);
}
}