Merge pull request #7 from utopia-php/fix-qa

Fix: Bugs from QA
utopia-php · Nov 8, 2022 · 8b14583 · 8b14583
2 parents 1137448 + 9edb639
commit 8b14583
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/Balancer/Algorithm/RoundRobin.php b/src/Balancer/Algorithm/RoundRobin.php
@@ -39,11 +39,11 @@ public function run(array $options): ?Option
 
         $option = null;
 
-        if (\count($options) === $this->index) {
-            $option = $options[0];
-            $this->index = 0;
-        } else {
+        if (\array_key_exists($this->index, $options)) {
             $option = $options[$this->index];
+        } else {
+            $option = $options[0] ?? null;
+            $this->index = 0;
         }
 
         return $option;

diff --git a/src/Balancer/Balancer.php b/src/Balancer/Balancer.php
@@ -48,6 +48,10 @@ public function run(): ?Option
 
         $options = \array_values($options);
 
+        if (\count($options) === 0) {
+            return null;
+        }
+
         return $this->algo->run($options);
     }
 }