Merge pull request #1742 from algolia/fix/MAGE-1251-detach-replica-3.14

MAGE-1251 Fix replica detach operation for 3.14

Author: cammonro

Service/Product/ReplicaManager.php

@@ -413,13 +413,16 @@ protected function detachReplica(string $primaryIndexName, string $replicaIndexN
      */
     protected function removeReplicaFromReplicaSetting(array $replicaSetting, string $replicaToRemove): array
     {
-        return array_filter(
-            $replicaSetting,
-            function ($replicaIndexSetting) use ($replicaToRemove) {
-                $escaped = preg_quote($replicaToRemove);
-                $regex = '/^' . $escaped . '|virtual\(' . $escaped . '\)$/';
-                return !preg_match($regex, $replicaToRemove);
-            }
+        $escaped = preg_quote($replicaToRemove);
+        $regex = '/^' . $escaped . '|virtual\(' . $escaped . '\)$/';
+
+        return array_values(
+            array_filter(
+                $replicaSetting,
+                function ($replicaIndexSetting) use ($regex) {
+                    return !preg_match($regex, $replicaIndexSetting);
+                }
+            )
         );
     }
 

Test/Unit/Service/ReplicaManagerTest.php

@@ -54,7 +54,9 @@ public function testVirtualReplicaSettingRemove(): void
 
         $newReplicas = $this->replicaManager->removeReplicaFromReplicaSetting($replicaSetting, $replicaToRemove);
 
-        $this->assertNotContains($replicaToRemove, $newReplicas);
+        $this->assertNotContains("virtual($replicaToRemove)", $newReplicas);
+        $this->assertContains('virtual(replica1)', $newReplicas);
+        $this->assertContains('virtual(replica3)', $newReplicas);
     }
 
     public function testStandardReplicaSettingRemove(): void
@@ -69,5 +71,8 @@ public function testStandardReplicaSettingRemove(): void
         $newReplicas = $this->replicaManager->removeReplicaFromReplicaSetting($replicaSetting, $replicaToRemove);
 
         $this->assertNotContains($replicaToRemove, $newReplicas);
+        $this->assertContains('replica1', $newReplicas);
+        $this->assertContains('replica3', $newReplicas);
+
     }
 }