minor #46017 [Cache][String] Don't use is_iterable() in perf-critical code paths (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit efc974d2418a · 2022-04-12T16:58:00.000+02:00
This PR was merged into the 6.1 branch. Discussion ---------- [Cache][String] Don't use is_iterable() in perf-critical code paths | Q | A | ------------- | --- | Branch? | 6.1 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - This is 5 times faster than calling `is_iterable()` Partially reverting #45978 /cc `@fancyweb` FYI. Commits ------- 33fa00c [Cache][String] Don't use is_iterable() in perf-critical code paths
diff --git a/src/Symfony/Component/Cache/CacheItem.php b/src/Symfony/Component/Cache/CacheItem.php
@@ -110,7 +110,7 @@ public function tag(mixed $tags): static
         if (!$this->isTaggable) {
             throw new LogicException(sprintf('Cache item "%s" comes from a non tag-aware pool: you cannot tag it.', $this->key));
         }
-        if (!is_iterable($tags)) {
+        if (!\is_array($tags) && !$tags instanceof \Traversable) { // don't use is_iterable(), it's slow
             $tags = [$tags];
         }
         foreach ($tags as $tag) {
diff --git a/src/Symfony/Component/String/AbstractString.php b/src/Symfony/Component/String/AbstractString.php
@@ -558,7 +558,7 @@ abstract public function trimEnd(string $chars = " \t\n\r\0\x0B\x0C\u{A0}\u{FEFF
      */
     public function trimPrefix($prefix): static
     {
-        if (is_iterable($prefix)) {
+        if (\is_array($prefix) || $prefix instanceof \Traversable) { // don't use is_iterable(), it's slow
             foreach ($prefix as $s) {
                 $t = $this->trimPrefix($s);
 
@@ -592,7 +592,7 @@ abstract public function trimStart(string $chars = " \t\n\r\0\x0B\x0C\u{A0}\u{FE
      */
     public function trimSuffix($suffix): static
     {
-        if (is_iterable($suffix)) {
+        if (\is_array($suffix) || $suffix instanceof \Traversable) { // don't use is_iterable(), it's slow
             foreach ($suffix as $s) {
                 $t = $this->trimSuffix($s);
 

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public function tag(mixed $tags): static`
`110`	`110`	`if (!$this->isTaggable) {`
`111`	`111`	`throw new LogicException(sprintf('Cache item "%s" comes from a non tag-aware pool: you cannot tag it.', $this->key));`
`112`	`112`	`}`
`113`		`- if (!is_iterable($tags)) {`
	`113`	`+ if (!\is_array($tags) && !$tags instanceof \Traversable) { // don't use is_iterable(), it's slow`
`114`	`114`	`$tags = [$tags];`
`115`	`115`	`}`
`116`	`116`	`foreach ($tags as $tag) {`