diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Cache] Allow cache tags to be objects implementing __toString()

Browse Source
This commit is contained in:
Lars Strojny 2020-09-17 11:19:24 +02:00 committed by Fabien Potencier
parent ad226185af
commit c2c03e050f
3 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Symfony/Component/Cache/CacheItem.php
View File

@ -119,9 +119,10 @@ final class CacheItem implements ItemInterface
$tags = [$tags];
}
foreach ($tags as $tag) {
if (!\is_string($tag)) {
throw new InvalidArgumentException(sprintf('Cache tag must be string, "%s" given.', \is_object($tag) ? \get_class($tag) : \gettype($tag)));
if (!\is_string($tag) && !(\is_object($tag) && method_exists($tag, '__toString'))) {
throw new InvalidArgumentException(sprintf('Cache tag must be string or object that implements __toString(), "%s" given.', \is_object($tag) ? \get_class($tag) : \gettype($tag)));
}
$tag = (string) $tag;
if (isset($this->newMetadata[self::METADATA_TAGS][$tag])) {
continue;
}

5
src/Symfony/Component/Cache/Tests/CacheItemTest.php
View File

@ -13,6 +13,7 @@ namespace Symfony\Component\Cache\Tests;
use PHPUnit\Framework\TestCase;
use Symfony\Component\Cache\CacheItem;
use Symfony\Component\Cache\Tests\Fixtures\StringableTag;
class CacheItemTest extends TestCase
{
@ -61,9 +62,11 @@ class CacheItemTest extends TestCase
$this->assertSame($item, $item->tag('foo'));
$this->assertSame($item, $item->tag(['bar', 'baz']));
$this->assertSame($item, $item->tag(new StringableTag('qux')));
$this->assertSame($item, $item->tag([new StringableTag('quux'), new StringableTag('quuux')]));
(\Closure::bind(function () use ($item) {
$this->assertSame(['foo' => 'foo', 'bar' => 'bar', 'baz' => 'baz'], $item->newMetadata[CacheItem::METADATA_TAGS]);
$this->assertSame(['foo' => 'foo', 'bar' => 'bar', 'baz' => 'baz', 'qux' => 'qux', 'quux' => 'quux', 'quuux' => 'quuux'], $item->newMetadata[CacheItem::METADATA_TAGS]);
}, $this, CacheItem::class))();
}

30
src/Symfony/Component/Cache/Tests/Fixtures/StringableTag.php Normal file
View File

@ -0,0 +1,30 @@
<?php
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Symfony\Component\Cache\Tests\Fixtures;
class StringableTag
{
/**
* @var string
*/
private $tag;
public function __construct(string $tag)
{
$this->tag = $tag;
}
public function __toString(): string
{
return $this->tag;
}
}