Dont throw runtime exception if no affected gambits

flarum · Apr 9, 2021 · dc07338 · dc07338
1 parent 9a2351d
commit dc07338
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/Search/SearchServiceProvider.php b/src/Search/SearchServiceProvider.php
@@ -74,7 +74,9 @@ public function boot()
                 }
             }
 
-            throw new \RuntimeException('You cannot add gambits to searchers that do not have fulltext gambits. The following searchers have this issue: '.implode(', ', $affectedGambits));
+            if (count($affectedGambits)) {
+                throw new \RuntimeException('You cannot add gambits to searchers that do not have fulltext gambits. The following searchers have this issue: '.implode(', ', $affectedGambits));
+            }
         }
 
         foreach ($fullTextGambits as $searcher => $fullTextGambitClass) {

diff --git a/tests/integration/extenders/SimpleFlarumSearchTest.php b/tests/integration/extenders/SimpleFlarumSearchTest.php
@@ -183,7 +183,7 @@ public function can_add_gambit_to_nonexistent_searcher_class_without_fulltext()
 
         try {
             $this->app();
-        } catch (RuntimeException $e) {
+        } catch (\RuntimeException $e) {
             $anExceptionWasThrown = true;
         }
 
@@ -195,9 +195,9 @@ public function can_add_gambit_to_nonexistent_searcher_class_without_fulltext()
      */
     public function cant_add_gambit_to_existent_searcher_class_without_fulltext()
     {
-        $this->extend((new Extend\SimpleFlarumSearch(AbstractSearcher::class))->addGambit(NoResultFilterGambit::class));
-
         $this->expectException(\RuntimeException::class);
+
+        $this->extend((new Extend\SimpleFlarumSearch(AbstractSearcher::class))->addGambit(NoResultFilterGambit::class));
         $this->app();
     }
 }