safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

PHP 8 behaves slightly different with in_array and usort

Browse Source
This commit is contained in:
Marc Tobias
2022-05-10 18:30:49 +02:00
parent bc63f10057
commit ccf119206d
4 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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