Issue #3485800 by castanearie, mkalkbrenner: No results when a key co…

…nsists only of a backslash

src/Utility/Utility.php

@@ -997,15 +997,28 @@ public static function flattenKeysToPayloadScore($keys, ?ParseModeInterface $par
             }
           }
           elseif ($escaped) {
-            $k[] = trim($key);
+            $trimmed = trim($key);
+            // See the boost_term_payload field type in schema.xml. If we send
+            // shorter or larger keys then defined by solr.LengthFilterFactory
+            // we'll trigger a "SpanQuery is null" exception.
+            if (mb_strlen($trimmed) >= 2 && mb_strlen($trimmed) <= 100) {
+              $k[] = $trimmed;
+            }
           }
           else {
             switch ($parse_mode_id) {
               case 'terms':
               case "sloppy_terms":
               case 'fuzzy_terms':
               case 'edismax':
-                $k[] = $queryHelper->escapePhrase(trim($key));
+                $trimmed = trim($key);
+                // See the boost_term_payload field type in schema.xml. If we
+                // send shorter or larger keys then defined by
+                // solr.LengthFilterFactory we'll trigger a "SpanQuery is null"
+                // exception.
+                if (mb_strlen($trimmed) >= 2 && mb_strlen($trimmed) <= 100) {
+                  $k[] = $queryHelper->escapePhrase($trimmed);
+                }
                 break;
 
               case 'phrase':
@@ -1031,15 +1044,7 @@ public static function flattenKeysToPayloadScore($keys, ?ParseModeInterface $par
         }
       }
 
-      // See the boost_term_payload field type in schema.xml. If we send shorter
-      // or larger keys then defined by solr.LengthFilterFactory we'll trigger a
-      // "SpanQuery is null" exception.
-      $k = array_filter($k, function ($v) {
-        $v = trim($v, '"');
-        return (mb_strlen($v) >= 2) && (mb_strlen($v) <= 100);
-      });
-
-      if ($k) {
+      if (!empty($k)) {
         $payload_scores[] = ' {!payload_score f=boost_term v=' . implode(' func=max} {!payload_score f=boost_term v=', $k) . ' func=max}';
       }
     }