Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib-php / SimpleWordList.php

diff --git a/lib-php/SimpleWordList.php b/lib-php/SimpleWordList.php
index 3dd9bda12c6758a9041a98073574b121e81cba58..7009d370f9bb0e992f49eb47547ce5ef950b0f5b 100644 (file)
--- a/lib-php/SimpleWordList.php
+++ b/lib-php/SimpleWordList.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * SPDX-License-Identifier: GPL-2.0-only
+ *
+ * This file is part of Nominatim. (https://nominatim.org)
+ *
+ * Copyright (C) 2022 by the Nominatim developer community.
+ * For a full list of authors see the git log.
+ */
 
 namespace Nominatim;
 
@@ -112,13 +120,18 @@ class SimpleWordList
         return array_slice($aWordSets, 0, SimpleWordList::MAX_WORDSETS);
     }
 
+    /**
+     * Custom search routine which takes two arrays. The array with the fewest
+     * items wins. If same number of items then the one with the longest first
+     * element wins.
+     */
     public static function cmpByArraylen($aA, $aB)
     {
         $iALen = count($aA);
         $iBLen = count($aB);
 
         if ($iALen == $iBLen) {
-            return 0;
+            return strlen($aB[0]) <=> strlen($aA[0]);
         }
 
         return ($iALen < $iBLen) ? -1 : 1;