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

Author: jderusse

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__));
             }

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
      */