[sns] replaced custom parsing by dsn

Igor Paramonov · Igor Paramonov · commit daf511c9a335 · 2021-03-18T14:47:24.000+02:00
diff --git a/pkg/sns/SnsConnectionFactory.php b/pkg/sns/SnsConnectionFactory.php
@@ -136,30 +136,10 @@ private function parseDsn(string $dsn): array
             'version' => $dsn->getString('version'),
             'lazy' => $dsn->getBool('lazy'),
             'endpoint' => $dsn->getString('endpoint'),
-            'topic_arns' => $this->extractTopicArns($dsn->getString('topic_arns')),
+            'topic_arns' => $dsn->getArray('topic_arns', [])->toArray(),
         ]), function ($value) { return null !== $value; });
     }
 
-    private function extractTopicArns(?string $topicArns): array
-    {
-        if (!$topicArns) {
-            return [];
-        }
-
-        return array_column(
-            array_map(function ($topic) {
-                list($name, $arn) = explode('|', $topic);
-
-                return [
-                    'name' => $name,
-                    'arn' => $arn,
-                ];
-            }, explode(';', $topicArns)),
-            'arn',
-            'name'
-        );
-    }
-
     private function defaultConfig(): array
     {
         return [
diff --git a/pkg/sns/Tests/SnsConnectionFactoryConfigTest.php b/pkg/sns/Tests/SnsConnectionFactoryConfigTest.php
@@ -159,7 +159,7 @@ public static function provideConfigs()
         ];
 
         yield [
-            ['dsn' => 'sns:?topic_arns=topic1|arn:aws:sns:us-east-1:123456789012:topic1;topic2|arn:aws:sns:us-west-2:123456789012:topic2'],
+            ['dsn' => 'sns:?topic_arns[topic1]=arn:aws:sns:us-east-1:123456789012:topic1&topic_arns[topic2]=arn:aws:sns:us-west-2:123456789012:topic2'],
             [
                 'key' => null,
                 'secret' => null,

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ public static function provideConfigs()`
`159`	`159`	`];`
`160`	`160`
`161`	`161`	`yield [`
`162`		`- ['dsn' => 'sns:?topic_arns=topic1\|arn:aws:sns:us-east-1:123456789012:topic1;topic2\|arn:aws:sns:us-west-2:123456789012:topic2'],`
	`162`	`+ ['dsn' => 'sns:?topic_arns[topic1]=arn:aws:sns:us-east-1:123456789012:topic1&topic_arns[topic2]=arn:aws:sns:us-west-2:123456789012:topic2'],`
`163`	`163`	`[`
`164`	`164`	`'key' => null,`
`165`	`165`	`'secret' => null,`