Fixed bug in boot command bus

RubixML · Nov 16, 2019 · b94721b · b94721b
1 parent 45e03ec
commit b94721b
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 36 deletions.
diff --git a/src/RESTServer.php b/src/RESTServer.php
@@ -243,24 +243,23 @@ protected function bootCommandBus(Estimator $estimator) : CommandBus
     {
         $commands = [];
 
-        switch (true) {
-            case $estimator instanceof Estimator:
-                $commands[QueryModel::class] = new QueryModelHandler($estimator);
-                $commands[Predict::class] = new PredictHandler($estimator);
-
-                // no break
-            case $estimator instanceof Learner:
-                $commands[PredictSample::class] = new PredictSampleHandler($estimator);
-
-                // no break
-            case $estimator instanceof Probabilistic:
-                $commands[Proba::class] = new ProbaHandler($estimator);
-                $commands[ProbaSample::class] = new ProbaSampleHandler($estimator);
-
-                // no break
-            case $estimator instanceof Ranking:
-                $commands[Rank::class] = new RankHandler($estimator);
-                $commands[RankSample::class] = new RankSampleHandler($estimator);
+        if ($estimator instanceof Estimator) {
+            $commands[QueryModel::class] = new QueryModelHandler($estimator);
+            $commands[Predict::class] = new PredictHandler($estimator);
+        }
+
+        if ($estimator instanceof Learner) {
+            $commands[PredictSample::class] = new PredictSampleHandler($estimator);
+        }
+
+        if ($estimator instanceof Probabilistic) {
+            $commands[Proba::class] = new ProbaHandler($estimator);
+            $commands[ProbaSample::class] = new ProbaSampleHandler($estimator);
+        }
+
+        if ($estimator instanceof Ranking) {
+            $commands[Rank::class] = new RankHandler($estimator);
+            $commands[RankSample::class] = new RankSampleHandler($estimator);
         }
 
         if ($this instanceof Verbose) {

diff --git a/src/RPCServer.php b/src/RPCServer.php
@@ -228,24 +228,23 @@ protected function bootCommandBus(Estimator $estimator) : CommandBus
     {
         $commands = [];
 
-        switch (true) {
-            case $estimator instanceof Estimator:
-                $commands[QueryModel::class] = new QueryModelHandler($estimator);
-                $commands[Predict::class] = new PredictHandler($estimator);
-
-                // no break
-            case $estimator instanceof Learner:
-                $commands[PredictSample::class] = new PredictSampleHandler($estimator);
-
-                // no break
-            case $estimator instanceof Probabilistic:
-                $commands[Proba::class] = new ProbaHandler($estimator);
-                $commands[ProbaSample::class] = new ProbaSampleHandler($estimator);
-
-                // no break
-            case $estimator instanceof Ranking:
-                $commands[Rank::class] = new RankHandler($estimator);
-                $commands[RankSample::class] = new RankSampleHandler($estimator);
+        if ($estimator instanceof Estimator) {
+            $commands[QueryModel::class] = new QueryModelHandler($estimator);
+            $commands[Predict::class] = new PredictHandler($estimator);
+        }
+
+        if ($estimator instanceof Learner) {
+            $commands[PredictSample::class] = new PredictSampleHandler($estimator);
+        }
+
+        if ($estimator instanceof Probabilistic) {
+            $commands[Proba::class] = new ProbaHandler($estimator);
+            $commands[ProbaSample::class] = new ProbaSampleHandler($estimator);
+        }
+
+        if ($estimator instanceof Ranking) {
+            $commands[Rank::class] = new RankHandler($estimator);
+            $commands[RankSample::class] = new RankSampleHandler($estimator);
         }
 
         if ($this instanceof Verbose) {