Merge branch '3.1' into 3.2

nicolas-grekas · nicolas-grekas · commit 8a244f2250e8 · 2017-01-13T11:11:31.000+01:00
* 3.1:
  [Cache] Using strpbrk() instead of strcspn() is faster
  bumped Symfony version to 3.1.10
  updated VERSION for 3.1.9
  updated CHANGELOG for 3.1.9
diff --git a/CacheItem.php b/CacheItem.php
@@ -104,7 +104,7 @@ public function expiresAfter($time)
      *
      * @return static
      *
-     * @throws InvalidArgumentException When $tag is not valid.
+     * @throws InvalidArgumentException When $tag is not valid
      */
     public function tag($tags)
     {
@@ -121,7 +121,7 @@ public function tag($tags)
             if (!isset($tag[0])) {
                 throw new InvalidArgumentException('Cache tag length must be greater than zero');
             }
-            if (isset($tag[strcspn($tag, '{}()/\@:')])) {
+            if (false !== strpbrk($tag, '{}()/\@:')) {
                 throw new InvalidArgumentException(sprintf('Cache tag "%s" contains reserved characters {}()/\@:', $tag));
             }
             $this->tags[$tag] = $tag;
@@ -135,7 +135,7 @@ public function tag($tags)
      *
      * @param string $key The key to validate
      *
-     * @throws InvalidArgumentException When $key is not valid.
+     * @throws InvalidArgumentException When $key is not valid
      */
     public static function validateKey($key)
     {
@@ -145,7 +145,7 @@ public static function validateKey($key)
         if (!isset($key[0])) {
             throw new InvalidArgumentException('Cache key length must be greater than zero');
         }
-        if (isset($key[strcspn($key, '{}()/\@:')])) {
+        if (false !== strpbrk($key, '{}()/\@:')) {
             throw new InvalidArgumentException(sprintf('Cache key "%s" contains reserved characters {}()/\@:', $key));
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public function expiresAfter($time)`
`104`	`104`	`*`
`105`	`105`	`* @return static`
`106`	`106`	`*`
`107`		`- * @throws InvalidArgumentException When $tag is not valid.`
	`107`	`+ * @throws InvalidArgumentException When $tag is not valid`
`108`	`108`	`*/`
`109`	`109`	`public function tag($tags)`
`110`	`110`	`{`
`@@ -121,7 +121,7 @@ public function tag($tags)`
`121`	`121`	`if (!isset($tag[0])) {`
`122`	`122`	`throw new InvalidArgumentException('Cache tag length must be greater than zero');`
`123`	`123`	`}`
`124`		`- if (isset($tag[strcspn($tag, '{}()/\@:')])) {`
	`124`	`+ if (false !== strpbrk($tag, '{}()/\@:')) {`
`125`	`125`	`throw new InvalidArgumentException(sprintf('Cache tag "%s" contains reserved characters {}()/\@:', $tag));`
`126`	`126`	`}`
`127`	`127`	`$this->tags[$tag] = $tag;`
`@@ -135,7 +135,7 @@ public function tag($tags)`
`135`	`135`	`*`
`136`	`136`	`* @param string $key The key to validate`
`137`	`137`	`*`
`138`		`- * @throws InvalidArgumentException When $key is not valid.`
	`138`	`+ * @throws InvalidArgumentException When $key is not valid`
`139`	`139`	`*/`
`140`	`140`	`public static function validateKey($key)`
`141`	`141`	`{`
`@@ -145,7 +145,7 @@ public static function validateKey($key)`
`145`	`145`	`if (!isset($key[0])) {`
`146`	`146`	`throw new InvalidArgumentException('Cache key length must be greater than zero');`
`147`	`147`	`}`
`148`		`- if (isset($key[strcspn($key, '{}()/\@:')])) {`
	`148`	`+ if (false !== strpbrk($key, '{}()/\@:')) {`
`149`	`149`	`throw new InvalidArgumentException(sprintf('Cache key "%s" contains reserved characters {}()/\@:', $key));`
`150`	`150`	`}`
`151`	`151`	`}`