hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-11 13:24:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

ParameterParser: getInt with empty string value throws exception

Browse Source
This commit is contained in:
marc tobias
2018-03-06 13:33:19 +01:00
parent d9cd8c6fff
commit 123a3c0347
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ParameterParser.php
View File

@@ -23,7 +23,7 @@ class ParameterParser
public function getInt($sName, $bDefault = false) public function getInt($sName, $bDefault = false)
{ {
if (!isset($this->aParams[$sName]) || strlen($this->aParams[$sName]) == 0) { if (!isset($this->aParams[$sName])) {
return $bDefault; return $bDefault;
} }

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

@@ -16,11 +16,6 @@ class ParameterParserTest extends \PHPUnit_Framework_TestCase
{ {
protected function setUp()
{
}
public function testGetBool() public function testGetBool()
{ {
$oParams = new ParameterParser([ $oParams = new ParameterParser([
@@ -46,8 +41,7 @@ class ParameterParserTest extends \PHPUnit_Framework_TestCase
$oParams = new ParameterParser([ $oParams = new ParameterParser([
'int1' => '5', 'int1' => '5',
'int2' => '-1', 'int2' => '-1',
'int3' => '', 'int3' => 0
'int4' => 0
]); ]);
$this->assertSame(false, $oParams->getInt('non-exists')); $this->assertSame(false, $oParams->getInt('non-exists'));
@@ -55,15 +49,21 @@ class ParameterParserTest extends \PHPUnit_Framework_TestCase
$this->assertSame(5, $oParams->getInt('int1')); $this->assertSame(5, $oParams->getInt('int1'));
$this->assertSame(-1, $oParams->getInt('int2')); $this->assertSame(-1, $oParams->getInt('int2'));
$this->assertSame(false, $oParams->getInt('int3')); // FIXME: should be 0 instead? $this->assertSame(0, $oParams->getInt('int3'));
$this->assertSame(0, $oParams->getInt('int4')); }
public function testGetIntWithNonNumber()
{
$this->setExpectedException(Exception::class, "Integer number expected for parameter 'int4'");
(new ParameterParser(['int4' => 'a']))->getInt('int4');
} }
public function testGetIntWithEmpytString() public function testGetIntWithEmpytString()
{ {
$this->setExpectedException(Exception::class, "Integer number expected for parameter 'int5'"); $this->setExpectedException(Exception::class, "Integer number expected for parameter 'int5'");
(new ParameterParser(['int5' => 'a']))->getInt('int5'); (new ParameterParser(['int5' => '']))->getInt('int5');
} }