symfony
diff --git a/‎Adapter/TagAwareAdapter.php
Lines changed: 8 additions & 4 deletions b/‎Adapter/TagAwareAdapter.php
Lines changed: 8 additions & 4 deletions
diff --git a/‎Traits/AbstractAdapterTrait.php
Lines changed: 10 additions & 5 deletions b/‎Traits/AbstractAdapterTrait.php
Lines changed: 10 additions & 5 deletions
@@ -157,9 +157,10 @@ public function invalidateTags(array $tags)
      */
     public function hasItem($key)
     {
-        if ($this->deferred) {
+        if (\is_string($key) && isset($this->deferred[$key])) {
             $this->commit();
         }
+
         if (!$this->pool->hasItem($key)) {
             return false;
         }
@@ -200,18 +201,21 @@ public function getItem($key)
      */
     public function getItems(array $keys = [])
     {
-        if ($this->deferred) {
-            $this->commit();
-        }
         $tagKeys = [];
+        $commit = false;
 
         foreach ($keys as $key) {
             if ('' !== $key && \is_string($key)) {
+                $commit = $commit || isset($this->deferred[$key]);
                 $key = static::TAGS_PREFIX.$key;
                 $tagKeys[$key] = $key;
             }
         }
 
+        if ($commit) {
+            $this->commit();
+        }
+
         try {
             $items = $this->pool->getItems($tagKeys + $keys);
         } catch (InvalidArgumentException $e) {
 
@@ -208,10 +208,11 @@ public function deleteItems(array $keys)
      */
     public function getItem($key)
     {
-        if ($this->deferred) {
+        $id = $this->getId($key);
+
+        if (isset($this->deferred[$key])) {
             $this->commit();
         }
-        $id = $this->getId($key);
 
         $isHit = false;
         $value = null;
@@ -234,14 +235,18 @@ public function getItem($key)
      */
     public function getItems(array $keys = [])
     {
-        if ($this->deferred) {
-            $this->commit();
-        }
         $ids = [];
+        $commit = false;
 
         foreach ($keys as $key) {
             $ids[] = $this->getId($key);
+            $commit = $commit || isset($this->deferred[$key]);
+        }
+
+        if ($commit) {
+            $this->commit();
         }
+
         try {
             $items = $this->doFetch($ids);
         } catch (\Exception $e) {
Original file line number	Diff line number	Diff line change
`@@ -157,9 +157,10 @@ public function invalidateTags(array $tags)`
`157`	`157`	`*/`
`158`	`158`	`public function hasItem($key)`
`159`	`159`	`{`
`160`		`- if ($this->deferred) {`
	`160`	`+ if (\is_string($key) && isset($this->deferred[$key])) {`
`161`	`161`	`$this->commit();`
`162`	`162`	`}`
	`163`	`+`
`163`	`164`	`if (!$this->pool->hasItem($key)) {`
`164`	`165`	`return false;`
`165`	`166`	`}`
`@@ -200,18 +201,21 @@ public function getItem($key)`
`200`	`201`	`*/`
`201`	`202`	`public function getItems(array $keys = [])`
`202`	`203`	`{`
`203`		`- if ($this->deferred) {`
`204`		`- $this->commit();`
`205`		`- }`
`206`	`204`	`$tagKeys = [];`
	`205`	`+ $commit = false;`
`207`	`206`
`208`	`207`	`foreach ($keys as $key) {`
`209`	`208`	`if ('' !== $key && \is_string($key)) {`
	`209`	`+ $commit = $commit \|\| isset($this->deferred[$key]);`
`210`	`210`	`$key = static::TAGS_PREFIX.$key;`
`211`	`211`	`$tagKeys[$key] = $key;`
`212`	`212`	`}`
`213`	`213`	`}`
`214`	`214`
	`215`	`+ if ($commit) {`
	`216`	`+ $this->commit();`
	`217`	`+ }`
	`218`	`+`
`215`	`219`	`try {`
`216`	`220`	`$items = $this->pool->getItems($tagKeys + $keys);`
`217`	`221`	`} catch (InvalidArgumentException $e) {`