osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2024-12-29 07:53:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2706 from mtmail/php-fixes-php7-vs-php8

Browse Source 
PHP 8 behaves slightly different with in_array and usort
This commit is contained in:
Sarah Hoffmann 2022-07-03 11:28:52 +02:00 committed by GitHub
commit 67996929e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib-php/ParameterParser.php
View File

@ -70,7 +70,7 @@ class ParameterParser
return $sDefault; return $sDefault;
} }
if (!in_array($this->aParams[$sName], $aValues)) { if (!in_array($this->aParams[$sName], $aValues, true)) {
userError("Parameter '$sName' must be one of: ".join(', ', $aValues)); userError("Parameter '$sName' must be one of: ".join(', ', $aValues));
} }

7
lib-php/SimpleWordList.php
View File

@ -120,13 +120,18 @@ class SimpleWordList
return array_slice($aWordSets, 0, SimpleWordList::MAX_WORDSETS); 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) public static function cmpByArraylen($aA, $aB)
{ {
$iALen = count($aA); $iALen = count($aA);
$iBLen = count($aB); $iBLen = count($aB);
if ($iALen == $iBLen) { if ($iALen == $iBLen) {
return 0; return strlen($aB[0]) <=> strlen($aA[0]);
} }
return ($iALen < $iBLen) ? -1 : 1; return ($iALen < $iBLen) ? -1 : 1;

5
test/php/Nominatim/ParameterParserTest.php
View File

@ -137,6 +137,9 @@ class ParameterParserTest extends \PHPUnit\Framework\TestCase
public function testGetSet() public function testGetSet()
{ {
$this->expectException(\Exception::class);
$this->expectExceptionMessage("Parameter 'val3' must be one of: foo, bar");
$oParams = new ParameterParser(array( $oParams = new ParameterParser(array(
'val1' => 'foo', 'val1' => 'foo',
'val2' => '', 'val2' => '',
@ -148,7 +151,7 @@ class ParameterParserTest extends \PHPUnit\Framework\TestCase
$this->assertSame('foo', $oParams->getSet('val1', array('foo', 'bar'))); $this->assertSame('foo', $oParams->getSet('val1', array('foo', 'bar')));
$this->assertSame(false, $oParams->getSet('val2', array('foo', 'bar'))); $this->assertSame(false, $oParams->getSet('val2', array('foo', 'bar')));
$this->assertSame(0, $oParams->getSet('val3', array('foo', 'bar'))); $oParams->getSet('val3', array('foo', 'bar'));
} }

18
test/php/Nominatim/SimpleWordListTest.php
View File

@ -77,7 +77,7 @@ class SimpleWordListTest extends \PHPUnit\Framework\TestCase
$oList = new SimpleWordList('a b c'); $oList = new SimpleWordList('a b c');
$this->assertEquals( $this->assertEquals(
'(a b c),(a|b c),(a b|c),(a|b|c)', '(a b c),(a b|c),(a|b c),(a|b|c)',
$this->serializeSets($oList->getWordSets(new TokensFullSet())) $this->serializeSets($oList->getWordSets(new TokensFullSet()))
); );
@ -88,6 +88,22 @@ class SimpleWordListTest extends \PHPUnit\Framework\TestCase
); );
} }
public function testCmpByArraylen()
{
// Array elements are phrases, we want to sort so longest phrases are first
$aList1 = array('hackney', 'bridge', 'london', 'england');
$aList2 = array('hackney', 'london', 'bridge');
$aList3 = array('bridge', 'hackney', 'london', 'england');
$this->assertEquals(0, \Nominatim\SimpleWordList::cmpByArraylen($aList1, $aList1));
// list2 "wins". Less array elements
$this->assertEquals(1, \Nominatim\SimpleWordList::cmpByArraylen($aList1, $aList2));
$this->assertEquals(-1, \Nominatim\SimpleWordList::cmpByArraylen($aList2, $aList3));
// list1 "wins". Same number of array elements but longer first element
$this->assertEquals(-1, \Nominatim\SimpleWordList::cmpByArraylen($aList1, $aList3));
}
public function testMaxWordSets() public function testMaxWordSets()
{ {