Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / ParameterParser.php

diff --git a/lib/ParameterParser.php b/lib/ParameterParser.php
index aff2612cdfefe0702ccc6d7f5d146953cb801b1d..5177a08e81eea3194a8e0eaedb15127e9db1c47b 100644 (file)
--- a/lib/ParameterParser.php
+++ b/lib/ParameterParser.php
@@ -1,15 +1,18 @@
 <?php
 
+namespace Nominatim;
+
 class ParameterParser
 {
     private $aParams;
 
-    function __construct($aParams=NULL)
+
+    public function __construct($aParams = null)
     {
-        $this->aParams = ($aParams === NULL) ? $_GET : $aParams;
+        $this->aParams = ($aParams === null) ? $_GET : $aParams;
     }
 
-    function getBool($sName, $bDefault=false)
+    public function getBool($sName, $bDefault = false)
     {
         if (!isset($this->aParams[$sName]) || strlen($this->aParams[$sName]) == 0) {
             return $bDefault;
@@ -18,7 +21,7 @@ class ParameterParser
         return (bool) $this->aParams[$sName];
     }
 
-    function getInt($sName, $bDefault=false)
+    public function getInt($sName, $bDefault = false)
     {
         if (!isset($this->aParams[$sName]) || strlen($this->aParams[$sName]) == 0) {
             return $bDefault;
@@ -31,7 +34,7 @@ class ParameterParser
         return (int) $this->aParams[$sName];
     }
 
-    function getFloat($sName, $bDefault=false)
+    public function getFloat($sName, $bDefault = false)
     {
         if (!isset($this->aParams[$sName]) || strlen($this->aParams[$sName]) == 0) {
             return $bDefault;
@@ -44,7 +47,7 @@ class ParameterParser
         return (float) $this->aParams[$sName];
     }
 
-    function getString($sName, $bDefault=false)
+    public function getString($sName, $bDefault = false)
     {
         if (!isset($this->aParams[$sName]) || strlen($this->aParams[$sName]) == 0) {
             return $bDefault;
@@ -53,7 +56,7 @@ class ParameterParser
         return $this->aParams[$sName];
     }
 
-    function getSet($sName, $aValues, $sDefault=false)
+    public function getSet($sName, $aValues, $sDefault = false)
     {
         if (!isset($this->aParams[$sName]) || strlen($this->aParams[$sName]) == 0) {
             return $sDefault;
@@ -66,7 +69,7 @@ class ParameterParser
         return $this->aParams[$sName];
     }
 
-    function getStringList($sName, $aDefault=false)
+    public function getStringList($sName, $aDefault = false)
     {
         $sValue = $this->getString($sName);
 
@@ -77,9 +80,9 @@ class ParameterParser
         return $aDefault;
     }
 
-    function getPreferredLanguages($sFallback=NULL)
+    public function getPreferredLanguages($sFallback = null)
     {
-        if ($sFallback === NULL && isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) {
+        if ($sFallback === null && isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) {
             $sFallback = $_SERVER["HTTP_ACCEPT_LANGUAGE"];
         }