Mistralys / application-utils

src/Request/Param/Validator/Enum.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
     
     protected function _validate()
     {
-        if(in_array($this->value, $this->getArrayOption('values'))) {
+        if (in_array($this->value, $this->getArrayOption('values'))) {
             return $this->value;
         }
         

src/Request/Param.php

Indentation +134 added lines, -134 removed lines

@@ -114,18 +114,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 callable $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 callable $callback
+     * @param array $args
+     * @return Request_Param
+     */
     public function setCallback($callback, array $args=array()) : Request_Param
     {
         if(!is_callable($callback)) {
@@ -169,16 +169,16 @@ 
         return $value;
     }
     
-   /**
-    * Validates the specified value using the validation type. Returns
-    * the validated value. 
-    * 
-    * @param mixed $value
-    * @param string $type
-    * @param array $params
-    * @throws Request_Exception
-    * @return mixed
-    */
+    /**
+     * Validates the specified value using the validation type. Returns
+     * the validated value. 
+     * 
+     * @param mixed $value
+     * @param string $type
+     * @param array $params
+     * @throws Request_Exception
+     * @return mixed
+     */
     protected function validateType($value, string $type, array $params)
     {
         $class = '\AppUtils\Request_Param_Validator_'.ucfirst($type);
@@ -276,13 +276,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;
@@ -291,13 +291,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);
@@ -338,12 +338,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);   
@@ -376,17 +376,17 @@ 
         );
     }
     
-   /**
-    * 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();
@@ -404,53 +404,53 @@ 
         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
     {
         return $this->addClassFilter('Boolean');
     }
     
-   /**
-    * 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);
@@ -492,14 +492,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);
@@ -587,12 +587,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
@@ -601,13 +601,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->addClassFilter('String');
@@ -657,12 +657,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.
@@ -671,14 +671,14 @@ 
         return $this->addClassFilter('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();
@@ -703,12 +703,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'));
@@ -721,14 +721,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 +14 added lines, -14 removed lines

@@ -126,9 +126,9 @@ 
     * @param array $args
     * @return Request_Param
     */
-    public function setCallback($callback, array $args=array()) : Request_Param
+    public function setCallback($callback, array $args = array()) : Request_Param
     {
-        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.',
@@ -161,7 +161,7 @@ 
         
         // 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) 
         {
             $value = $this->validateType($value, $validateDef['type'], $validateDef['params']);
         }
@@ -183,7 +183,7 @@ 
     {
         $class = '\AppUtils\Request_Param_Validator_'.ucfirst($type);
         
-        if(!class_exists($class))
+        if (!class_exists($class))
         {
             throw new Request_Exception(
                 'Unknown validation type.',
@@ -199,7 +199,7 @@ 
         $validator = new $class($this);
         $validator->setOptions($params);
         
-        if($this->valueType === self::VALUE_TYPE_ID_LIST)
+        if ($this->valueType === self::VALUE_TYPE_ID_LIST)
         {
             $value = $this->validateType_idList($value, $validator);
         }
@@ -213,19 +213,19 @@ 
     
     protected function validateType_idList($value, Request_Param_Validator $validator) : array
     {
-        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 = $validator->validate($subval);
             
-            if($subval !== null) {
+            if ($subval !== null) {
                 $keep[] = intval($subval);
             }
         }
@@ -365,7 +365,7 @@ 
     {
         $args = func_get_args(); // cannot be used as function parameter in some PHP versions
         
-        if(is_array($args[0])) 
+        if (is_array($args[0])) 
         {
             $args = $args[0];
         }
@@ -500,10 +500,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;
         }
 
@@ -522,7 +522,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']);
         }
 
@@ -679,7 +679,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();
         
@@ -692,7 +692,7 @@ 
         );
     }
     
-    protected function addClassFilter(string $name, array $params=array()) : Request_Param
+    protected function addClassFilter(string $name, array $params = array()) : Request_Param
     {
         return $this->addFilter(
             self::FILTER_TYPE_CLASS,

Braces +1 added lines, -2 removed lines

@@ -202,8 +202,7 @@
         if($this->valueType === self::VALUE_TYPE_ID_LIST)
         {
             $value = $this->validateType_idList($value, $validator);
-        }
-        else
+        } else
         {
             $value = $validator->validate($value);
         }

src/VariableInfo/Renderer/String.php

Indentation +3 added lines, -3 removed lines

@@ -6,9 +6,9 @@
 
 abstract class VariableInfo_Renderer_String extends VariableInfo_Renderer
 {
-   /**
-    * @var mixed
-    */
+    /**
+     * @var mixed
+     */
     protected $value;
     
     protected function init()

src/VariableInfo/Renderer/HTML.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
             str_replace(' ', '-', $this->type)
         );
         
-        if($this->info->getBoolOption('prepend-type') && !$this->info->isNull())
+        if ($this->info->getBoolOption('prepend-type') && !$this->info->isNull())
         {
             $typeLabel = '<span style="color:#1c2eb1" class="variable-type">'.$this->info->getType().'</span> ';
             $converted = $typeLabel.' '.$converted;

src/VariableInfo/Renderer/String/Callable.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
     {
         $string = '';
         
-        if(is_string($this->value[0])) 
+        if (is_string($this->value[0])) 
         {
             $string .= $this->value[0].'::';
         } 

Braces +1 added lines, -2 removed lines

@@ -13,8 +13,7 @@
         if(is_string($this->value[0])) 
         {
             $string .= $this->value[0].'::';
-        } 
-        else 
+        } else 
         {
             $string .= get_class($this->value[0]).'->';
         }

src/VariableInfo/Renderer/String/Array.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
     {
         $result = array();
         
-        foreach($this->value as $key => $val)
+        foreach ($this->value as $key => $val)
         {
             $result[$key] = parseVariable($val)->toString();
         }

src/VariableInfo/Renderer.php

Indentation +14 added lines, -14 removed lines

@@ -6,19 +6,19 @@ 
 
 abstract class VariableInfo_Renderer
 {
-   /**
-    * @var mixed
-    */
+    /**
+     * @var mixed
+     */
     protected $value;
     
-   /**
-    * @var VariableInfo
-    */
+    /**
+     * @var VariableInfo
+     */
     protected $info;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $type;
     
     public function __construct(VariableInfo $info)
@@ -31,11 +31,11 @@ 
     
     abstract protected function init();
 
-   /**
-    * Renders the value to the target format.
-    * 
-    * @return mixed
-    */
+    /**
+     * Renders the value to the target format.
+     * 
+     * @return mixed
+     */
     public function render()
     {
         return $this->_render();

src/XMLHelper/Converter/Decorator.php

Indentation +27 added lines, -27 removed lines

@@ -21,25 +21,25 @@ 
  */
 class XMLHelper_Converter_Decorator implements \JsonSerializable
 {
-   /**
-    * @var \SimpleXMLElement
-    */
+    /**
+     * @var \SimpleXMLElement
+     */
     private $subject;
     
     const DEF_DEPTH = 512;
     
-   /**
-    * @var array
-    */
+    /**
+     * @var array
+     */
     private $options = array(
         '@attributes' => true,
         '@text' => true,
         'depth' => self::DEF_DEPTH
     );
 
-   /**
-    * @var array|string|null
-    */
+    /**
+     * @var array|string|null
+     */
     protected $result = array();
     
     public function __construct(\SimpleXMLElement $element)
@@ -47,36 +47,36 @@ 
         $this->subject = $element;
     }
     
-   /**
-    * Whether to use the `@attributes` key to store element attributes.
-    * 
-    * @param bool $bool
-    * @return XMLHelper_Converter_Decorator
-    */
+    /**
+     * Whether to use the `@attributes` key to store element attributes.
+     * 
+     * @param bool $bool
+     * @return XMLHelper_Converter_Decorator
+     */
     public function useAttributes(bool $bool) : XMLHelper_Converter_Decorator 
     {
         $this->options['@attributes'] = (bool)$bool;
         return $this;
     }
     
-   /**
-    * Whether to use the `@text` key to store the node text.
-    * 
-    * @param bool $bool
-    * @return XMLHelper_Converter_Decorator
-    */
+    /**
+     * Whether to use the `@text` key to store the node text.
+     * 
+     * @param bool $bool
+     * @return XMLHelper_Converter_Decorator
+     */
     public function useText(bool $bool) : XMLHelper_Converter_Decorator 
     {
         $this->options['@text'] = (bool)$bool;
         return $this;
     }
     
-   /**
-    * Set the maximum depth to parse in the document.
-    * 
-    * @param int $depth
-    * @return XMLHelper_Converter_Decorator
-    */
+    /**
+     * Set the maximum depth to parse in the document.
+     * 
+     * @param int $depth
+     * @return XMLHelper_Converter_Decorator
+     */
     public function setDepth(int $depth) : XMLHelper_Converter_Decorator 
     {
         $this->options['depth'] = (int)max(0, $depth);

Spacing +7 added lines, -7 removed lines

@@ -107,13 +107,13 @@ 
     
     protected function detectAttributes()
     {
-        if(!$this->options['@attributes']) {
+        if (!$this->options['@attributes']) {
             return;
         }
         
         $attributes = $this->subject->attributes();
         
-        if(!empty($attributes)) 
+        if (!empty($attributes)) 
         {
             $this->result['@attributes'] = array_map('strval', iterator_to_array($attributes));
         }
@@ -124,7 +124,7 @@ 
         $children = $this->subject;
         $depth = $this->options['depth'] - 1;
         
-        if($depth <= 0) 
+        if ($depth <= 0) 
         {
             $children = [];
         }
@@ -137,9 +137,9 @@ 
             
             $decorator->options = ['depth' => $depth] + $this->options;
             
-            if(isset($this->result[$name])) 
+            if (isset($this->result[$name])) 
             {
-                if(!is_array($this->result[$name])) 
+                if (!is_array($this->result[$name])) 
                 {
                     $this->result[$name] = [$this->result[$name]];
                 }
@@ -158,9 +158,9 @@ 
         // json encode non-whitespace element simplexml text values.
         $text = trim((string)$this->subject);
         
-        if(strlen($text)) 
+        if (strlen($text)) 
         {
-            if($this->options['@text']) 
+            if ($this->options['@text']) 
             {
                 $this->result['@text'] = $text;
             } 

Braces +2 added lines, -4 removed lines

@@ -145,8 +145,7 @@ 
                 }
                 
                 $this->result[$name][] = $decorator;
-            } 
-            else 
+            } else 
             {
                 $this->result[$name] = $decorator;
             }
@@ -163,8 +162,7 @@ 
             if($this->options['@text']) 
             {
                 $this->result['@text'] = $text;
-            } 
-            else 
+            } else 
             {
                 $this->result = $text;
             }

src/functions.php

Spacing +5 added lines, -5 removed lines

@@ -16,9 +16,9 @@ 
  * @param mixed $value
  * @return \AppUtils\NumberInfo
  */
-function parseNumber($value, $forceNew=false)
+function parseNumber($value, $forceNew = false)
 {
-    if($value instanceof NumberInfo && $forceNew !== true) {
+    if ($value instanceof NumberInfo && $forceNew !== true) {
         return $value;
     }
     
@@ -99,7 +99,7 @@ 
     $args = func_get_args();
     
     // is the localization package installed?
-    if(class_exists('\AppLocalize\Localization')) 
+    if (class_exists('\AppLocalize\Localization')) 
     {
         return call_user_func_array('\AppLocalize\t', $args);
     }
@@ -117,7 +117,7 @@ 
  */
 function requireCURL() : void
 {
-    if(function_exists('curl_init')) {
+    if (function_exists('curl_init')) {
         return;
     }
     
@@ -135,7 +135,7 @@ 
  */
 function init()
 {
-    if(!class_exists('\AppLocalize\Localization')) {
+    if (!class_exists('\AppLocalize\Localization')) {
         return;
     }