Update for 2.2

nilportugues · Mar 18, 2016 · 2345860 · 2345860
1 parent 4a1c11e
commit 2345860
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
     }
   ],
   "require": {
-    "nilportugues/repository": "^2.1",
+    "nilportugues/repository": "^2.2",
     "tedivm/stash": "v0.14.*"
   },
   "require-dev": {

diff --git a/src/RepositoryCache.php b/src/RepositoryCache.php
@@ -18,12 +18,13 @@
 use NilPortugues\Foundation\Domain\Model\Repository\Contracts\ReadRepository;
 use NilPortugues\Foundation\Domain\Model\Repository\Contracts\Sort;
 use NilPortugues\Foundation\Domain\Model\Repository\Contracts\WriteRepository;
+use Psr\Cache\CacheItemPoolInterface;
 use Stash\Interfaces\PoolInterface;
 
 class RepositoryCache implements ReadRepository, WriteRepository, PageRepository
 {
     /**
-     * @var PoolInterface
+     * @var CacheItemPoolInterface
      */
     protected $cache;
     /**
@@ -226,23 +227,18 @@ public function removeAll(Filter $filter = null)
     /**
      * {@inheritdoc}
      */
-    public function findByDistinct(
-        Fields $distinctFields,
-        Filter $filter = null,
-        Sort $sort = null,
-        Fields $fields = null
-    ) {
+    public function findByDistinct(Fields $distinctFields, Filter $filter = null, Sort $sort = null) {
         $cachedItem = $this->cache->getItem(
             $this->cacheNamespaceFindByDistinct.md5(
-                serialize($filter).serialize($sort).serialize($fields).serialize($distinctFields)
+                serialize($filter).serialize($sort).serialize($distinctFields)
             )
         );
 
         if (!$cachedItem->isMiss() && null !== ($result = $cachedItem->get())) {
             return $result;
         }
 
-        $result = $this->repository->findByDistinct($distinctFields, $filter, $sort, $fields);
+        $result = $this->repository->findByDistinct($distinctFields, $filter, $sort);
         $cachedItem->set($result, $this->cacheTime);
 
         return $result;