Skip to content

[bundle] add support for %env(resolve:FOO)% feature. #393

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 3 commits into from
Closed

[bundle] add support for %env(resolve:FOO)% feature. #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e9c5625
[bundle] add support for %env(resolve:FOO)% feature.
makasim Mar 2, 2018
7ea7d95
run env tests for Symfony 3.4+ only
makasim Mar 3, 2018
117a7d0
use old approach for symfony 3.2,3.3
makasim Mar 3, 2018
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
10 changes: 5 additions & 5 deletions pkg/enqueue/Symfony/DefaultTransportFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
use Symfony\Component\DependencyInjection\Alias;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\HttpKernel\Kernel;
use function Enqueue\dsn_to_connection_factory;

class DefaultTransportFactory implements TransportFactoryInterface, DriverFactoryInterface
Expand Down Expand Up @@ -141,18 +142,17 @@ public function getName()
}

/**
* This is a quick fix to the exception "Incompatible use of dynamic environment variables "ENQUEUE_DSN" found in parameters."
* TODO: We'll have to come up with a better solution.
*
* @param ContainerBuilder $container
* @param $dsn
* @param string $dsn
*
* @return array|false|string
*/
private function resolveDSN(ContainerBuilder $container, $dsn)
{
if (method_exists($container, 'resolveEnvPlaceholders')) {
$dsn = $container->resolveEnvPlaceholders($dsn);
if (version_compare(Kernel::VERSION, '3.4', '>=')) {
return $container->resolveEnvPlaceholders($dsn, true);
}

$matches = [];
if (preg_match('/%env\((.*?)\)/', $dsn, $matches)) {
Expand Down
61 changes: 61 additions & 0 deletions pkg/enqueue/Tests/Symfony/DefaultTransportFactoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
use Symfony\Component\Config\Definition\Processor;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\HttpKernel\Kernel;

class DefaultTransportFactoryTest extends TestCase
{
Expand Down Expand Up @@ -266,6 +267,66 @@ public function testShouldCreateDriverFromDsn($dsn, $expectedName)
$this->assertEquals($driverId, (string) $context);
}

public function testShouldCreateConnectionFactoryFromEnvironmentDSN()
{
if (version_compare(Kernel::VERSION, '3.4', '<')) {
$this->markTestSkipped('This functionality only works on Symfony 3.4 or higher');
}

$env = str_replace(['\\', ':'], '', strtoupper(uniqid(__METHOD__)));
putenv("$env=null:");

$container = new ContainerBuilder();

$transport = new DefaultTransportFactory();

$serviceId = $transport->createConnectionFactory($container, ['dsn' => "%env($env)%"]);

$this->assertEquals('enqueue.transport.default.connection_factory', $serviceId);

$this->assertTrue($container->hasAlias('enqueue.transport.default.connection_factory'));
$this->assertEquals(
sprintf('enqueue.transport.%s.connection_factory', 'default_null'),
(string) $container->getAlias('enqueue.transport.default.connection_factory')
);

$this->assertTrue($container->hasAlias('enqueue.transport.connection_factory'));
$this->assertEquals(
'enqueue.transport.default.connection_factory',
(string) $container->getAlias('enqueue.transport.connection_factory')
);
}

public function testShouldCreateConnectionFactoryFromEnvironmentWithResolveProviderDSN()
{
if (version_compare(Kernel::VERSION, '3.4', '<')) {
$this->markTestSkipped('This functionality only works on Symfony 3.4 or higher');
}

$env = str_replace(['\\', ':'], '', strtoupper(uniqid(__METHOD__)));
putenv("$env=file:");

$container = new ContainerBuilder();

$transport = new DefaultTransportFactory();

$serviceId = $transport->createConnectionFactory($container, ['dsn' => "%env(resolve:$env)%"]);

$this->assertEquals('enqueue.transport.default.connection_factory', $serviceId);

$this->assertTrue($container->hasAlias('enqueue.transport.default.connection_factory'));
$this->assertEquals(
sprintf('enqueue.transport.%s.connection_factory', 'default_fs'),
(string) $container->getAlias('enqueue.transport.default.connection_factory')
);

$this->assertTrue($container->hasAlias('enqueue.transport.connection_factory'));
$this->assertEquals(
'enqueue.transport.default.connection_factory',
(string) $container->getAlias('enqueue.transport.connection_factory')
);
}

public static function provideDSNs()
{
yield ['amqp+ext:', 'default_amqp'];
Expand Down