feature #44532 Handle CSV DSN in ZookeeperStore (qkdreyer)

fabpot · fabpot · commit 9f28dbd1a163 · 2022-03-26T12:23:56.000+01:00
This PR was squashed before being merged into the 6.1 branch. Discussion ---------- Handle CSV DSN in ZookeeperStore | Q | A | ------------- | --- | Branch? | 6.1 for features / 4.4, 5.3, 5.4 or 6.0 for bug fixes  | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | | License | MIT | Doc PR | Commits ------- b2977c2 Handle CSV DSN in ZookeeperStore
diff --git a/src/Symfony/Component/Lock/Store/ZookeeperStore.php b/src/Symfony/Component/Lock/Store/ZookeeperStore.php
@@ -45,11 +45,15 @@ public static function createConnection(string $dsn): \Zookeeper
         }
 
         $host = $params['host'] ?? '';
-        if (isset($params['port'])) {
-            $host .= ':'.$params['port'];
+        $hosts = explode(',', $host);
+
+        foreach ($hosts as $index => $host) {
+            if (isset($params['port'])) {
+                $hosts[$index] = $host.':'.$params['port'];
+            }
         }
 
-        return new \Zookeeper($host);
+        return new \Zookeeper(implode($hosts, ','));
     }
 
     /**
diff --git a/src/Symfony/Component/Lock/Tests/Store/StoreFactoryTest.php b/src/Symfony/Component/Lock/Tests/Store/StoreFactoryTest.php
@@ -63,6 +63,7 @@ public function validConnections()
         if (class_exists(\Zookeeper::class)) {
             yield [$this->createMock(\Zookeeper::class), ZookeeperStore::class];
             yield ['zookeeper://localhost:2181', ZookeeperStore::class];
+            yield ['zookeeper://localhost01,localhost02:2181', ZookeeperStore::class];
         }
         if (\extension_loaded('sysvsem')) {
             yield ['semaphore', SemaphoreStore::class];

Original file line number	Diff line number	Diff line change
`@@ -45,11 +45,15 @@ public static function createConnection(string $dsn): \Zookeeper`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`$host = $params['host'] ?? '';`
`48`		`- if (isset($params['port'])) {`
`49`		`- $host .= ':'.$params['port'];`
	`48`	`+ $hosts = explode(',', $host);`
	`49`	`+`
	`50`	`+ foreach ($hosts as $index => $host) {`
	`51`	`+ if (isset($params['port'])) {`
	`52`	`+ $hosts[$index] = $host.':'.$params['port'];`
	`53`	`+ }`
`50`	`54`	`}`
`51`	`55`
`52`		`- return new \Zookeeper($host);`
	`56`	`+ return new \Zookeeper(implode($hosts, ','));`
`53`	`57`	`}`
`54`	`58`
`55`	`59`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,7 @@ public function validConnections()`
`63`	`63`	`if (class_exists(\Zookeeper::class)) {`
`64`	`64`	`yield [$this->createMock(\Zookeeper::class), ZookeeperStore::class];`
`65`	`65`	`yield ['zookeeper://localhost:2181', ZookeeperStore::class];`
	`66`	`+ yield ['zookeeper://localhost01,localhost02:2181', ZookeeperStore::class];`
`66`	`67`	`}`
`67`	`68`	`if (\extension_loaded('sysvsem')) {`
`68`	`69`	`yield ['semaphore', SemaphoreStore::class];`