Fix style issues

Signed-off-by: Philipp Daun <[email protected]>

src/Internal/Search/Highlighter/Highlighter.php

@@ -72,45 +72,6 @@ public function highlight(
         return new HighlightResult($highlightedText, $matches);
     }
 
-    /**
-     * @param array<array{start:int, length:int}> $matches
-     * @return array<array{start:int, length:int}> $matches
-     */
-    private function removeStopWordMatches(array $matches): array
-    {
-        $maxCharDistance = 1;
-        $maxWordDistance = 1;
-
-        foreach ($matches as $i => $match) {
-            if (!$match['stopword']) {
-                continue;
-            }
-
-            $hasNonStopWordNeighbor = false;
-
-            for ($j = 1; $j <= $maxWordDistance; $j++) {
-                $prevMatch = $matches[$i - $j] ?? null;
-                $nextMatch = $matches[$i + $j] ?? null;
-
-                // Keep stopword matches between non-stopword matches of interest
-                $hasNonStopWordNeighbor = $hasNonStopWordNeighbor
-                    || ($prevMatch && $prevMatch['stopword'] === false && ($prevMatch['start'] + $prevMatch['length']) >= $match['start'] - $maxCharDistance)
-                    || ($nextMatch && $nextMatch['stopword'] === false && $nextMatch['start'] <= $match['start'] + $match['length'] + $maxCharDistance);
-
-                if ($hasNonStopWordNeighbor) {
-                    break;
-                }
-
-            }
-
-            if (!$hasNonStopWordNeighbor) {
-                unset($matches[$i]);
-            }
-        }
-
-        return $matches;
-    }
-
     /**
      * @param array<array{start:int, length:int}> $matches
      * @return array{starts: array<int>, ends: array<int>}
@@ -197,4 +158,42 @@ private function matches(Token $textToken, TokenCollection $queryTokens): bool
 
         return false;
     }
+
+    /**
+     * @param array<array{start:int, length:int}> $matches
+     * @return array<array{start:int, length:int}> $matches
+     */
+    private function removeStopWordMatches(array $matches): array
+    {
+        $maxCharDistance = 1;
+        $maxWordDistance = 1;
+
+        foreach ($matches as $i => $match) {
+            if (!$match['stopword']) {
+                continue;
+            }
+
+            $hasNonStopWordNeighbor = false;
+
+            for ($j = 1; $j <= $maxWordDistance; $j++) {
+                $prevMatch = $matches[$i - $j] ?? null;
+                $nextMatch = $matches[$i + $j] ?? null;
+
+                // Keep stopword matches between non-stopword matches of interest
+                $hasNonStopWordNeighbor = $hasNonStopWordNeighbor
+                    || ($prevMatch && $prevMatch['stopword'] === false && ($prevMatch['start'] + $prevMatch['length']) >= $match['start'] - $maxCharDistance)
+                    || ($nextMatch && $nextMatch['stopword'] === false && $nextMatch['start'] <= $match['start'] + $match['length'] + $maxCharDistance);
+
+                if ($hasNonStopWordNeighbor) {
+                    break;
+                }
+            }
+
+            if (!$hasNonStopWordNeighbor) {
+                unset($matches[$i]);
+            }
+        }
+
+        return $matches;
+    }
 }

src/Internal/Tokenizer/Tokenizer.php

@@ -143,7 +143,7 @@ private function doTokenize(string $string, ?string $language, ?int $maxTokens =
                 }
             }
 
-            $stopword = in_array($term, $stopWords);
+            $stopword = \in_array($term, $stopWords, true);
 
             $token = new Token(
                 $id++,