Fix server crash when users search included empty strings.

Author: thisismeonmounteverest

src/Controller/SuggestLocationController.php

@@ -28,11 +28,11 @@ public function __construct(LoggerInterface $logger, TranslatorInterface $transl
     public function suggestExactPlaces(Request $request, SuggestLocationModel $model): JsonResponse
     {
         $response = new JsonResponse();
-        $searchTerm = $request->query->get('term', '');
+        $searchTerms = $this->splitElements($request->query->get('term', ''));
 
-        $this->logSearchInfo(__METHOD__, $searchTerm);
+        $this->logSearchInfo(__METHOD__, $searchTerms);
 
-        $result = $model->getSuggestionsForPlacesExact($searchTerm);
+        $result = $model->getSuggestionsForPlacesExact($searchTerms);
         $response->setData($result);
 
         return $response;
@@ -44,11 +44,11 @@ public function suggestExactPlaces(Request $request, SuggestLocationModel $model
     public function suggestPlaces(Request $request, SuggestLocationModel $model): JsonResponse
     {
         $response = new JsonResponse();
-        $searchTerm = $request->query->get('term', '');
+        $searchTerms = $this->splitElements($request->query->get('term', ''));
 
-        $this->logSearchInfo(__METHOD__, $searchTerm);
+        $this->logSearchInfo(__METHOD__, $searchTerms);
 
-        $result = $model->getSuggestionsForPlaces($searchTerm);
+        $result = $model->getSuggestionsForPlaces($searchTerms);
         $response->setData($result);
 
         return $response;
@@ -63,18 +63,23 @@ public function suggestPlaces(Request $request, SuggestLocationModel $model): Js
     public function suggestLocations(Request $request, SuggestLocationModel $model): JsonResponse
     {
         $response = new JsonResponse();
-        $searchTerm = $request->query->get('term', '');
+        $searchTerms = $this->splitElements($request->query->get('term', ''));
 
-        $this->logSearchInfo(__METHOD__, $searchTerm);
+        $this->logSearchInfo(__METHOD__, $searchTerms);
 
-        $result = $model->getSuggestionsForLocations($searchTerm);
+        $result = $model->getSuggestionsForLocations($searchTerms);
         $response->setData($result);
 
         return $response;
     }
 
-    private function logSearchInfo(string $function, string $searchTerm)
+    private function logSearchInfo(string $function, array $searchTerms)
     {
-        $this->logger->alert($function, ['locale' => $this->translator->getLocale(), 'searchTerm' => $searchTerm]);
+        $this->logger->alert($function, ['locale' => $this->translator->getLocale(), 'searchTerms' => $searchTerms]);
+    }
+
+    private function splitElements(string $searchTerm): array
+    {
+        return array_filter(array_map('trim', explode(',', $searchTerm)), 'strlen');
     }
 }

src/Model/SuggestLocationModel.php

@@ -43,24 +43,24 @@ public function __construct(
         $this->manticorePort = $manticorePort;
     }
 
-    public function getSuggestionsForPlaces(string $term): array
+    public function getSuggestionsForPlaces(array $terms): array
     {
-        $places = $this->getPlaces($term, 25);
+        $places = $this->getPlaces($terms, 25);
 
         return ['locations' => $places];
     }
 
-    public function getSuggestionsForPlacesExact(string $term): array
+    public function getSuggestionsForPlacesExact(array $terms): array
     {
-        return ['locations' => $this->getPlacesExact($term, 100)];
+        return ['locations' => $this->getPlacesExact($terms, 100)];
     }
 
-    public function getSuggestionsForLocations(string $term): array
+    public function getSuggestionsForLocations(array $terms): array
     {
-        $placesExact = $this->getPlacesExact($term, 10, self::EXACT_PLACE);
-        $places = $this->getPlaces($term, 20);
-        $adminUnits = $this->getAdminUnits($term, 10);
-        $countries = $this->getCountries($term, 5);
+        $placesExact = $this->getPlacesExact($terms, 10, self::EXACT_PLACE);
+        $places = $this->getPlaces($terms, 20);
+        $adminUnits = $this->getAdminUnits($terms, 10);
+        $countries = $this->getCountries($terms, 5);
         $results = array_merge($placesExact, $places, $adminUnits, $countries);
 
         return ['locations' => $this->removeDuplicates('id', $results)];
@@ -71,10 +71,8 @@ public function getSuggestionsForLocations(string $term): array
      *
      * place[[, admin unit], country]
      */
-    private function getPlacesExact(string $term, int $limit, ?string $translationId = null): array
+    private function getPlacesExact(array $parts, int $limit, ?string $translationId = null): array
     {
-        $parts = array_map('trim', explode(',', $term));
-
         $countryId = '';
         $adminUnits = [];
         if (1 < count($parts)) {
@@ -128,10 +126,8 @@ private function getPlacesExact(string $term, int $limit, ?string $translationId
         return $this->getLocationDetails($results, $translationId);
     }
 
-    private function getPlaces(string $term, int $limit): array
+    private function getPlaces(array $parts, int $limit): array
     {
-        $parts = array_map('trim', explode(',', $term));
-
         $countryId = '';
         $adminUnits = [];
         if (1 < count($parts)) {
@@ -181,10 +177,8 @@ private function getPlaces(string $term, int $limit): array
         return $this->getLocationDetails($results, self::PLACE);
     }
 
-    private function getAdminUnits(string $term, int $limit = 10): array
+    private function getAdminUnits(array $parts, int $limit = 10): array
     {
-        $parts = array_map('trim', explode(',', $term));
-
         $countryId = '';
         $adminUnits = [];
         if (1 < count($parts)) {
@@ -232,10 +226,8 @@ private function getAdminUnits(string $term, int $limit = 10): array
         return $this->getLocationDetails($results, self::ADMIN_UNIT);
     }
 
-    private function getCountries(string $term, int $limit = 3): array
+    private function getCountries(array $parts, int $limit = 3): array
     {
-        $parts = array_map('trim', explode(',', $term));
-
         if (1 !== count($parts)) {
             return [];
         }
@@ -445,7 +437,6 @@ private function getManticoreResults(Search $query, int $limit = 1000): array
 
     private function getQueryForGeonamesRt(): Search
     {
-        $locale = $this->translator->getLocale();
         $config = ['host' => $this->manticoreHost,'port' => $this->manticorePort];
         $client = new Client($config);
         $query = new Search($client);