harmonize interface of token analysis module

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

diff --git a/lib-php/ParameterParser.php b/lib-php/ParameterParser.php
index 98b95388ce678f7d52a2711dc18b29829414801d..a4936d376d3cb773e31b9acf5386096fc209fc1a 100644 (file)
--- a/lib-php/ParameterParser.php
+++ b/lib-php/ParameterParser.php
@@ -22,7 +22,10 @@ class ParameterParser
 
     public function getBool($sName, $bDefault = false)
     {
 
     public function getBool($sName, $bDefault = false)
     {

-        if (!isset($this->aParams[$sName]) || strlen($this->aParams[$sName]) == 0) {
+        if (!isset($this->aParams[$sName])
+            || !is_string($this->aParams[$sName])
+            || strlen($this->aParams[$sName]) == 0
+        ) {

             return $bDefault;
         }
 
             return $bDefault;
         }
 


@@ -31,7 +34,7 @@ class ParameterParser
 
     public function getInt($sName, $bDefault = false)
     {
 
     public function getInt($sName, $bDefault = false)
     {

-        if (!isset($this->aParams[$sName])) {
+        if (!isset($this->aParams[$sName]) || is_array($this->aParams[$sName])) {

             return $bDefault;
         }
 
             return $bDefault;
         }
 


@@ -44,7 +47,7 @@ class ParameterParser
 
     public function getFloat($sName, $bDefault = false)
     {
 
     public function getFloat($sName, $bDefault = false)
     {

-        if (!isset($this->aParams[$sName])) {
+        if (!isset($this->aParams[$sName]) || is_array($this->aParams[$sName])) {

             return $bDefault;
         }
 
             return $bDefault;
         }
 


@@ -57,7 +60,10 @@ class ParameterParser
 
     public function getString($sName, $bDefault = false)
     {
 
     public function getString($sName, $bDefault = false)
     {

-        if (!isset($this->aParams[$sName]) || strlen($this->aParams[$sName]) == 0) {
+        if (!isset($this->aParams[$sName])
+            || !is_string($this->aParams[$sName])
+            || strlen($this->aParams[$sName]) == 0
+        ) {

             return $bDefault;
         }
 
             return $bDefault;
         }
 


@@ -66,11 +72,14 @@ class ParameterParser
 
     public function getSet($sName, $aValues, $sDefault = false)
     {
 
     public function getSet($sName, $aValues, $sDefault = false)
     {

-        if (!isset($this->aParams[$sName]) || strlen($this->aParams[$sName]) == 0) {
+        if (!isset($this->aParams[$sName])
+            || !is_string($this->aParams[$sName])
+            || strlen($this->aParams[$sName]) == 0
+        ) {

             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));
         }