[Lock][Messenger] Fix precedence of DSN options for 5.1

symfony · Jun 18, 2020 · 9670e9f · 9670e9f
1 parent 86c79ce
commit 9670e9f
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 11 deletions.
diff --git a/src/Symfony/Component/Lock/Store/MongoDbStore.php b/src/Symfony/Component/Lock/Store/MongoDbStore.php
@@ -120,8 +120,8 @@ public function __construct($mongo, array $options = [], float $initialTtl = 300
             if (isset($parsedUrl['query'])) {
                 parse_str($parsedUrl['query'], $query);
             }
-            $this->options['collection'] = $this->options['collection'] ?? $query['collection'] ?? null;
-            $this->options['database'] = $this->options['database'] ?? ltrim($parsedUrl['path'] ?? '', '/') ?: null;
+            $this->options['collection'] = $query['collection'] ?? $this->options['collection'] ?? null;
+            $this->options['database'] = ltrim($parsedUrl['path'] ?? '', '/') ?: $this->options['database'] ?? null;
             if (null === $this->options['database']) {
                 throw new InvalidArgumentException(sprintf('"%s()" requires the "database" in the URI path or option when constructing with a URI.', __METHOD__));
             }

diff --git a/src/Symfony/Component/Lock/Tests/Store/MongoDbStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/MongoDbStoreTest.php
@@ -121,6 +121,19 @@ public function provideConstructorArgs()
         yield ['mongodb://localhost/', ['database' => 'test', 'collection' => 'lock']];
     }
 
+    public function testDsnPrecedence()
+    {
+        $client = self::getMongoClient();
+
+        $store = new MongoDbStore('mongodb://localhost/test_dsn?collection=lock_dns', ['collection' => 'lock_option', 'database' => 'test_option']);
+        $r = new \ReflectionObject($store);
+        $p = $r->getProperty('options');
+        $p->setAccessible(true);
+        $options = $p->getValue($store);
+        $this->assertSame('lock_dns', $options['collection']);
+        $this->assertSame('test_dsn', $options['database']);
+    }
+
     /**
      * @dataProvider provideInvalidConstructorArgs
      */

diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Tests/Transport/ConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Tests/Transport/ConnectionTest.php
@@ -70,6 +70,15 @@ public function testFromDsn()
         );
     }
 
+    public function testDsnPrecedence()
+    {
+        $httpClient = $this->getMockBuilder(HttpClientInterface::class)->getMock();
+        $this->assertEquals(
+            new Connection(['queue_name' => 'queue_dsn'], new SqsClient(['region' => 'us-east-2', 'accessKeyId' => 'key_dsn', 'accessKeySecret' => 'secret_dsn'], null, $httpClient)),
+            Connection::fromDsn('sqs://key_dsn:secret_dsn@default/queue_dsn?region=us-east-2', ['region' => 'eu-west-3', 'queue_name' => 'queue_options', 'access_key' => 'key_option', 'secret_key' => 'secret_option'], $httpClient)
+        );
+    }
+
     public function testFromDsnWithRegion()
     {
         $httpClient = $this->getMockBuilder(HttpClientInterface::class)->getMock();

diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/Connection.php
@@ -94,19 +94,19 @@ public static function fromDsn(string $dsn, array $options = [], HttpClientInter
         if (isset($parsedUrl['query'])) {
             parse_str($parsedUrl['query'], $query);
         }
-
+        $options = $query + $options + self::DEFAULT_OPTIONS;
         $configuration = [
-            'buffer_size' => $options['buffer_size'] ?? (int) ($query['buffer_size'] ?? self::DEFAULT_OPTIONS['buffer_size']),
-            'wait_time' => $options['wait_time'] ?? (int) ($query['wait_time'] ?? self::DEFAULT_OPTIONS['wait_time']),
-            'poll_timeout' => $options['poll_timeout'] ?? ($query['poll_timeout'] ?? self::DEFAULT_OPTIONS['poll_timeout']),
-            'visibility_timeout' => $options['visibility_timeout'] ?? ($query['visibility_timeout'] ?? self::DEFAULT_OPTIONS['visibility_timeout']),
-            'auto_setup' => $options['auto_setup'] ?? (bool) ($query['auto_setup'] ?? self::DEFAULT_OPTIONS['auto_setup']),
+            'buffer_size' => (int) $options['buffer_size'],
+            'wait_time' => (int) $options['wait_time'],
+            'poll_timeout' => $options['poll_timeout'],
+            'visibility_timeout' => $options['visibility_timeout'],
+            'auto_setup' => (bool) $options['auto_setup'],
         ];
 
         $clientConfiguration = [
-            'region' => $options['region'] ?? ($query['region'] ?? self::DEFAULT_OPTIONS['region']),
-            'accessKeyId' => $options['access_key'] ?? (urldecode($parsedUrl['user'] ?? '') ?: self::DEFAULT_OPTIONS['access_key']),
-            'accessKeySecret' => $options['secret_key'] ?? (urldecode($parsedUrl['pass'] ?? '') ?: self::DEFAULT_OPTIONS['secret_key']),
+            'region' => $options['region'],
+            'accessKeyId' => urldecode($parsedUrl['user'] ?? '') ?: $options['access_key'] ?? self::DEFAULT_OPTIONS['access_key'],
+            'accessKeySecret' => urldecode($parsedUrl['pass'] ?? '') ?: $options['secret_key'] ?? self::DEFAULT_OPTIONS['secret_key'],
         ];
         unset($query['region']);