X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/456d439e97675ca77018733f3106f507c3eedaa1..3a8ddf736edf4d2fc1d772179600417adc357bbb:/test/php/Nominatim/ParameterParserTest.php?ds=inline diff --git a/test/php/Nominatim/ParameterParserTest.php b/test/php/Nominatim/ParameterParserTest.php index cb7b0e81..1488c987 100644 --- a/test/php/Nominatim/ParameterParserTest.php +++ b/test/php/Nominatim/ParameterParserTest.php @@ -183,75 +183,49 @@ class ParameterParserTest extends \PHPUnit\Framework\TestCase { $oParams = new ParameterParser(array('accept-language' => '')); $this->assertSame(array( - 'default' => 'default', - 'brand' => 'brand', - 'official_name:default' => 'official_name:default', - 'short_name:default' => 'short_name:default', - 'official_name' => 'official_name', - 'short_name' => 'short_name', - 'ref' => 'ref', - 'type' => 'type' - ), $oParams->getPreferredLanguages('default')); + 'name:default' => 'name:default', + '_place_name:default' => '_place_name:default', + 'name' => 'name', + '_place_name' => '_place_name' + ), array_slice($oParams->getPreferredLanguages('default'), 0, 4)); $oParams = new ParameterParser(array('accept-language' => 'de,en')); $this->assertSame(array( - 'de' => 'de', - 'en' => 'en', + 'name:de' => 'name:de', + '_place_name:de' => '_place_name:de', + 'name:en' => 'name:en', + '_place_name:en' => '_place_name:en', 'name' => 'name', - 'brand' => 'brand', - 'official_name:de' => 'official_name:de', - 'short_name:de' => 'short_name:de', - 'official_name:en' => 'official_name:en', - 'short_name:en' => 'short_name:en', - 'official_name' => 'official_name', - 'short_name' => 'short_name', - 'ref' => 'ref', - 'type' => 'type' - ), $oParams->getPreferredLanguages('default')); + '_place_name' => '_place_name' + ), array_slice($oParams->getPreferredLanguages('default'), 0, 6)); $oParams = new ParameterParser(array('accept-language' => 'fr-ca,fr;q=0.8,en-ca;q=0.5,en;q=0.3')); $this->assertSame(array( - 'fr-ca' => 'fr-ca', - 'fr' => 'fr', - 'en-ca' => 'en-ca', - 'en' => 'en', + 'name:fr-ca' => 'name:fr-ca', + '_place_name:fr-ca' => '_place_name:fr-ca', + 'name:fr' => 'name:fr', + '_place_name:fr' => '_place_name:fr', + 'name:en-ca' => 'name:en-ca', + '_place_name:en-ca' => '_place_name:en-ca', + 'name:en' => 'name:en', + '_place_name:en' => '_place_name:en', 'name' => 'name', - 'brand' => 'brand', - 'official_name:fr-ca' => 'official_name:fr-ca', - 'short_name:fr-ca' => 'short_name:fr-ca', - 'official_name:fr' => 'official_name:fr', - 'short_name:fr' => 'short_name:fr', - 'official_name:en-ca' => 'official_name:en-ca', - 'short_name:en-ca' => 'short_name:en-ca', - 'official_name:en' => 'official_name:en', - 'short_name:en' => 'short_name:en', - 'official_name' => 'official_name', - 'short_name' => 'short_name', - 'ref' => 'ref', - 'type' => 'type', - ), $oParams->getPreferredLanguages('default')); + '_place_name' => '_place_name' + ), array_slice($oParams->getPreferredLanguages('default'), 0, 10)); $oParams = new ParameterParser(array('accept-language' => 'ja_rm,zh_pinyin')); $this->assertSame(array( - 'ja_rm' => 'ja_rm', - 'zh_pinyin' => 'zh_pinyin', - 'ja' => 'ja', - 'zh' => 'zh', + 'name:ja_rm' => 'name:ja_rm', + '_place_name:ja_rm' => '_place_name:ja_rm', + 'name:zh_pinyin' => 'name:zh_pinyin', + '_place_name:zh_pinyin' => '_place_name:zh_pinyin', + 'name:ja' => 'name:ja', + '_place_name:ja' => '_place_name:ja', + 'name:zh' => 'name:zh', + '_place_name:zh' => '_place_name:zh', 'name' => 'name', - 'brand' => 'brand', - 'official_name:ja_rm' => 'official_name:ja_rm', - 'short_name:ja_rm' => 'short_name:ja_rm', - 'official_name:zh_pinyin' => 'official_name:zh_pinyin', - 'short_name:zh_pinyin' => 'short_name:zh_pinyin', - 'official_name:ja' => 'official_name:ja', - 'short_name:ja' => 'short_name:ja', - 'official_name:zh' => 'official_name:zh', - 'short_name:zh' => 'short_name:zh', - 'official_name' => 'official_name', - 'short_name' => 'short_name', - 'ref' => 'ref', - 'type' => 'type', - ), $oParams->getPreferredLanguages('default')); + '_place_name' => '_place_name' + ), array_slice($oParams->getPreferredLanguages('default'), 0, 10)); } public function testHasSetAny()