bug #21269 [Cache] Using strpbrk() instead of strcspn() is faster (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit cbb5332b5625 · 2017-01-13T11:08:47.000+01:00
This PR was merged into the 3.1 branch. Discussion ---------- [Cache] Using strpbrk() instead of strcspn() is faster | 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 | - Keys validation using strpbrk is faster. Eg on some micro bench: - `isset($a[strcspn($a, '{}()/\@:')])`: 278ms - `false !== strpbrk($a, '{}()/\@:')`: 183ms Commits ------- d68c451 [Cache] Using strpbrk() instead of strcspn() is faster
diff --git a/src/Symfony/Component/Cache/CacheItem.php b/src/Symfony/Component/Cache/CacheItem.php
@@ -101,7 +101,7 @@ public function expiresAfter($time)
      *
      * @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)
     {
@@ -111,7 +111,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
`@@ -101,7 +101,7 @@ public function expiresAfter($time)`
`101`	`101`	`*`
`102`	`102`	`* @param string $key The key to validate`
`103`	`103`	`*`
`104`		`- * @throws InvalidArgumentException When $key is not valid.`
	`104`	`+ * @throws InvalidArgumentException When $key is not valid`
`105`	`105`	`*/`
`106`	`106`	`public static function validateKey($key)`
`107`	`107`	`{`
`@@ -111,7 +111,7 @@ public static function validateKey($key)`
`111`	`111`	`if (!isset($key[0])) {`
`112`	`112`	`throw new InvalidArgumentException('Cache key length must be greater than zero');`
`113`	`113`	`}`
`114`		`- if (isset($key[strcspn($key, '{}()/\@:')])) {`
	`114`	`+ if (false !== strpbrk($key, '{}()/\@:')) {`
`115`	`115`	`throw new InvalidArgumentException(sprintf('Cache key "%s" contains reserved characters {}()/\@:', $key));`
`116`	`116`	`}`
`117`	`117`	`}`