Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/mapping.php
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
// cache warmer
$services->set(CacheWarmer::class)
->args([
null, // cache directory, injected by extension
'', // cache directory, injected by extension
service('vich_uploader.metadata_reader'),
])
->tag('kernel.cache_warmer');
Expand Down
28 changes: 28 additions & 0 deletions tests/DependencyInjection/VichUploaderExtensionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@
namespace Vich\UploaderBundle\Tests\DependencyInjection;

use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionTestCase;
use PHPUnit\Framework\Attributes\DataProvider;
use Symfony\Bundle\TwigBundle\DependencyInjection\TwigExtension;
use Symfony\Component\DependencyInjection\Reference;
use Vich\UploaderBundle\DependencyInjection\VichUploaderExtension;
use Vich\UploaderBundle\Metadata\CacheWarmer;
use Vich\UploaderBundle\Metadata\Driver\AttributeReader;
use Vich\UploaderBundle\Storage\FlysystemStorage;
use Vich\UploaderBundle\Twig\Extension\UploaderExtension;
Expand Down Expand Up @@ -174,4 +177,29 @@ public function testDeprecatedMetadataDriverAliasStillExists(): void

$this->assertContainerBuilderHasAlias('vich_uploader.metadata_driver.annotation', 'vich_uploader.metadata_driver.attribute');
}

#[DataProvider('cacheWarmerArgumentsProvider')]
public function testMetadataCacheWarmerArguments(
string $cache,
string $expectedCacheDir,
Reference $expectedMetadataReader
): void {
$this->load([
'metadata' => [
'cache' => $cache,
],
]);

$this->assertContainerBuilderHasServiceDefinitionWithArgument(CacheWarmer::class, 0, $expectedCacheDir);
$this->assertContainerBuilderHasServiceDefinitionWithArgument(CacheWarmer::class, 1, $expectedMetadataReader);
}

public static function cacheWarmerArgumentsProvider(): \Generator
{
$metadataReader = new Reference('vich_uploader.metadata_reader');

yield 'no cache' => ['none', '', $metadataReader];
yield 'filesystem cache' => ['file', '%kernel.cache_dir%/vich_uploader', $metadataReader];
yield 'custom cache service' => ['service_id', '', $metadataReader];
}
}
Loading