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

makasim · makasim · commit e9c5625c088b · 2018-03-02T16:56:14.000+02:00
diff --git a/pkg/enqueue/Symfony/DefaultTransportFactory.php b/pkg/enqueue/Symfony/DefaultTransportFactory.php
@@ -141,27 +141,15 @@ 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);
-
-            $matches = [];
-            if (preg_match('/%env\((.*?)\)/', $dsn, $matches)) {
-                if (false === $realDsn = getenv($matches[1])) {
-                    throw new \LogicException(sprintf('The env "%s" var is not defined', $matches[1]));
-                }
-
-                return $realDsn;
-            }
+            return $container->resolveEnvPlaceholders($dsn, true);
         }
 
         return $dsn;
diff --git a/pkg/enqueue/Tests/Symfony/DefaultTransportFactoryTest.php b/pkg/enqueue/Tests/Symfony/DefaultTransportFactoryTest.php
@@ -266,6 +266,58 @@ public function testShouldCreateDriverFromDsn($dsn, $expectedName)
         $this->assertEquals($driverId, (string) $context);
     }
 
+    public function testShouldCreateConnectionFactoryFromEnvironmentDSN()
+    {
+        $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()
+    {
+        $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'];
