|
15 | 15 | use Symfony\Component\Cache\Adapter\ArrayAdapter;
|
16 | 16 | use Symfony\Component\Config\Loader\LoaderInterface;
|
17 | 17 | use Symfony\Component\DependencyInjection\ContainerBuilder;
|
| 18 | +use Symfony\Contracts\Cache\CacheInterface; |
| 19 | +use Symfony\UX\LazyImage\BlurHash\BlurHash; |
18 | 20 | use Symfony\UX\LazyImage\BlurHash\BlurHashInterface;
|
19 |
| -use Symfony\UX\LazyImage\BlurHash\CachedBlurHash; |
20 | 21 | use Symfony\UX\LazyImage\Tests\Kernel\TwigAppKernel;
|
21 | 22 |
|
22 | 23 | /**
|
@@ -50,7 +51,8 @@ public function testEnsureCacheIsNotUsedWhenNotConfigured()
|
50 | 51 | /** @var BlurHashInterface $blurHash */
|
51 | 52 | $blurHash = $container->get('test.lazy_image.blur_hash');
|
52 | 53 |
|
53 |
| - static::assertNotInstanceOf(CachedBlurHash::class, $blurHash); |
| 54 | + $this->assertInstanceOf(BlurHash::class, $blurHash); |
| 55 | + $this->assertNull($this->extractCache($blurHash)); |
54 | 56 | }
|
55 | 57 |
|
56 | 58 | public function testEnsureCacheIsUsedWhenConfigured()
|
@@ -86,43 +88,83 @@ public function registerContainerConfiguration(LoaderInterface $loader)
|
86 | 88 | /** @var BlurHashInterface $blurHash */
|
87 | 89 | $blurHash = $container->get('test.lazy_image.blur_hash');
|
88 | 90 |
|
89 |
| - static::assertInstanceOf(CachedBlurHash::class, $blurHash); |
| 91 | + $this->assertInstanceOf(BlurHash::class, $blurHash); |
| 92 | + $this->assertInstanceOf(CacheInterface::class, $this->extractCache($blurHash)); |
90 | 93 | }
|
91 | 94 |
|
92 |
| - public function testEncodeShouldBeCalledOnceWhenCached() |
| 95 | + public function testCreateDataUriThumbnail() |
93 | 96 | {
|
94 |
| - $blurHash = $this->createMock(BlurHashInterface::class); |
95 |
| - $blurHash->expects($this->once())->method('encode')->with(__DIR__.'/../Fixtures/logo.png')->willReturn('L54ec*~q_3?bofoffQWB9F9FD%IU'); |
96 |
| - $cache = new ArrayAdapter(); |
97 |
| - $cachedBlurHash = new CachedBlurHash($blurHash, $cache); |
98 |
| - |
99 |
| - $this->assertEmpty($cache->getValues()); |
| 97 | + $kernel = new TwigAppKernel('test', true); |
| 98 | + $kernel->boot(); |
| 99 | + $container = $kernel->getContainer()->get('test.service_container'); |
100 | 100 |
|
101 |
| - $this->assertSame( |
102 |
| - 'L54ec*~q_3?bofoffQWB9F9FD%IU', |
103 |
| - $cachedBlurHash->encode(__DIR__.'/../Fixtures/logo.png') |
104 |
| - ); |
| 101 | + /** @var BlurHashInterface $blurHash */ |
| 102 | + $blurHash = $container->get('test.lazy_image.blur_hash'); |
105 | 103 |
|
106 |
| - $this->assertNotEmpty($cache->getValues()); |
| 104 | + $this->assertInstanceOf(BlurHash::class, $blurHash); |
| 105 | + $this->assertNull($this->extractCache($blurHash)); |
107 | 106 |
|
108 | 107 | $this->assertSame(
|
109 |
| - 'L54ec*~q_3?bofoffQWB9F9FD%IU', |
110 |
| - $cachedBlurHash->encode(__DIR__.'/../Fixtures/logo.png') |
| 108 | + 'data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEAYABgAAD//gA7Q1JFQVRPUjogZ2QtanBlZyB2MS4wICh1c2luZyBJSkcgSlBFRyB2ODApLCBxdWFsaXR5ID0gODAK/9sAQwAGBAUGBQQGBgUGBwcGCAoQCgoJCQoUDg8MEBcUGBgXFBYWGh0lHxobIxwWFiAsICMmJykqKRkfLTAtKDAlKCko/9sAQwEHBwcKCAoTCgoTKBoWGigoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgo/8AAEQgAOgDqAwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A8k8g00wH0rofsftTTZ+1AHOtAaieA10bWftUL2ftQBzbwGq0kBrppLT2qrLae1AHMSwGs+4tyc11ctr7VRntfagDj5oWQk44qGuluLQc8Vk3VngkrxQBQopWUqcGkoAKKKKACiiigAooqRIXbtQBHRVtLMnrUy2Q9KAM6itQWQ9KDZD0oAy6K0Gsh6VE9oR0oAqUVI8Lr2qMjHWgAooooAKKKKAPov7OPSmm3HpWhgU1gKAM1rcelQPbj0rUcCoJAKAMmSAelVJYB6VsSgVTlAoAxpoR6VRnhHpWzMBWfOBzQBi3EI5rLuYRg8Vu3GOayrnHNAHO3sA5IrPPBravMYNYz/eNACUUUUAFKqljgUlTWwGaALFvbjvV+KAelNgA4q7EBQAiQj0qVYR6VKgqZRQBX8kelBhHpVoCgigCk0I9KheEelaDAVC4FAGZLAKpT249K2JAKpzAUAY0iFTTKuXAHNU6ACiiigD6S84U1phWP9s96abz3oA1XmFQSTCs1rv3qB7v3oA0JZh61TllFUpbv3qpLd+9AFqaUVnzyiq812Oeaz7i7HPNAE1xKOeayrqYc81Dd3ygHJrGubxpCQvT1oAde3GThapUHmigAooooAKdG21s02igDUt5gQOavxSCueRyh4q3Dd44NAHQJJUyyVix3QPerC3I9aANTzKDIKzhcj1pDcj1oAvtJULyVSa5HrVeS7A70AXJZBVGeYDPNVpbvPSqruzHk0APmk3HioqKKACiiigD1X7WfWmm7PrVA000AXGuz61C92fWqrVA9AFiS8PrVSa896hlqlP3oAfcX+M81lXF+zkhfzqO8NVKAFd2c5Y5pKKKACiiigAooooAKKKKACiiigBQxHQ08TOO9R0UATfaHpDcOaiooAeZXPemEk9aKKACiiigAooooAKKKKAP/9k=', |
| 109 | + $blurHash->createDataUriThumbnail(__DIR__.'/../Fixtures/logo.png', 234, 58) |
111 | 110 | );
|
112 | 111 | }
|
113 | 112 |
|
114 |
| - public function testCreateDataUriThumbnail() |
| 113 | + public function testCreateDataUriThumbnailWithCache() |
115 | 114 | {
|
116 |
| - $kernel = new TwigAppKernel('test', true); |
| 115 | + $kernel = new class('test', true) extends TwigAppKernel { |
| 116 | + public function registerContainerConfiguration(LoaderInterface $loader) |
| 117 | + { |
| 118 | + parent::registerContainerConfiguration($loader); |
| 119 | + |
| 120 | + $loader->load(static function (ContainerBuilder $container) { |
| 121 | + $container->loadFromExtension('framework', [ |
| 122 | + 'cache' => [ |
| 123 | + 'pools' => [ |
| 124 | + 'cache.lazy_image' => [ |
| 125 | + 'adapter' => 'cache.adapter.array', |
| 126 | + ], |
| 127 | + ], |
| 128 | + ], |
| 129 | + ]); |
| 130 | + |
| 131 | + $container->loadFromExtension('lazy_image', [ |
| 132 | + 'cache' => 'cache.lazy_image', |
| 133 | + ]); |
| 134 | + |
| 135 | + $container->setAlias('test.cache.lazy_image', 'cache.lazy_image')->setPublic(true); |
| 136 | + }); |
| 137 | + } |
| 138 | + }; |
| 139 | + |
117 | 140 | $kernel->boot();
|
118 | 141 | $container = $kernel->getContainer()->get('test.service_container');
|
119 | 142 |
|
120 | 143 | /** @var BlurHashInterface $blurHash */
|
121 | 144 | $blurHash = $container->get('test.lazy_image.blur_hash');
|
122 | 145 |
|
| 146 | + $this->assertInstanceOf(BlurHash::class, $blurHash); |
| 147 | + $this->assertInstanceOf(ArrayAdapter::class, $cache = $this->extractCache($blurHash)); |
| 148 | + |
| 149 | + $this->assertEmpty($cache->getValues()); |
| 150 | + |
| 151 | + $this->assertSame( |
| 152 | + 'data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEAYABgAAD//gA7Q1JFQVRPUjogZ2QtanBlZyB2MS4wICh1c2luZyBJSkcgSlBFRyB2ODApLCBxdWFsaXR5ID0gODAK/9sAQwAGBAUGBQQGBgUGBwcGCAoQCgoJCQoUDg8MEBcUGBgXFBYWGh0lHxobIxwWFiAsICMmJykqKRkfLTAtKDAlKCko/9sAQwEHBwcKCAoTCgoTKBoWGigoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgo/8AAEQgAOgDqAwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A8k8g00wH0rofsftTTZ+1AHOtAaieA10bWftUL2ftQBzbwGq0kBrppLT2qrLae1AHMSwGs+4tyc11ctr7VRntfagDj5oWQk44qGuluLQc8Vk3VngkrxQBQopWUqcGkoAKKKKACiiigAooqRIXbtQBHRVtLMnrUy2Q9KAM6itQWQ9KDZD0oAy6K0Gsh6VE9oR0oAqUVI8Lr2qMjHWgAooooAKKKKAPov7OPSmm3HpWhgU1gKAM1rcelQPbj0rUcCoJAKAMmSAelVJYB6VsSgVTlAoAxpoR6VRnhHpWzMBWfOBzQBi3EI5rLuYRg8Vu3GOayrnHNAHO3sA5IrPPBravMYNYz/eNACUUUUAFKqljgUlTWwGaALFvbjvV+KAelNgA4q7EBQAiQj0qVYR6VKgqZRQBX8kelBhHpVoCgigCk0I9KheEelaDAVC4FAGZLAKpT249K2JAKpzAUAY0iFTTKuXAHNU6ACiiigD6S84U1phWP9s96abz3oA1XmFQSTCs1rv3qB7v3oA0JZh61TllFUpbv3qpLd+9AFqaUVnzyiq812Oeaz7i7HPNAE1xKOeayrqYc81Dd3ygHJrGubxpCQvT1oAde3GThapUHmigAooooAKdG21s02igDUt5gQOavxSCueRyh4q3Dd44NAHQJJUyyVix3QPerC3I9aANTzKDIKzhcj1pDcj1oAvtJULyVSa5HrVeS7A70AXJZBVGeYDPNVpbvPSqruzHk0APmk3HioqKKACiiigD1X7WfWmm7PrVA000AXGuz61C92fWqrVA9AFiS8PrVSa896hlqlP3oAfcX+M81lXF+zkhfzqO8NVKAFd2c5Y5pKKKACiiigAooooAKKKKACiiigBQxHQ08TOO9R0UATfaHpDcOaiooAeZXPemEk9aKKACiiigAooooAKKKKAP/9k=', |
| 153 | + $blurHash->createDataUriThumbnail(__DIR__.'/../Fixtures/logo.png', 234, 58) |
| 154 | + ); |
| 155 | + |
| 156 | + $this->assertNotEmpty($cache->getValues()); |
| 157 | + |
123 | 158 | $this->assertSame(
|
124 | 159 | 'data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEAYABgAAD//gA7Q1JFQVRPUjogZ2QtanBlZyB2MS4wICh1c2luZyBJSkcgSlBFRyB2ODApLCBxdWFsaXR5ID0gODAK/9sAQwAGBAUGBQQGBgUGBwcGCAoQCgoJCQoUDg8MEBcUGBgXFBYWGh0lHxobIxwWFiAsICMmJykqKRkfLTAtKDAlKCko/9sAQwEHBwcKCAoTCgoTKBoWGigoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgo/8AAEQgAOgDqAwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A8k8g00wH0rofsftTTZ+1AHOtAaieA10bWftUL2ftQBzbwGq0kBrppLT2qrLae1AHMSwGs+4tyc11ctr7VRntfagDj5oWQk44qGuluLQc8Vk3VngkrxQBQopWUqcGkoAKKKKACiiigAooqRIXbtQBHRVtLMnrUy2Q9KAM6itQWQ9KDZD0oAy6K0Gsh6VE9oR0oAqUVI8Lr2qMjHWgAooooAKKKKAPov7OPSmm3HpWhgU1gKAM1rcelQPbj0rUcCoJAKAMmSAelVJYB6VsSgVTlAoAxpoR6VRnhHpWzMBWfOBzQBi3EI5rLuYRg8Vu3GOayrnHNAHO3sA5IrPPBravMYNYz/eNACUUUUAFKqljgUlTWwGaALFvbjvV+KAelNgA4q7EBQAiQj0qVYR6VKgqZRQBX8kelBhHpVoCgigCk0I9KheEelaDAVC4FAGZLAKpT249K2JAKpzAUAY0iFTTKuXAHNU6ACiiigD6S84U1phWP9s96abz3oA1XmFQSTCs1rv3qB7v3oA0JZh61TllFUpbv3qpLd+9AFqaUVnzyiq812Oeaz7i7HPNAE1xKOeayrqYc81Dd3ygHJrGubxpCQvT1oAde3GThapUHmigAooooAKdG21s02igDUt5gQOavxSCueRyh4q3Dd44NAHQJJUyyVix3QPerC3I9aANTzKDIKzhcj1pDcj1oAvtJULyVSa5HrVeS7A70AXJZBVGeYDPNVpbvPSqruzHk0APmk3HioqKKACiiigD1X7WfWmm7PrVA000AXGuz61C92fWqrVA9AFiS8PrVSa896hlqlP3oAfcX+M81lXF+zkhfzqO8NVKAFd2c5Y5pKKKACiiigAooooAKKKKACiiigBQxHQ08TOO9R0UATfaHpDcOaiooAeZXPemEk9aKKACiiigAooooAKKKKAP/9k=',
|
125 | 160 | $blurHash->createDataUriThumbnail(__DIR__.'/../Fixtures/logo.png', 234, 58)
|
126 | 161 | );
|
| 162 | + |
| 163 | + $this->assertNotEmpty($cache->getValues()); |
| 164 | + } |
| 165 | + |
| 166 | + private function extractCache(BlurHash $blurHash): ?CacheInterface |
| 167 | + { |
| 168 | + return \Closure::bind(fn () => $this->cache, $blurHash, BlurHash::class)(); |
127 | 169 | }
|
128 | 170 | }
|
0 commit comments