Skip to content

feat: Allow custom adapter registration #182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

feat: Allow custom adapter registration #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions src/Adapter/AdapterDefinitionFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,12 @@ final class AdapterDefinitionFactory
*/
private array $builders;

public function __construct()
/**
* @param list<AdapterDefinitionBuilderInterface> $builders
*/
public function __construct(array $builders)
{
$this->builders = [
$this->builders = array_merge([
new Builder\AsyncAwsAdapterDefinitionBuilder(),
new Builder\AwsAdapterDefinitionBuilder(),
new Builder\AzureAdapterDefinitionBuilder(),
Expand All @@ -40,7 +43,7 @@ public function __construct()
new Builder\SftpAdapterDefinitionBuilder(),
new Builder\WebDAVAdapterDefinitionBuilder(),
new Builder\BunnyCDNAdapterDefinitionBuilder(),
];
], $builders);
}

public function createDefinition(string $name, array $options, ?string $defaultVisibilityForDirectories = null): ?Definition
Expand Down
2 changes: 0 additions & 2 deletions src/Adapter/Builder/AbstractAdapterDefinitionBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@

/**
* @author Titouan Galopin <[email protected]>
*
* @internal
*/
abstract class AbstractAdapterDefinitionBuilder implements AdapterDefinitionBuilderInterface
{
Expand Down
2 changes: 0 additions & 2 deletions src/Adapter/Builder/AdapterDefinitionBuilderInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@

/**
* @author Titouan Galopin <[email protected]>
*
* @internal
*/
interface AdapterDefinitionBuilderInterface
{
Expand Down
11 changes: 10 additions & 1 deletion src/DependencyInjection/FlysystemExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
use League\Flysystem\FilesystemWriter;
use League\Flysystem\ReadOnly\ReadOnlyFilesystemAdapter;
use League\FlysystemBundle\Adapter\AdapterDefinitionFactory;
use League\FlysystemBundle\Adapter\Builder\AdapterDefinitionBuilderInterface;
use League\FlysystemBundle\Exception\MissingPackageException;
use League\FlysystemBundle\Lazy\LazyFactory;
use Symfony\Component\DependencyInjection\ContainerBuilder;
Expand All @@ -30,6 +31,9 @@
*/
final class FlysystemExtension extends Extension
{
/** @var list<AdapterDefinitionBuilderInterface> */
private array $adapterDefinitionBuilders = [];

public function load(array $configs, ContainerBuilder $container): void
{
$configuration = new Configuration();
Expand All @@ -43,9 +47,14 @@ public function load(array $configs, ContainerBuilder $container): void
$this->createStoragesDefinitions($config, $container);
}

public function addAdapterDefinitionBuilder(AdapterDefinitionBuilderInterface $builder): void
{
$this->adapterDefinitionBuilders[] = $builder;
}

private function createStoragesDefinitions(array $config, ContainerBuilder $container): void
{
$definitionFactory = new AdapterDefinitionFactory();
$definitionFactory = new AdapterDefinitionFactory($this->adapterDefinitionBuilders);

foreach ($config['storages'] as $storageName => $storageConfig) {
// If the storage is a lazy one, it's resolved at runtime
Expand Down
2 changes: 1 addition & 1 deletion tests/Adapter/AdapterDefinitionFactoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public function provideConfigOptions(): \Generator
*/
public function testCreateDefinition($name, $options): void
{
$factory = new AdapterDefinitionFactory();
$factory = new AdapterDefinitionFactory([]);

$definition = $factory->createDefinition($name, $options);
$this->assertInstanceOf(Definition::class, $definition);
Expand Down