Merge pull request #542 from Geolim4/final

Fixed #541
PHPSocialNetwork · Nov 23, 2017 · c3061be · c3061be
2 parents 0cc9e80 + 1add56e
commit c3061be
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/phpFastCache/Drivers/Couchbase/Driver.php b/src/phpFastCache/Drivers/Couchbase/Driver.php
@@ -78,7 +78,11 @@ protected function driverWrite(CacheItemInterface $item)
          * Check for Cross-Driver type confusion
          */
         if ($item instanceof Item) {
-            return $this->getBucket()->upsert($item->getEncodedKey(), $this->encode($this->driverPreWrap($item)), ['expiry' => $item->getTtl()]);
+            try {
+                return (bool)$this->getBucket()->upsert($item->getEncodedKey(), $this->encode($this->driverPreWrap($item)), ['expiry' => $item->getTtl()]);
+            } catch (\CouchbaseException $e) {
+                return false;
+            }
         } else {
             throw new phpFastCacheInvalidArgumentException('Cross-Driver type confusion detected');
         }
@@ -111,7 +115,11 @@ protected function driverDelete(CacheItemInterface $item)
          * Check for Cross-Driver type confusion
          */
         if ($item instanceof Item) {
-            return $this->getBucket()->remove($item->getEncodedKey());
+            try {
+                return (bool)$this->getBucket()->remove($item->getEncodedKey());
+            } catch (\Couchbase\Exception $e) {
+                return $e->getCode() === COUCHBASE_KEY_ENOENT;
+            }
         } else {
             throw new phpFastCacheInvalidArgumentException('Cross-Driver type confusion detected');
         }