Handle precendence for path and credentials

jderusse · jderusse · commit 3908741e26d3 · 2020-06-15T10:56:59.000+02:00
diff --git a/src/Symfony/Component/Lock/Store/MongoDbStore.php b/src/Symfony/Component/Lock/Store/MongoDbStore.php
@@ -121,7 +121,7 @@ public function __construct($mongo, array $options = [], float $initialTtl = 300
                 parse_str($parsedUrl['query'], $query);
             }
             $this->options['collection'] = $query['collection'] ?? $this->options['collection'] ?? null;
-            $this->options['database'] = $this->options['database'] ?? ltrim($parsedUrl['path'] ?? '', '/') ?: 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
@@ -125,12 +125,13 @@ public function testDsnPrecedence()
     {
         $client = self::getMongoClient();
 
-        $store = new MongoDbStore('mongodb://localhost/test?collection=lock_dns', ['collection' => 'lock_option']);
+        $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']);
     }
 
     /**
diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Tests/Transport/ConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Tests/Transport/ConnectionTest.php
@@ -74,8 +74,8 @@ public function testDsnPrecedence()
     {
         $httpClient = $this->getMockBuilder(HttpClientInterface::class)->getMock();
         $this->assertEquals(
-            new Connection(['queue_name' => 'queue'], new SqsClient(['region' => 'us-east-2', 'accessKeyId' => null, 'accessKeySecret' => null], null, $httpClient)),
-            Connection::fromDsn('sqs://default/queue?region=us-east-2', ['region' => 'eu-west-3'], $httpClient)
+            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', 'accessKeyId' => 'key_option', 'accessKeySecret' => 'secret_option'], $httpClient)
         );
     }
 
diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/Connection.php
@@ -105,8 +105,8 @@ public static function fromDsn(string $dsn, array $options = [], HttpClientInter
 
         $clientConfiguration = [
             'region' => $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']),
+            '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']);
 

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ public function __construct($mongo, array $options = [], float $initialTtl = 300`
`121`	`121`	`parse_str($parsedUrl['query'], $query);`
`122`	`122`	`}`
`123`	`123`	`$this->options['collection'] = $query['collection'] ?? $this->options['collection'] ?? null;`
`124`		`- $this->options['database'] = $this->options['database'] ?? ltrim($parsedUrl['path'] ?? '', '/') ?: null;`
	`124`	`+ $this->options['database'] = ltrim($parsedUrl['path'] ?? '', '/') ?: $this->options['database'] ?? null;`
`125`	`125`	`if (null === $this->options['database']) {`
`126`	`126`	`throw new InvalidArgumentException(sprintf('"%s()" requires the "database" in the URI path or option when constructing with a URI.', __METHOD__));`
`127`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -125,12 +125,13 @@ public function testDsnPrecedence()`
`125`	`125`	`{`
`126`	`126`	`$client = self::getMongoClient();`
`127`	`127`
`128`		`- $store = new MongoDbStore('mongodb://localhost/test?collection=lock_dns', ['collection' => 'lock_option']);`
	`128`	`+ $store = new MongoDbStore('mongodb://localhost/test_dsn?collection=lock_dns', ['collection' => 'lock_option', 'database' => 'test_option']);`
`129`	`129`	`$r = new \ReflectionObject($store);`
`130`	`130`	`$p = $r->getProperty('options');`
`131`	`131`	`$p->setAccessible(true);`
`132`	`132`	`$options = $p->getValue($store);`
`133`	`133`	`$this->assertSame('lock_dns', $options['collection']);`
	`134`	`+ $this->assertSame('test_dsn', $options['database']);`
`134`	`135`	`}`
`135`	`136`
`136`	`137`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -74,8 +74,8 @@ public function testDsnPrecedence()`
`74`	`74`	`{`
`75`	`75`	`$httpClient = $this->getMockBuilder(HttpClientInterface::class)->getMock();`
`76`	`76`	`$this->assertEquals(`
`77`		`- new Connection(['queue_name' => 'queue'], new SqsClient(['region' => 'us-east-2', 'accessKeyId' => null, 'accessKeySecret' => null], null, $httpClient)),`
`78`		`- Connection::fromDsn('sqs://default/queue?region=us-east-2', ['region' => 'eu-west-3'], $httpClient)`
	`77`	`+ new Connection(['queue_name' => 'queue_dsn'], new SqsClient(['region' => 'us-east-2', 'accessKeyId' => 'key_dsn', 'accessKeySecret' => 'secret_dsn'], null, $httpClient)),`
	`78`	`+ Connection::fromDsn('sqs://key_dsn:secret_dsn@default/queue_dsn?region=us-east-2', ['region' => 'eu-west-3', 'queue_name' => 'queue_options', 'accessKeyId' => 'key_option', 'accessKeySecret' => 'secret_option'], $httpClient)`
`79`	`79`	`);`
`80`	`80`	`}`
`81`	`81`