Mistralys / application-utils

src/ConvertHelper/ThrowableInfo/Call.php

Indentation +59 added lines, -59 removed lines

@@ -12,50 +12,50 @@ 
     
     const TYPE_SCRIPT_START = 'start';
     
-   /**
-    * @var ConvertHelper_ThrowableInfo
-    */
+    /**
+     * @var ConvertHelper_ThrowableInfo
+     */
     protected $info;
     
-   /**
-    * @var array
-    */
+    /**
+     * @var array
+     */
     protected $trace;
     
-   /**
-    * @var VariableInfo[]
-    */
+    /**
+     * @var VariableInfo[]
+     */
     protected $args = array();
     
-   /**
-    * The source file, if any
-    * @var string
-    */
+    /**
+     * The source file, if any
+     * @var string
+     */
     protected $file = '';
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $class = '';
     
-   /**
-    * @var integer
-    */
+    /**
+     * @var integer
+     */
     protected $line = 0;
     
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $position = 1;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $function = '';
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $type = self::TYPE_SCRIPT_START;
     
     protected function __construct(ConvertHelper_ThrowableInfo $info, array $data)
@@ -82,10 +82,10 @@ 
         }
     }
     
-   /**
-    * 1-based position of the call in the calls list.
-    * @return int
-    */
+    /**
+     * 1-based position of the call in the calls list.
+     * @return int
+     */
     public function getPosition() : int
     {
         return $this->position;
@@ -96,18 +96,18 @@ 
         return $this->line;
     }
     
-   /**
-    * Whether the call had any arguments.
-    * @return bool
-    */
+    /**
+     * Whether the call had any arguments.
+     * @return bool
+     */
     public function hasArguments() : bool
     {
         return !empty($this->args);
     }
     
-   /**
-    * @return VariableInfo[]
-    */
+    /**
+     * @return VariableInfo[]
+     */
     public function getArguments()
     {
         return $this->args;
@@ -240,31 +240,31 @@ 
         return implode(', ', $tokens); 
     }
     
-   /**
-    * Retrieves the type of call: typcially a function 
-    * call, or a method call of an object. Note that the
-    * first call in a script does not have either.
-    * 
-    * @return string
-    * 
-    * @see ConvertHelper_ThrowableInfo_Call::TYPE_FUNCTION_CALL
-    * @see ConvertHelper_ThrowableInfo_Call::TYPE_METHOD_CALL
-    * @see ConvertHelper_ThrowableInfo_Call::TYPE_SCRIPT_START
-    * @see ConvertHelper_ThrowableInfo_Call::hasFunction()
-    * @see ConvertHelper_ThrowableInfo_Call::hasClass()
-    */
+    /**
+     * Retrieves the type of call: typcially a function 
+     * call, or a method call of an object. Note that the
+     * first call in a script does not have either.
+     * 
+     * @return string
+     * 
+     * @see ConvertHelper_ThrowableInfo_Call::TYPE_FUNCTION_CALL
+     * @see ConvertHelper_ThrowableInfo_Call::TYPE_METHOD_CALL
+     * @see ConvertHelper_ThrowableInfo_Call::TYPE_SCRIPT_START
+     * @see ConvertHelper_ThrowableInfo_Call::hasFunction()
+     * @see ConvertHelper_ThrowableInfo_Call::hasClass()
+     */
     public function getType() : string
     {
         return $this->type;
     }
      
-   /**
-    * Serializes the call to an array, with all
-    * necessary information. Can be used to restore
-    * the call later using {@link ConvertHelper_ThrowableInfo_Call::fromSerialized()}.
-    * 
-    * @return array
-    */
+    /**
+     * Serializes the call to an array, with all
+     * necessary information. Can be used to restore
+     * the call later using {@link ConvertHelper_ThrowableInfo_Call::fromSerialized()}.
+     * 
+     * @return array
+     */
     public function serialize() : array
     {
         $result = array(

Spacing +17 added lines, -17 removed lines

@@ -62,7 +62,7 @@ 
     {
         $this->info = $info;
         
-        if(isset($data['serialized'])) 
+        if (isset($data['serialized'])) 
         {
             $this->parseSerialized($data['serialized']);
         }
@@ -72,11 +72,11 @@ 
             $this->position = $data['position'];
         }
         
-        if($this->hasClass()) 
+        if ($this->hasClass()) 
         {
             $this->type = self::TYPE_METHOD_CALL;
         }
-        else if($this->hasFunction()) 
+        else if ($this->hasFunction()) 
         {
             $this->type = self::TYPE_FUNCTION_CALL;
         }
@@ -135,7 +135,7 @@ 
     
     public function getFileName() : string
     {
-        if($this->hasFile()) {
+        if ($this->hasFile()) {
             return basename($this->file);
         }
         
@@ -144,7 +144,7 @@ 
     
     public function getFileRelative() : string
     {
-        if($this->hasFile()) {
+        if ($this->hasFile()) {
             return FileHelper::relativizePathByDepth($this->file, $this->info->getFolderDepth());
         }
         
@@ -170,7 +170,7 @@ 
         $this->class = $data['class'];
         $this->position = $data['position'];
         
-        foreach($data['arguments'] as $arg)
+        foreach ($data['arguments'] as $arg)
         {
             $this->args[] = VariableInfo::fromSerialized($arg);
         }
@@ -178,29 +178,29 @@ 
     
     protected function parseTrace(array $trace)
     {
-        if(isset($trace['line']))
+        if (isset($trace['line']))
         {
             $this->line = intval($trace['line']);
         }
         
-        if(isset($trace['function'])) 
+        if (isset($trace['function'])) 
         {
             $this->function = $trace['function'];
         }
         
-        if(isset($trace['file']))
+        if (isset($trace['file']))
         {
             $this->file = FileHelper::normalizePath($trace['file']);
         }
         
-        if(isset($trace['class'])) 
+        if (isset($trace['class'])) 
         {
             $this->class = $trace['class'];
         }
      
-        if(isset($trace['args']) && !empty($trace['args']))
+        if (isset($trace['args']) && !empty($trace['args']))
         {
-            foreach($trace['args'] as $arg) 
+            foreach ($trace['args'] as $arg) 
             {
                 $this->args[] = parseVariable($arg);
             }
@@ -215,13 +215,13 @@ 
         
         $tokens[] = '#'.sprintf('%0'.$padLength.'d', $this->getPosition()).' ';
         
-        if($this->hasFile()) {
+        if ($this->hasFile()) {
             $tokens[] = $this->getFileRelative().':'.$this->getLine();
         }
         
-        if($this->hasClass()) {
+        if ($this->hasClass()) {
             $tokens[] = $this->getClass().'::'.$this->getFunction().'('.$this->argumentsToString().')';
-        } else if($this->hasFunction()) {
+        } else if ($this->hasFunction()) {
             $tokens[] = $this->getFunction().'('.$this->argumentsToString().')';
         }
         
@@ -232,7 +232,7 @@ 
     {
         $tokens = array();
         
-        foreach($this->args as $arg) 
+        foreach ($this->args as $arg) 
         {
             $tokens[] = $arg->toString();
         }
@@ -277,7 +277,7 @@ 
             'arguments' => array()
         );
         
-        foreach($this->args as $argument)
+        foreach ($this->args as $argument)
         {
             $result['arguments'][] = $argument->serialize();
         }

Braces +2 added lines, -4 removed lines

@@ -65,8 +65,7 @@ 
         if(isset($data['serialized'])) 
         {
             $this->parseSerialized($data['serialized']);
-        }
-        else
+        } else
         {
             $this->parseTrace($data['trace']);
             $this->position = $data['position'];
@@ -75,8 +74,7 @@ 
         if($this->hasClass()) 
         {
             $this->type = self::TYPE_METHOD_CALL;
-        }
-        else if($this->hasFunction()) 
+        } else if($this->hasFunction()) 
         {
             $this->type = self::TYPE_FUNCTION_CALL;
         }

src/ConvertHelper/StringMatch.php

Indentation +8 added lines, -8 removed lines

@@ -33,19 +33,19 @@
         $this->match = $matchedString;
     }
     
-   /**
-    * The zero-based start position of the string in the haystack.
-    * @return int
-    */
+    /**
+     * The zero-based start position of the string in the haystack.
+     * @return int
+     */
     public function getPosition() : int
     {
         return $this->position;
     }
     
-   /**
-    * The exact string that was matched, respecting the case as found in needle.
-    * @return string
-    */
+    /**
+     * The exact string that was matched, respecting the case as found in needle.
+     * @return string
+     */
     public function getMatchedString() : string
     {
         return $this->match;

src/Request.php

Braces +1 added lines, -2 removed lines

@@ -279,8 +279,7 @@
                         $entry['quality'] = (double)$params['q'];
                     }
                 }
-            }
-            else
+            } else
             {
                 $entry['type'] = $term;
             }

Indentation +97 added lines, -97 removed lines

@@ -39,9 +39,9 @@ 
      */
     protected static $instance;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $baseURL = '';
     
     public function __construct()
@@ -51,10 +51,10 @@ 
         $this->init();
     }
     
-   /**
-    * Can be extended in a subclass, to avoid
-    * redefining the constructor.
-    */
+    /**
+     * Can be extended in a subclass, to avoid
+     * redefining the constructor.
+     */
     protected function init()
     {
         
@@ -124,12 +124,12 @@ 
         return $this->buildURL($params, $dispatcher);
     }
     
-   /**
-    * Retrieves the name of the current dispatcher script / page.
-    * This is made to be extended and implemented in a subclass.
-    * 
-    * @return string
-    */
+    /**
+     * Retrieves the name of the current dispatcher script / page.
+     * This is made to be extended and implemented in a subclass.
+     * 
+     * @return string
+     */
     public function getDispatcher() : string
     {
         return '';
@@ -198,10 +198,10 @@ 
         return $url;
     }
     
-   /**
-    * Retrieves the base URL of the application.
-    * @return string
-    */
+    /**
+     * Retrieves the base URL of the application.
+     * @return string
+     */
     public function getBaseURL() : string
     {
         return $this->baseURL;
@@ -231,13 +231,13 @@ 
         return $this->knownParams[$name];
     }
     
-   /**
-    * Retrieves a previously registered parameter instance.
-    * 
-    * @param string $name
-    * @throws Request_Exception
-    * @return Request_Param
-    */
+    /**
+     * Retrieves a previously registered parameter instance.
+     * 
+     * @param string $name
+     * @throws Request_Exception
+     * @return Request_Param
+     */
     public function getRegisteredParam(string $name) : Request_Param
     {
         if(isset($this->knownParams[$name])) {
@@ -254,13 +254,13 @@ 
         );
     }
     
-   /**
-    * Checks whether a parameter with the specified name 
-    * has been registered.
-    * 
-    * @param string $name
-    * @return bool
-    */
+    /**
+     * Checks whether a parameter with the specified name 
+     * has been registered.
+     * 
+     * @param string $name
+     * @return bool
+     */
     public function hasRegisteredParam(string $name) : bool
     {
         return isset($this->knownParams[$name]);
@@ -389,14 +389,14 @@ 
         return false;
     }
     
-   /**
-    * Removes a single parameter from the request.
-    * If the parameter has been registered, also
-    * removes the registration info.
-    * 
-    * @param string $name
-    * @return Request
-    */
+    /**
+     * Removes a single parameter from the request.
+     * If the parameter has been registered, also
+     * removes the registration info.
+     * 
+     * @param string $name
+     * @return Request
+     */
     public function removeParam(string $name) : Request
     {
         if(isset($_REQUEST[$name])) {
@@ -410,12 +410,12 @@ 
         return $this;
     }
     
-   /**
-    * Removes several parameters from the request.
-    * 
-    * @param string[] $names
-    * @return Request
-    */
+    /**
+     * Removes several parameters from the request.
+     * 
+     * @param string[] $names
+     * @return Request
+     */
     public function removeParams(array $names) : Request
     {
         foreach($names as $name) {
@@ -480,18 +480,18 @@ 
         return $val;
     }
     
-   /**
-    * Treats the request parameter as a JSON string, and
-    * if it exists and contains valid JSON, returns the
-    * decoded JSON value as an array (default).
-    *
-    * @param string $name
-    * @param bool $assoc
-    * @return array|object
-    * 
-    * @see Request::getJSONAssoc()
-    * @see Request::getJSONObject()
-    */
+    /**
+     * Treats the request parameter as a JSON string, and
+     * if it exists and contains valid JSON, returns the
+     * decoded JSON value as an array (default).
+     *
+     * @param string $name
+     * @param bool $assoc
+     * @return array|object
+     * 
+     * @see Request::getJSONAssoc()
+     * @see Request::getJSONObject()
+     */
     public function getJSON(string $name, bool $assoc=true)
     {
         $value = $this->getParam($name);
@@ -516,13 +516,13 @@ 
         return new \stdClass();
     }
     
-   /**
-    * Like {@link Request::getJSON()}, but omitting the second
-    * parameter. Use this for more readable code.
-    * 
-    * @param string $name
-    * @return array
-    */
+    /**
+     * Like {@link Request::getJSON()}, but omitting the second
+     * parameter. Use this for more readable code.
+     * 
+     * @param string $name
+     * @return array
+     */
     public function getJSONAssoc(string $name) : array
     {
         $result = $this->getJSON($name);
@@ -533,13 +533,13 @@ 
         return array();
     }
     
-   /**
-    * Like {@link Request::getJSON()}, but omitting the second
-    * parameter. Use this for more readable code.
-    *
-    * @param string $name
-    * @return object
-    */
+    /**
+     * Like {@link Request::getJSON()}, but omitting the second
+     * parameter. Use this for more readable code.
+     *
+     * @param string $name
+     * @return object
+     */
     public function getJSONObject(string $name) : object
     {
         $result = $this->getJSON($name, false);
@@ -550,12 +550,12 @@ 
         return new \stdClass();
     }
     
-   /**
-    * Sends a JSON response with the correct headers.
-    *
-    * @param array|string $data
-    * @param bool $exit Whether to exit the script afterwards.
-    */
+    /**
+     * Sends a JSON response with the correct headers.
+     *
+     * @param array|string $data
+     * @param bool $exit Whether to exit the script afterwards.
+     */
     public static function sendJSON($data, bool $exit=true)
     {
         $payload = $data;
@@ -575,12 +575,12 @@ 
         }
     }
     
-   /**
-    * Sends HTML to the browser with the correct headers.
-    * 
-    * @param string $html
-    * @param bool $exit Whether to exit the script afterwards.
-    */
+    /**
+     * Sends HTML to the browser with the correct headers.
+     * 
+     * @param string $html
+     * @param bool $exit Whether to exit the script afterwards.
+     */
     public static function sendHTML(string $html, bool $exit=true)
     {
         header('Cache-Control: no-cache, must-revalidate');
@@ -595,16 +595,16 @@ 
         }
     }
     
-   /**
-    * Creates a new instance of the URL comparer, which can check 
-    * whether the specified URLs match, regardless of the order in 
-    * which the query parameters are, if any.
-    * 
-    * @param string $sourceURL
-    * @param string $targetURL
-    * @param array $limitParams Whether to limit the comparison to these specific parameter names (if present)
-    * @return Request_URLComparer
-    */
+    /**
+     * Creates a new instance of the URL comparer, which can check 
+     * whether the specified URLs match, regardless of the order in 
+     * which the query parameters are, if any.
+     * 
+     * @param string $sourceURL
+     * @param string $targetURL
+     * @param array $limitParams Whether to limit the comparison to these specific parameter names (if present)
+     * @return Request_URLComparer
+     */
     public function createURLComparer(string $sourceURL, string $targetURL, array $limitParams=array()) : Request_URLComparer
     {
         $comparer = new Request_URLComparer($this, $sourceURL, $targetURL);
@@ -613,10 +613,10 @@ 
         return $comparer;
     }
     
-   /**
-    * Retrieves the full URL that was used to access the current page.
-    * @return string
-    */
+    /**
+     * Retrieves the full URL that was used to access the current page.
+     * @return string
+     */
     public function getCurrentURL() : string
     {
         return $_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];

Spacing +36 added lines, -36 removed lines

@@ -90,11 +90,11 @@ 
     public function getParam($name, $default = null)
     {
         $value = $default;
-        if(isset($_REQUEST[$name])) {
+        if (isset($_REQUEST[$name])) {
             $value = $_REQUEST[$name];
         }
         
-        if(isset($this->knownParams[$name])) {
+        if (isset($this->knownParams[$name])) {
             $value = $this->knownParams[$name]->validate($value);
         }
         
@@ -137,8 +137,8 @@ 
     
     public function getRefreshParams($params = array(), $exclude = array())
     {
-        if(empty($params)) { $params = array(); }
-        if(empty($exclude)) { $exclude = array(); }
+        if (empty($params)) { $params = array(); }
+        if (empty($exclude)) { $exclude = array(); }
         
         $vars = $_REQUEST;
 
@@ -158,8 +158,8 @@ 
         // remove the quickform form variable if present, to 
         // avoid redirect loops when using the refresh URL in
         // a page in which a form has been submitted.
-        foreach($names as $name) {
-            if(strstr($name, '_qf__')) {
+        foreach ($names as $name) {
+            if (strstr($name, '_qf__')) {
                 unset($vars[$name]);
                 break;
             }
@@ -186,13 +186,13 @@ 
      * @param string $dispatcher Relative path to script to use for the URL. Append trailing slash if needed.
      * @return string
      */
-    public function buildURL($params = array(), string $dispatcher='')
+    public function buildURL($params = array(), string $dispatcher = '')
     {
-        $url = rtrim($this->getBaseURL(), '/') . '/' . $dispatcher;
+        $url = rtrim($this->getBaseURL(), '/').'/'.$dispatcher;
         
         // append any leftover parameters to the end of the URL
         if (!empty($params)) {
-            $url .= '?' . http_build_query($params, null, '&');
+            $url .= '?'.http_build_query($params, null, '&');
         }
         
         return $url;
@@ -223,7 +223,7 @@ 
      */
     public function registerParam($name)
     {
-        if(!isset($this->knownParams[$name])) {
+        if (!isset($this->knownParams[$name])) {
             $param = new Request_Param($this, $name);
             $this->knownParams[$name] = $param;
         }
@@ -240,7 +240,7 @@ 
     */
     public function getRegisteredParam(string $name) : Request_Param
     {
-        if(isset($this->knownParams[$name])) {
+        if (isset($this->knownParams[$name])) {
             return $this->knownParams[$name];
         }
         
@@ -307,12 +307,12 @@ 
             {
                 $entry['type'] = $matches[1];
                 
-                if(isset($matches[2]) && !empty($matches[2])) 
+                if (isset($matches[2]) && !empty($matches[2])) 
                 {
                     $params = ConvertHelper::parseQueryString($matches[2]);
                     $entry['params'] = $params;
                      
-                    if(isset($params['q'])) {
+                    if (isset($params['q'])) {
                         $entry['quality'] = (double)$params['q'];
                     }
                 }
@@ -365,7 +365,7 @@ 
     {
         $_REQUEST[$name] = $value;
         
-        if(isset($this->knownParams[$name])) {
+        if (isset($this->knownParams[$name])) {
             unset($this->knownParams[$name]);
         }
         
@@ -399,11 +399,11 @@ 
     */
     public function removeParam(string $name) : Request
     {
-        if(isset($_REQUEST[$name])) {
+        if (isset($_REQUEST[$name])) {
             unset($_REQUEST[$name]);
         }
         
-        if(isset($this->knownParams[$name])) {
+        if (isset($this->knownParams[$name])) {
             unset($this->knownParams[$name]);
         }
         
@@ -418,7 +418,7 @@ 
     */
     public function removeParams(array $names) : Request
     {
-        foreach($names as $name) {
+        foreach ($names as $name) {
             $this->removeParam($name);
         }
         
@@ -434,10 +434,10 @@ 
      * @param string $name
      * @return bool
      */
-    public function getBool($name, $default=false)
+    public function getBool($name, $default = false)
     {
         $value = $this->getParam($name, $default);
-        if(ConvertHelper::isBoolean($value)) {
+        if (ConvertHelper::isBoolean($value)) {
             return ConvertHelper::string2bool($value);
         }
         
@@ -446,9 +446,9 @@ 
     
     public function validate()
     {
-        foreach($this->knownParams as $param) {
+        foreach ($this->knownParams as $param) {
             $name = $param->getName();
-            if($param->isRequired() && !$this->hasParam($name)) {
+            if ($param->isRequired() && !$this->hasParam($name)) {
                 throw new Request_Exception(
                     'Missing request parameter '.$name,
                     sprintf(
@@ -470,10 +470,10 @@ 
      * @param mixed $default
      * @return string
      */
-    public function getFilteredParam($name, $default=null)
+    public function getFilteredParam($name, $default = null)
     {
         $val = $this->getParam($name, $default);
-        if(is_string($val)) {
+        if (is_string($val)) {
             $val = htmlspecialchars(trim(strip_tags($val)), ENT_QUOTES, 'UTF-8');
         }
         
@@ -492,24 +492,24 @@ 
     * @see Request::getJSONAssoc()
     * @see Request::getJSONObject()
     */
-    public function getJSON(string $name, bool $assoc=true)
+    public function getJSON(string $name, bool $assoc = true)
     {
         $value = $this->getParam($name);
         
-        if(!empty($value) && is_string($value)) 
+        if (!empty($value) && is_string($value)) 
         {
             $data = json_decode($value, $assoc);
             
-            if($assoc && is_array($data)) {
+            if ($assoc && is_array($data)) {
                 return $data;
             }
             
-            if(is_object($data)) {
+            if (is_object($data)) {
                 return $data;
             }
         }
         
-        if($assoc) {
+        if ($assoc) {
             return array();
         }
         
@@ -526,7 +526,7 @@ 
     public function getJSONAssoc(string $name) : array
     {
         $result = $this->getJSON($name);
-        if(is_array($result)) {
+        if (is_array($result)) {
             return $result;
         }
         
@@ -543,7 +543,7 @@ 
     public function getJSONObject(string $name) : object
     {
         $result = $this->getJSON($name, false);
-        if(is_object($result)) {
+        if (is_object($result)) {
             return $result;
         }
         
@@ -556,10 +556,10 @@ 
     * @param array|string $data
     * @param bool $exit Whether to exit the script afterwards.
     */
-    public static function sendJSON($data, bool $exit=true)
+    public static function sendJSON($data, bool $exit = true)
     {
         $payload = $data;
-        if(!is_string($payload)) {
+        if (!is_string($payload)) {
             $payload = json_encode($payload);
         }
         
@@ -569,7 +569,7 @@ 
         
         echo $payload;
         
-        if($exit) 
+        if ($exit) 
         {
             exit;
         }
@@ -581,7 +581,7 @@ 
     * @param string $html
     * @param bool $exit Whether to exit the script afterwards.
     */
-    public static function sendHTML(string $html, bool $exit=true)
+    public static function sendHTML(string $html, bool $exit = true)
     {
         header('Cache-Control: no-cache, must-revalidate');
         header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
@@ -589,7 +589,7 @@ 
         
         echo $html;
         
-        if($exit)
+        if ($exit)
         {
             exit;
         }
@@ -605,7 +605,7 @@ 
     * @param array $limitParams Whether to limit the comparison to these specific parameter names (if present)
     * @return Request_URLComparer
     */
-    public function createURLComparer(string $sourceURL, string $targetURL, array $limitParams=array()) : Request_URLComparer
+    public function createURLComparer(string $sourceURL, string $targetURL, array $limitParams = array()) : Request_URLComparer
     {
         $comparer = new Request_URLComparer($this, $sourceURL, $targetURL);
         $comparer->addLimitParams($limitParams);

src/XMLHelper/SimpleXML/Error.php

Indentation +3 added lines, -3 removed lines

@@ -6,9 +6,9 @@
 {
     protected $xml;
     
-   /**
-    * @var  \LibXMLError
-    */
+    /**
+     * @var  \LibXMLError
+     */
     protected $nativeError;
     
     public function __construct(XMLHelper_SimpleXML $xml, \LibXMLError $nativeError)

src/XMLHelper/Converter.php

Indentation +41 added lines, -41 removed lines

@@ -41,14 +41,14 @@ 
 {
     const ERROR_FAILED_CONVERTING_TO_JSON = 37901;
     
-   /**
-    * @var \SimpleXMLElement
-    */
+    /**
+     * @var \SimpleXMLElement
+     */
     protected $xml;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $json;
     
     protected function __construct(\SimpleXMLElement $element)
@@ -56,24 +56,24 @@ 
         $this->xml = $element;
     }
     
-   /**
-    * Factory method: creates a converter from an XML file on disk.
-    * 
-    * @param string $path
-    * @return \AppUtils\XMLHelper_Converter
-    */
+    /**
+     * Factory method: creates a converter from an XML file on disk.
+     * 
+     * @param string $path
+     * @return \AppUtils\XMLHelper_Converter
+     */
     public static function fromFile(string $path)
     {
         $xmlString = file_get_contents($path);
         return self::fromString($xmlString);
     }
  
-   /**
-    * Factory method: creates a converter from an XML string.
-    * 
-    * @param string $xmlString
-    * @return \AppUtils\XMLHelper_Converter
-    */
+    /**
+     * Factory method: creates a converter from an XML string.
+     * 
+     * @param string $xmlString
+     * @return \AppUtils\XMLHelper_Converter
+     */
     public static function fromString(string $xmlString)
     {
         $element = new \SimpleXMLElement($xmlString);
@@ -81,36 +81,36 @@ 
         return self::fromElement($element);
     }
     
-   /**
-    * Factory method: creates a converter from an existing SimpleXMLElement instance.
-    * 
-    * @param \SimpleXMLElement $element
-    * @return \AppUtils\XMLHelper_Converter
-    */
+    /**
+     * Factory method: creates a converter from an existing SimpleXMLElement instance.
+     * 
+     * @param \SimpleXMLElement $element
+     * @return \AppUtils\XMLHelper_Converter
+     */
     public static function fromElement(\SimpleXMLElement $element)
     {
         $obj = new XMLHelper_Converter($element);
         return $obj;
     }
 
-   /**
-    * Factory method: creates a converter from an existing SimpleXMLElement instance.
-    *
-    * @param \DOMElement $element
-    * @return \AppUtils\XMLHelper_Converter
-    */
+    /**
+     * Factory method: creates a converter from an existing SimpleXMLElement instance.
+     *
+     * @param \DOMElement $element
+     * @return \AppUtils\XMLHelper_Converter
+     */
     public static function fromDOMElement(\DOMElement $element)
     {
         $obj = new XMLHelper_Converter(simplexml_import_dom($element));
         return $obj;
     }
     
-   /**
-    * Converts the XML to JSON.
-    * 
-    * @throws XMLHelper_Exception
-    * @return string
-    */
+    /**
+     * Converts the XML to JSON.
+     * 
+     * @throws XMLHelper_Exception
+     * @return string
+     */
     public function toJSON() : string
     {
         if(isset($this->json)) {
@@ -138,11 +138,11 @@ 
         );
     }
     
-   /**
-    * Converts the XML to an associative array.
-    * @return array
-    * @throws XMLHelper_Exception
-    */
+    /**
+     * Converts the XML to an associative array.
+     * @return array
+     * @throws XMLHelper_Exception
+     */
     public function toArray() : array 
     {
         $json = $this->toJSON();

Spacing +2 added lines, -2 removed lines

@@ -113,7 +113,7 @@ 
     */
     public function toJSON() : string
     {
-        if(isset($this->json)) {
+        if (isset($this->json)) {
             return $this->json;
         }
         
@@ -123,7 +123,7 @@ 
         
         unset($this->xml);
         
-        if($this->json !== false) {
+        if ($this->json !== false) {
             return $this->json;
         }
         

src/XMLHelper/SimpleXML.php

Indentation +16 added lines, -16 removed lines

@@ -11,27 +11,27 @@
     
     protected $errors = array();
     
-   /**
-    * Creates a simplexml instance from an XML string.
-    *
-    * NOTE: returns false in case of a fatal error.
-    *
-    * @param string $string
-    * @return \SimpleXMLElement|bool
-    */
+    /**
+     * Creates a simplexml instance from an XML string.
+     *
+     * NOTE: returns false in case of a fatal error.
+     *
+     * @param string $string
+     * @return \SimpleXMLElement|bool
+     */
     public function loadString($string)
     {
         return $this->load('string', $string);
     }
     
-   /**
-    * Creates a simplexml instance from an XML file.
-    * 
-    * NOTE: returns false in case of a fatal error.
-    * 
-    * @param string $file
-    * @return \SimpleXMLElement|bool
-    */
+    /**
+     * Creates a simplexml instance from an XML file.
+     * 
+     * NOTE: returns false in case of a fatal error.
+     * 
+     * @param string $file
+     * @return \SimpleXMLElement|bool
+     */
     public function loadFile($file)
     {
         return $this->load('file', $file);

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
         // add any errors that were triggered, using the
         // error wrappers.
         $errors = libxml_get_errors();
-        foreach($errors as $error) {
+        foreach ($errors as $error) {
             $this->errors[] = new XMLHelper_SimpleXML_Error($this, $error);
         }
         

src/Request/URLComparer.php

Spacing +15 added lines, -15 removed lines

@@ -31,7 +31,7 @@ 
     
     public function addLimitParam(string $name) : Request_URLComparer
     {
-        if(!in_array($name, $this->limitParams)) {
+        if (!in_array($name, $this->limitParams)) {
             $this->limitParams[] = $name;
         }
         
@@ -40,14 +40,14 @@ 
     
     public function addLimitParams(array $names) : Request_URLComparer
     {
-        foreach($names as $name) {
+        foreach ($names as $name) {
             $this->addLimitParam($name);
         }
         
         return $this;
     }
     
-    public function setIgnoreFragment(bool $ignore=true) : Request_URLComparer
+    public function setIgnoreFragment(bool $ignore = true) : Request_URLComparer
     {
         $this->ignoreFragment = $ignore;
         return $this;
@@ -55,7 +55,7 @@ 
     
     protected function init()
     {
-        if(isset($this->isMatch)) {
+        if (isset($this->isMatch)) {
             return;
         }
         
@@ -77,25 +77,25 @@ 
             'query' 
         );
         
-        if(!$this->ignoreFragment) {
+        if (!$this->ignoreFragment) {
             $keys[] = 'fragment';
         }
         
-        foreach($keys as $key)
+        foreach ($keys as $key)
         {
             $sVal = '';
             $tVal = '';
             
-            if(isset($sInfo[$key])) { $sVal = $sInfo[$key]; }
-            if(isset($tInfo[$key])) { $tVal = $tInfo[$key]; }
+            if (isset($sInfo[$key])) { $sVal = $sInfo[$key]; }
+            if (isset($tInfo[$key])) { $tVal = $tInfo[$key]; }
             
             $filter = 'filter_'.$key;
-            if(method_exists($this, $filter)) {
+            if (method_exists($this, $filter)) {
                 $sVal = $this->$filter($sVal);
                 $tVal = $this->$filter($tVal);
             }
             
-            if($sVal !== $tVal) {
+            if ($sVal !== $tVal) {
                 return false;
             }
         }
@@ -106,7 +106,7 @@ 
     protected function filter_path(string $path) : string
     {
         // fix double slashes in URLs
-        while(stristr($path, '//')) {
+        while (stristr($path, '//')) {
             $path = str_replace('//', '/', $path);
         }
         
@@ -115,7 +115,7 @@ 
     
     protected function filter_query(string $query) : string
     {
-        if(empty($query)) {
+        if (empty($query)) {
             return '';
         }
         
@@ -123,13 +123,13 @@ 
         
         ksort($params);
         
-        if(!empty($this->limitParams))
+        if (!empty($this->limitParams))
         {
             $keep = array();
             
-            foreach($this->limitParams as $name)
+            foreach ($this->limitParams as $name)
             {
-                if(isset($params[$name])) {
+                if (isset($params[$name])) {
                     $keep[$name] = $params[$name];
                 }
             }

src/Request/Param.php

Braces +1 added lines, -2 removed lines

@@ -711,8 +711,7 @@
             if(is_object(json_decode($value))) {
                return $value; 
             }
-        } 
-        else 
+        } else 
         {
             if(is_array(json_decode($value, true))) {
                 return $value;

Indentation +135 added lines, -135 removed lines

@@ -111,18 +111,18 @@ 
         }
     }
     
-   /**
-    * Adds a callback as a validation method. The callback gets the
-    * value to validate as first parameter, and any additional 
-    * parameters passed here get appended to that.
-    * 
-    * The callback must return boolean true or false depending on
-    * whether the value is valid.
-    * 
-    * @param mixed $callback
-    * @param array $args
-    * @return Request_Param
-    */
+    /**
+     * Adds a callback as a validation method. The callback gets the
+     * value to validate as first parameter, and any additional 
+     * parameters passed here get appended to that.
+     * 
+     * The callback must return boolean true or false depending on
+     * whether the value is valid.
+     * 
+     * @param mixed $callback
+     * @param array $args
+     * @return Request_Param
+     */
     public function setCallback($callback, $args=array())
     {
         if(!is_callable($callback)) {
@@ -264,13 +264,13 @@ 
     
     protected $valueType = self::VALUE_TYPE_STRING;
 
-   /**
-    * Sets the variable to contain a comma-separated list of integer IDs.
-    * Example: <code>145,248,4556</code>. A single ID is also allowed, e.g.
-    * <code>145</code>.
-    * 
-    * @return Request_Param
-    */
+    /**
+     * Sets the variable to contain a comma-separated list of integer IDs.
+     * Example: <code>145,248,4556</code>. A single ID is also allowed, e.g.
+     * <code>145</code>.
+     * 
+     * @return Request_Param
+     */
     public function setIDList()
     {
         $this->valueType = self::VALUE_TYPE_ID_LIST;
@@ -279,13 +279,13 @@ 
         return $this;
     }
     
-   /**
-    * Sets the variable to be an alias, as defined by the
-    * {@link RegexHelper::REGEX_ALIAS} regular expression.
-    * 
-    * @return Request_Param
-    * @see RegexHelper::REGEX_ALIAS
-    */
+    /**
+     * Sets the variable to be an alias, as defined by the
+     * {@link RegexHelper::REGEX_ALIAS} regular expression.
+     * 
+     * @return Request_Param
+     * @see RegexHelper::REGEX_ALIAS
+     */
     public function setAlias()
     {
         return $this->setRegex(RegexHelper::REGEX_ALIAS);
@@ -326,12 +326,12 @@ 
         return $this->setValidation(self::VALIDATION_TYPE_ALPHA);
     }
     
-   /**
-    * Sets the parameter value as a string containing lowercase
-    * and/or uppercase letters, as well as numbers.
-    * 
-    * @return Request_Param
-    */
+    /**
+     * Sets the parameter value as a string containing lowercase
+     * and/or uppercase letters, as well as numbers.
+     * 
+     * @return Request_Param
+     */
     public function setAlnum()
     {
         return $this->setValidation(self::VALIDATION_TYPE_ALNUM);   
@@ -359,17 +359,17 @@ 
         return $this->setValidation(self::VALIDATION_TYPE_ENUM, $args);
     }
     
-   /**
-    * Only available for array values: the parameter must be
-    * an array value, and the array may only contain values 
-    * specified in the values array.
-    * 
-    * Submitted values that are not in the allowed list of
-    * values are stripped from the value.
-    *  
-    * @param array $values List of allowed values
-    * @return \AppUtils\Request_Param
-    */
+    /**
+     * Only available for array values: the parameter must be
+     * an array value, and the array may only contain values 
+     * specified in the values array.
+     * 
+     * Submitted values that are not in the allowed list of
+     * values are stripped from the value.
+     *  
+     * @param array $values List of allowed values
+     * @return \AppUtils\Request_Param
+     */
     public function setValuesList(array $values)
     {
         $this->setArray();
@@ -382,39 +382,39 @@ 
         return $this->setValidation(self::VALIDATION_TYPE_ARRAY);
     }
     
-   /**
-    * Specifies that a JSON-encoded string is expected.
-    * 
-    * NOTE: Numbers or quoted strings are technically valid
-    * JSON, but are not accepted, because it is assumed
-    * at least an array or object are expected.
-    * 
-    * @return \AppUtils\Request_Param
-    */
+    /**
+     * Specifies that a JSON-encoded string is expected.
+     * 
+     * NOTE: Numbers or quoted strings are technically valid
+     * JSON, but are not accepted, because it is assumed
+     * at least an array or object are expected.
+     * 
+     * @return \AppUtils\Request_Param
+     */
     public function setJSON() : Request_Param
     {
         return $this->setValidation(self::VALIDATION_TYPE_JSON, array('arrays' => true));
     }
     
-   /**
-    * Like {@link Request_Param::setJSON()}, but accepts
-    * only JSON objects. Arrays will not be accepted.
-    * 
-    * @return \AppUtils\Request_Param
-    */
+    /**
+     * Like {@link Request_Param::setJSON()}, but accepts
+     * only JSON objects. Arrays will not be accepted.
+     * 
+     * @return \AppUtils\Request_Param
+     */
     public function setJSONObject() : Request_Param
     {
         return $this->setValidation(self::VALIDATION_TYPE_JSON, array('arrays' => false));
     }
     
-   /**
-    * The parameter is a string boolean representation. This means
-    * it can be any of the following: "yes", "true", "no", "false".
-    * The value is automatically converted to a boolean when retrieving
-    * the parameter.
-    * 
-    * @return Request_Param
-    */
+    /**
+     * The parameter is a string boolean representation. This means
+     * it can be any of the following: "yes", "true", "no", "false".
+     * The value is automatically converted to a boolean when retrieving
+     * the parameter.
+     * 
+     * @return Request_Param
+     */
     public function setBoolean() : Request_Param
     {
         $this->addCallbackFilter(array($this, 'applyFilter_boolean'));
@@ -478,15 +478,15 @@ 
         return $keep;
     }
     
-   /**
-    * Validates the request parameter as an MD5 string,
-    * so that only values resembling md5 values are accepted.
-    * 
-    * NOTE: This can only guarantee the format, not whether
-    * it is an actual valid hash of something.
-    * 
-    * @return \AppUtils\Request_Param
-    */
+    /**
+     * Validates the request parameter as an MD5 string,
+     * so that only values resembling md5 values are accepted.
+     * 
+     * NOTE: This can only guarantee the format, not whether
+     * it is an actual valid hash of something.
+     * 
+     * @return \AppUtils\Request_Param
+     */
     public function setMD5() : Request_Param
     {
         return $this->setRegex(RegexHelper::REGEX_MD5);
@@ -528,14 +528,14 @@ 
         return $this;
     }
     
-   /**
-    * Retrieves the value of the request parameter,
-    * applying all filters (if any) and validation
-    * (if any).
-    * 
-    * @param mixed $default
-    * @return mixed
-    */
+    /**
+     * Retrieves the value of the request parameter,
+     * applying all filters (if any) and validation
+     * (if any).
+     * 
+     * @param mixed $default
+     * @return mixed
+     */
     public function get($default=null)
     {
         $value = $this->request->getParam($this->paramName);
@@ -565,12 +565,12 @@ 
         return null;
     }
     
-   /**
-    * Validates the syntax of an URL, but not its actual validity. 
-    * 
-    * @param mixed $value
-    * @return string
-    */
+    /**
+     * Validates the syntax of an URL, but not its actual validity. 
+     * 
+     * @param mixed $value
+     * @return string
+     */
     protected function validate_url($value) : string
     {
         if(!is_string($value)) {
@@ -710,10 +710,10 @@ 
         return null;
     }
     
-   /**
-    * Makes sure that the value is a JSON-encoded string.
-    * @param mixed $value
-    */
+    /**
+     * Makes sure that the value is a JSON-encoded string.
+     * @param mixed $value
+     */
     protected function validate_json($value) : string
     {
         if(!is_string($value)) {
@@ -730,7 +730,7 @@ 
         if($this->validationParams['arrays'] === false) 
         {
             if(is_object(json_decode($value))) {
-               return $value; 
+                return $value; 
             }
         } 
         else 
@@ -810,12 +810,12 @@ 
         return $this;
     }
     
-   /**
-    * Adds a filter that trims whitespace from the request
-    * parameter using the PHP <code>trim</code> function.
-    * 
-    * @return \AppUtils\Request_Param
-    */
+    /**
+     * Adds a filter that trims whitespace from the request
+     * parameter using the PHP <code>trim</code> function.
+     * 
+     * @return \AppUtils\Request_Param
+     */
     public function addFilterTrim() : Request_Param
     {
         // to guarantee we only work with strings
@@ -824,13 +824,13 @@ 
         return $this->addCallbackFilter('trim');
     }
 
-   /**
-    * Converts the value to a string, even if it is not
-    * a string value. Complex types like arrays and objects
-    * are converted to an empty string.
-    * 
-    * @return \AppUtils\Request_Param
-    */
+    /**
+     * Converts the value to a string, even if it is not
+     * a string value. Complex types like arrays and objects
+     * are converted to an empty string.
+     * 
+     * @return \AppUtils\Request_Param
+     */
     public function addStringFilter() : Request_Param
     {
         return $this->addCallbackFilter(array($this, 'applyFilter_string'));
@@ -880,12 +880,12 @@ 
         return $this->addCallbackFilter('strip_tags', array($allowedTags));
     }
     
-   /**
-    * Adds a filter that strips all whitespace from the
-    * request parameter, from spaces to tabs and newlines.
-    * 
-    * @return \AppUtils\Request_Param
-    */
+    /**
+     * Adds a filter that strips all whitespace from the
+     * request parameter, from spaces to tabs and newlines.
+     * 
+     * @return \AppUtils\Request_Param
+     */
     public function addStripWhitespaceFilter() : Request_Param
     {
         // to ensure we only work with strings.
@@ -894,14 +894,14 @@ 
         return $this->addCallbackFilter(array($this, 'applyFilter_stripWhitespace'));
     }   
     
-   /**
-    * Adds a filter that transforms comma separated values
-    * into an array of values.
-    * 
-    * @param bool $trimEntries Trim whitespace from each entry?
-    * @param bool $stripEmptyEntries Remove empty entries from the array?
-    * @return \AppUtils\Request_Param
-    */
+    /**
+     * Adds a filter that transforms comma separated values
+     * into an array of values.
+     * 
+     * @param bool $trimEntries Trim whitespace from each entry?
+     * @param bool $stripEmptyEntries Remove empty entries from the array?
+     * @return \AppUtils\Request_Param
+     */
     public function addCommaSeparatedFilter(bool $trimEntries=true, bool $stripEmptyEntries=true) : Request_Param
     {
         $this->setArray();
@@ -915,12 +915,12 @@ 
         );
     }
     
-   /**
-    * Adds a filter that encodes all HTML special characters
-    * using the PHP <code>htmlspecialchars</code> function.
-    * 
-    * @return \AppUtils\Request_Param
-    */
+    /**
+     * Adds a filter that encodes all HTML special characters
+     * using the PHP <code>htmlspecialchars</code> function.
+     * 
+     * @return \AppUtils\Request_Param
+     */
     public function addHTMLSpecialcharsFilter() : Request_Param
     {
         return $this->addCallbackFilter('htmlspecialchars', array(ENT_QUOTES, 'UTF-8'));
@@ -933,14 +933,14 @@ 
     
     protected $required = false;
     
-   /**
-    * Marks this request parameter as required. To use this feature,
-    * you have to call the request's {@link Request::validate()}
-    * method.
-    * 
-    * @return Request_Param
-    * @see Request::validate()
-    */
+    /**
+     * Marks this request parameter as required. To use this feature,
+     * you have to call the request's {@link Request::validate()}
+     * method.
+     * 
+     * @return Request_Param
+     * @see Request::validate()
+     */
     public function makeRequired() : Request_Param
     {
         $this->required = true;

Spacing +38 added lines, -38 removed lines

@@ -123,9 +123,9 @@ 
     * @param array $args
     * @return Request_Param
     */
-    public function setCallback($callback, $args=array())
+    public function setCallback($callback, $args = array())
     {
-        if(!is_callable($callback)) {
+        if (!is_callable($callback)) {
             throw new Request_Exception(
                 'Not a valid callback',
                 'The specified callback is not a valid callable entity.',
@@ -148,7 +148,7 @@ 
         array_unshift($args, $value);
         
         $result = call_user_func_array($this->validationParams['callback'], $args);
-        if($result !== false) {
+        if ($result !== false) {
             return $value;
         }
         
@@ -175,13 +175,13 @@ 
         
         // go through all enqueued validations in turn, each time
         // replacing the value with the adjusted, validated value.
-        foreach($this->validations as $validateDef) 
+        foreach ($this->validations as $validateDef) 
         {
             $this->validationType = $validateDef['type'];
             $this->validationParams = $validateDef['params'];
             
             // and now, see if we have to validate the value as well
-            $method = 'validate_' . $this->validationType;
+            $method = 'validate_'.$this->validationType;
             if (!method_exists($this, $method)) {
                 throw new Request_Exception(
                     'Unknown validation type.',
@@ -195,19 +195,19 @@ 
                 );
             }
          
-            if($this->valueType === self::VALUE_TYPE_ID_LIST) 
+            if ($this->valueType === self::VALUE_TYPE_ID_LIST) 
             {
-                if(!is_array($value)) {
+                if (!is_array($value)) {
                     $value = explode(',', $value);
                 }
                 
                 $keep = array();
-                foreach($value as $subval) 
+                foreach ($value as $subval) 
                 {
                     $subval = trim($subval);
                     $subval = $this->$method($subval);
                     
-                    if($subval !== null) {
+                    if ($subval !== null) {
                         $keep[] = intval($subval);
                     }
                 }
@@ -423,7 +423,7 @@ 
     
     protected function applyFilter_boolean($value)
     {
-        if($value == 'yes' || $value == 'true') {
+        if ($value == 'yes' || $value == 'true') {
             return true;
         }
         
@@ -437,7 +437,7 @@ 
     
     protected function applyFilter_string($value)
     {
-        if(!is_scalar($value)) {
+        if (!is_scalar($value)) {
             return '';
         }
         
@@ -446,29 +446,29 @@ 
     
     protected function applyFilter_commaSeparated($value, bool $trimEntries, bool $stripEmptyEntries)
     {
-        if(is_array($value)) {
+        if (is_array($value)) {
             return $value;
         }
         
-        if($value === '' || $value === null || !is_string($value)) {
+        if ($value === '' || $value === null || !is_string($value)) {
             return array();
         }
         
         $result = explode(',', $value);
         
-        if(!$trimEntries && !$stripEmptyEntries) {
+        if (!$trimEntries && !$stripEmptyEntries) {
             return $result;
         }
         
         $keep = array();
         
-        foreach($result as $entry) 
+        foreach ($result as $entry) 
         {
-            if($trimEntries === true) {
+            if ($trimEntries === true) {
                 $entry = trim($entry);
             }
             
-            if($stripEmptyEntries === true && $entry === '') {
+            if ($stripEmptyEntries === true && $entry === '') {
                 continue;
             }
             
@@ -536,10 +536,10 @@ 
     * @param mixed $default
     * @return mixed
     */
-    public function get($default=null)
+    public function get($default = null)
     {
         $value = $this->request->getParam($this->paramName);
-        if($value !== null && $value !== '') {
+        if ($value !== null && $value !== '') {
             return $value;
         }
 
@@ -558,7 +558,7 @@ 
      */
     protected function validate_integer($value) : ?int
     {
-        if(ConvertHelper::isInteger($value)) {
+        if (ConvertHelper::isInteger($value)) {
             return intval($value);
         }
         
@@ -573,12 +573,12 @@ 
     */
     protected function validate_url($value) : string
     {
-        if(!is_string($value)) {
+        if (!is_string($value)) {
             return '';
         }
         
         $info = parse_url($value);
-        if(isset($info['host'])) {
+        if (isset($info['host'])) {
             return $value;
         }
         
@@ -594,7 +594,7 @@ 
      */
     protected function validate_numeric($value) : ?float
     {
-        if(is_numeric($value)) {
+        if (is_numeric($value)) {
             return $value * 1;
         }
 
@@ -610,7 +610,7 @@ 
      */
     protected function validate_regex($value) : ?string
     {
-        if(!is_scalar($value)) {
+        if (!is_scalar($value)) {
             return null;
         }
         
@@ -618,13 +618,13 @@ 
         // is a boolan, which is converted to an integer when
         // converted to string, which in turn can be validated
         // with a regex.
-        if(is_bool($value)) {
+        if (is_bool($value)) {
             return null;
         }
         
         $value = (string)$value;
         
-        if(preg_match($this->validationParams['regex'], $value)) {
+        if (preg_match($this->validationParams['regex'], $value)) {
             return $value;
         }
 
@@ -640,11 +640,11 @@ 
      */
     protected function validate_alpha($value)
     {
-        if(!is_scalar($value)) {
+        if (!is_scalar($value)) {
             return null;
         }
         
-        if(preg_match('/\A[a-zA-Z]+\z/', $value)) {
+        if (preg_match('/\A[a-zA-Z]+\z/', $value)) {
             return $value;
         }
 
@@ -653,13 +653,13 @@ 
     
     protected function validate_valueslist($value)
     {
-        if(!is_array($value)) {
+        if (!is_array($value)) {
             return array();
         }
         
         $keep = array();
-        foreach($value as $item) {
-            if(in_array($item, $this->validationParams)) {
+        foreach ($value as $item) {
+            if (in_array($item, $this->validationParams)) {
                 $keep[] = $item;
             }
         }
@@ -716,26 +716,26 @@ 
     */
     protected function validate_json($value) : string
     {
-        if(!is_string($value)) {
+        if (!is_string($value)) {
             return '';
         }
         
         $value = trim($value);
         
-        if(empty($value)) {
+        if (empty($value)) {
             return '';
         }
         
         // strictly validate for objects?
-        if($this->validationParams['arrays'] === false) 
+        if ($this->validationParams['arrays'] === false) 
         {
-            if(is_object(json_decode($value))) {
+            if (is_object(json_decode($value))) {
                return $value; 
             }
         } 
         else 
         {
-            if(is_array(json_decode($value, true))) {
+            if (is_array(json_decode($value, true))) {
                 return $value;
             }
         }
@@ -755,7 +755,7 @@ 
     {
         $total = count($this->filters);
         for ($i = 0; $i < $total; $i++) {
-            $method = 'applyFilter_' . $this->filters[$i]['type'];
+            $method = 'applyFilter_'.$this->filters[$i]['type'];
             $value = $this->$method($value, $this->filters[$i]['params']);
         }
 
@@ -902,7 +902,7 @@ 
     * @param bool $stripEmptyEntries Remove empty entries from the array?
     * @return \AppUtils\Request_Param
     */
-    public function addCommaSeparatedFilter(bool $trimEntries=true, bool $stripEmptyEntries=true) : Request_Param
+    public function addCommaSeparatedFilter(bool $trimEntries = true, bool $stripEmptyEntries = true) : Request_Param
     {
         $this->setArray();
         

src/RegexHelper.php

Indentation +12 added lines, -12 removed lines

@@ -42,10 +42,10 @@ 
     
     const REGEX_MD5 = '/^[a-f0-9]{32}$/i';
 
-   /**
-    * @var string
-    * @see https://en.wikipedia.org/wiki/Email_address#Local-part
-    */
+    /**
+     * @var string
+     * @see https://en.wikipedia.org/wiki/Email_address#Local-part
+     */
     const REGEX_EMAIL = '/[a-z0-9!#$%&\'*+\/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&\'*+\/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?/i';
     
     const REGEX_PHONE = '/\A[+0-9][0-9 +\-()]+\z/m';
@@ -97,13 +97,13 @@ 
      */
     const REGEX_IS_HTML = '%<{0,1}[a-z\/][\s\S]*>|<[a-z\/][\s\S]*>{0,1}%i';
     
-   /**
-    * Hexadecimal color codes. Allows the following formats:
-    * 
-    * FFFFFF
-    * FFF
-    * 
-    * @var string
-    */
+    /**
+     * Hexadecimal color codes. Allows the following formats:
+     * 
+     * FFFFFF
+     * FFF
+     * 
+     * @var string
+     */
     const REGEX_HEX_COLOR_CODE = '/\A(?:[0-9a-fA-F]{6}|[0-9a-fA-F]{3})\z/iU';
 }