minor #18647 [Cache] Minor cleanup (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit e0696fadeef2 · 2016-04-27T09:23:25.000+02:00
This PR was merged into the 3.1-dev branch. Discussion ---------- [Cache] Minor cleanup | Q | A | ------------- | --- | Branch? | 3.1 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- 5786f3d [Cache] Minor cleanup
diff --git a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
@@ -323,7 +323,6 @@ public function commit()
                 CacheItem::log($this->logger, 'Failed to save key "{key}" ({type})', array('key' => substr($id, strlen($this->namespace)), 'type' => $type, 'exception' => $e instanceof \Exception ? $e : null));
             }
         }
-        $this->deferred = array();
 
         return $ok;
     }
diff --git a/src/Symfony/Component/Cache/CacheItem.php b/src/Symfony/Component/Cache/CacheItem.php
@@ -115,7 +115,7 @@ public static function validateKey($key)
             throw new InvalidArgumentException('Cache key length must be greater than zero');
         }
         if (isset($key[strcspn($key, '{}()/\@:')])) {
-            throw new InvalidArgumentException('Cache key contains reserved characters {}()/\@:');
+            throw new InvalidArgumentException(sprintf('Cache key "%s" contains reserved characters {}()/\@:', $key));
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -323,7 +323,6 @@ public function commit()`
`323`	`323`	`CacheItem::log($this->logger, 'Failed to save key "{key}" ({type})', array('key' => substr($id, strlen($this->namespace)), 'type' => $type, 'exception' => $e instanceof \Exception ? $e : null));`
`324`	`324`	`}`
`325`	`325`	`}`
`326`		`- $this->deferred = array();`
`327`	`326`
`328`	`327`	`return $ok;`
`329`	`328`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ public static function validateKey($key)`
`115`	`115`	`throw new InvalidArgumentException('Cache key length must be greater than zero');`
`116`	`116`	`}`
`117`	`117`	`if (isset($key[strcspn($key, '{}()/\@:')])) {`
`118`		`- throw new InvalidArgumentException('Cache key contains reserved characters {}()/\@:');`
	`118`	`+ throw new InvalidArgumentException(sprintf('Cache key "%s" contains reserved characters {}()/\@:', $key));`
`119`	`119`	`}`
`120`	`120`	`}`
`121`	`121`