Mistralys / application-utils

src/ConvertHelper/TabsNormalizer.php

Spacing +10 added lines, -10 removed lines

@@ -57,7 +57,7 @@ 
     * @param bool $enable
     * @return ConvertHelper_TabsNormalizer
     */
-    public function convertTabsToSpaces(bool $enable=true) : ConvertHelper_TabsNormalizer
+    public function convertTabsToSpaces(bool $enable = true) : ConvertHelper_TabsNormalizer
     {
         $this->tabs2spaces = $enable;
         
@@ -94,7 +94,7 @@ 
         
         $result = $this->_normalize();
         
-        if($this->tabs2spaces) 
+        if ($this->tabs2spaces) 
         {
             $result = ConvertHelper::tabs2spaces($result, $this->tabSize);
         }
@@ -108,7 +108,7 @@ 
     {
         $eol = ConvertHelper::detectEOLCharacter($string);
         
-        if($eol !== null) 
+        if ($eol !== null) 
         {
             $this->eol = $eol->getCharacter();
         }
@@ -126,15 +126,15 @@ 
     {
         $converted = array();
         
-        foreach($this->lines as $line) 
+        foreach ($this->lines as $line) 
         {
             $amount = substr_count($line, "\t") - $this->min;
             
             $line = trim($line, "\n\r\t");
             
-            if($amount >= 1) 
+            if ($amount >= 1) 
             {
-                $line = str_repeat("\t", $amount) . $line;
+                $line = str_repeat("\t", $amount).$line;
             }
             
             $converted[] = $line;
@@ -149,23 +149,23 @@ 
     */
     protected function countOccurrences() : void
     {
-        foreach($this->lines as $line) 
+        foreach ($this->lines as $line) 
         {
             $amount = substr_count($line, "\t");
             
-            if($amount > $this->max) 
+            if ($amount > $this->max) 
             {
                 $this->max = $amount;
                 continue;
             }
             
-            if($amount > 0 && $amount < $this->min) 
+            if ($amount > 0 && $amount < $this->min) 
             {
                 $this->min = $amount;
             }
         }
         
-        if($this->min === PHP_INT_MAX) {
+        if ($this->min === PHP_INT_MAX) {
             $this->min = 0;
         }
     }

Indentation +45 added lines, -45 removed lines

@@ -20,43 +20,43 @@ 
  */
 class ConvertHelper_TabsNormalizer
 {
-   /**
-    * @var integer
-    */
+    /**
+     * @var integer
+     */
     protected $max = 0;
     
-   /**
-    * @var integer
-    */
+    /**
+     * @var integer
+     */
     protected $min = PHP_INT_MAX;
     
-   /**
-    * @var bool
-    */
+    /**
+     * @var bool
+     */
     protected $tabs2spaces = false;
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected $lines = array();
 
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $eol = '';
     
-   /**
-    * @var integer
-    */
+    /**
+     * @var integer
+     */
     protected $tabSize = 4;
     
-   /**
-    * Whether to enable or disable the conversion
-    * of tabs to spaces.
-    * 
-    * @param bool $enable
-    * @return ConvertHelper_TabsNormalizer
-    */
+    /**
+     * Whether to enable or disable the conversion
+     * of tabs to spaces.
+     * 
+     * @param bool $enable
+     * @return ConvertHelper_TabsNormalizer
+     */
     public function convertTabsToSpaces(bool $enable=true) : ConvertHelper_TabsNormalizer
     {
         $this->tabs2spaces = $enable;
@@ -64,13 +64,13 @@ 
         return $this;
     }
     
-   /**
-    * Sets the size of a tab, in spaces. Used to convert tabs
-    * from spaces and the other way around. Defaults to 4.
-    * 
-    * @param int $amountSpaces
-    * @return ConvertHelper_TabsNormalizer
-    */
+    /**
+     * Sets the size of a tab, in spaces. Used to convert tabs
+     * from spaces and the other way around. Defaults to 4.
+     * 
+     * @param int $amountSpaces
+     * @return ConvertHelper_TabsNormalizer
+     */
     public function setTabSize(int $amountSpaces) : ConvertHelper_TabsNormalizer
     {
         $this->tabSize = $amountSpaces;
@@ -78,15 +78,15 @@ 
         return $this;
     }
     
-   /**
-    * Normalizes tabs in the specified string by indenting everything
-    * back to the minimum tab distance. With the second parameter,
-    * tabs can optionally be converted to spaces as well (recommended
-    * for HTML output).
-    *
-    * @param string $string
-    * @return string
-    */
+    /**
+     * Normalizes tabs in the specified string by indenting everything
+     * back to the minimum tab distance. With the second parameter,
+     * tabs can optionally be converted to spaces as well (recommended
+     * for HTML output).
+     *
+     * @param string $string
+     * @return string
+     */
     public function normalize(string $string) : string
     {
         $this->splitLines($string);
@@ -143,10 +143,10 @@ 
         return implode($this->eol, $converted);
     }
     
-   /**
-    * Finds out the minimum and maximum amount of 
-    * tabs in the string.
-    */
+    /**
+     * Finds out the minimum and maximum amount of 
+     * tabs in the string.
+     */
     protected function countOccurrences() : void
     {
         foreach($this->lines as $line) 

src/ConvertHelper/HiddenConverter.php

Spacing +4 added lines, -4 removed lines

@@ -93,7 +93,7 @@ 
     */
     public function selectCharacters(string $type) : ConvertHelper_HiddenConverter
     {
-        if(!in_array($type, $this->selected)) {
+        if (!in_array($type, $this->selected)) {
             $this->selected[] = $type;
         }
         
@@ -109,7 +109,7 @@ 
     {
         $selected = $this->selected;
         
-        if(empty($this->selected)) 
+        if (empty($this->selected)) 
         {
             $selected = array(
                 self::CHARS_WHITESPACE,
@@ -119,9 +119,9 @@ 
         
         $result = array();
         
-        foreach($selected as $type) 
+        foreach ($selected as $type) 
         {
-            if(isset($this->characters[$type])) 
+            if (isset($this->characters[$type])) 
             {
                 $result = array_merge($result, $this->characters[$type]);
             }

Indentation +18 added lines, -18 removed lines

@@ -71,9 +71,9 @@ 
         )
     );
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected $selected = array();
     
     public function convert(string $string) : string
@@ -83,16 +83,16 @@ 
         return str_replace(array_keys($chars), array_values($chars), $string);
     }
     
-   /**
-    * Selects a character set to replace. Can be called
-    * several times to add additional sets to the collection.
-    * 
-    * @param string $type See the <code>CHAR_XXX</code> constants.
-    * @return ConvertHelper_HiddenConverter
-    * 
-    * @see ConvertHelper_HiddenConverter::CHARS_CONTROL
-    * @see ConvertHelper_HiddenConverter::CHARS_WHITESPACE
-    */
+    /**
+     * Selects a character set to replace. Can be called
+     * several times to add additional sets to the collection.
+     * 
+     * @param string $type See the <code>CHAR_XXX</code> constants.
+     * @return ConvertHelper_HiddenConverter
+     * 
+     * @see ConvertHelper_HiddenConverter::CHARS_CONTROL
+     * @see ConvertHelper_HiddenConverter::CHARS_WHITESPACE
+     */
     public function selectCharacters(string $type) : ConvertHelper_HiddenConverter
     {
         if(!in_array($type, $this->selected)) {
@@ -102,11 +102,11 @@ 
         return $this;
     }
     
-   /**
-    * Resolves the list of characters to make visible.
-    * 
-    * @return string[]
-    */
+    /**
+     * Resolves the list of characters to make visible.
+     * 
+     * @return string[]
+     */
     protected function resolveSelection() : array
     {
         $selected = $this->selected;

src/Request/Param.php

Spacing +15 added lines, -15 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.',
@@ -159,22 +159,22 @@ 
         // first off, apply filtering
         $value = $this->filter($value);
         
-        if($this->valueType === self::VALUE_TYPE_LIST)
+        if ($this->valueType === self::VALUE_TYPE_LIST)
         {
-            if(!is_array($value))
+            if (!is_array($value))
             {
                 $value = explode(',', $value);
             }
             
             $keep = array();
             
-            foreach($value as $subval)
+            foreach ($value as $subval)
             {
                 $subval = $this->filter($subval);
                 
                 $subval = $this->applyValidations($subval, true);
 
-                if($subval !== null) {
+                if ($subval !== null) {
                     $keep[] = $subval;
                 }
             }
@@ -195,11 +195,11 @@ 
     * @param mixed $value
     * @return mixed
     */
-    protected function applyValidations($value, bool $subval=false)
+    protected function applyValidations($value, bool $subval = false)
     {
         // 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'], $subval);
         }
@@ -222,7 +222,7 @@ 
     {
         $class = '\AppUtils\Request_Param_Validator_'.ucfirst($type);
         
-        if(!class_exists($class))
+        if (!class_exists($class))
         {
             throw new Request_Exception(
                 'Unknown validation type.',
@@ -376,7 +376,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];
         }
@@ -521,10 +521,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;
         }
 
@@ -543,7 +543,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']);
         }
 
@@ -700,7 +700,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();
         
@@ -713,7 +713,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,

Indentation +154 added lines, -154 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)) {
@@ -189,12 +189,12 @@ 
         return $value;
     }
     
-   /**
-    * Runs the value through all validations that were added.
-    * 
-    * @param mixed $value
-    * @return mixed
-    */
+    /**
+     * Runs the value through all validations that were added.
+     * 
+     * @param mixed $value
+     * @return mixed
+     */
     protected function applyValidations($value, bool $subval=false)
     {
         // go through all enqueued validations in turn, each time
@@ -207,17 +207,17 @@ 
         return $value;
     }
     
-   /**
-    * Validates the specified value using the validation type. Returns
-    * the validated value. 
-    * 
-    * @param mixed $value
-    * @param string $type
-    * @param array $params
-    * @param bool $subval Whether this is a subvalue in a list
-    * @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
+     * @param bool $subval Whether this is a subvalue in a list
+     * @throws Request_Exception
+     * @return mixed
+     */
     protected function validateType($value, string $type, array $params, bool $subval)
     {
         $class = '\AppUtils\Request_Param_Validator_'.ucfirst($type);
@@ -286,13 +286,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_LIST;
@@ -302,13 +302,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);
@@ -349,12 +349,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);   
@@ -387,17 +387,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();
@@ -410,11 +410,11 @@ 
         );
     }
     
-   /**
-    * Whether the parameter is a list of values.
-    * 
-    * @return bool
-    */
+    /**
+     * Whether the parameter is a list of values.
+     * 
+     * @return bool
+     */
     public function isList() : bool
     {
         return $this->valueType === self::VALUE_TYPE_LIST;
@@ -425,53 +425,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);
@@ -513,14 +513,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);
@@ -531,14 +531,14 @@ 
         return $this->validate($default);
     }
 
-   /**
-    * Filters the specified value by going through all available
-    * filters, if any. If none have been set, the value is simply
-    * passed through.
-    *
-    * @param mixed $value
-    * @return mixed
-    */
+    /**
+     * Filters the specified value by going through all available
+     * filters, if any. If none have been set, the value is simply
+     * passed through.
+     *
+     * @param mixed $value
+     * @return mixed
+     */
     protected function filter($value)
     {
         $total = count($this->filters);
@@ -608,12 +608,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
@@ -622,13 +622,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');
@@ -678,12 +678,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.
@@ -692,14 +692,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();
@@ -724,12 +724,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'));
@@ -742,14 +742,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;

src/Request/Param/Validator.php

Indentation +6 added lines, -6 removed lines

@@ -27,14 +27,14 @@
      */
     protected $param;
     
-   /**
-    * @var mixed
-    */
+    /**
+     * @var mixed
+     */
     protected $value;
     
-   /**
-    * @var bool
-    */
+    /**
+     * @var bool
+     */
     protected $isSubvalue = false;
     
     public function __construct(Request_Param $param, bool $subval)

src/Request/Param/Validator/Array.php

Spacing +2 added lines, -2 removed lines

@@ -28,11 +28,11 @@
     protected function _validate()
     {
         // subvalues cannot be arrays
-        if($this->isSubvalue) {
+        if ($this->isSubvalue) {
             return $this->value;
         }
         
-        if(is_array($this->value)) {
+        if (is_array($this->value)) {
             return $this->value;
         }
         

src/Request/Param/Validator/Valueslist.php

Spacing +5 added lines, -5 removed lines

@@ -33,22 +33,22 @@
         
         // if we are validating a subvalue, it means we are 
         // validating a single value in the existing list.
-        if($this->isSubvalue) 
+        if ($this->isSubvalue) 
         {
-            if(in_array($this->value, $allowed)) {
+            if (in_array($this->value, $allowed)) {
                 return $this->value;
             }
             
             return null;
         }
         
-        if(!is_array($this->value)) {
+        if (!is_array($this->value)) {
             return array();
         }
         
         $keep = array();
-        foreach($this->value as $item) {
-            if(in_array($item, $allowed)) {
+        foreach ($this->value as $item) {
+            if (in_array($item, $allowed)) {
                 $keep[] = $item;
             }
         }

src/RequestHelper/Boundaries/Boundary.php

Indentation +47 added lines, -47 removed lines

@@ -19,34 +19,34 @@ 
  */
 class RequestHelper_Boundaries_Boundary
 {
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $content;
     
-   /**
-    * @var array
-    */
+    /**
+     * @var array
+     */
     protected $dispositionParams = array();
 
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $contentType = '';
 
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $contentEncoding = '';
     
-   /**
-    * @var RequestHelper_Boundaries
-    */
+    /**
+     * @var RequestHelper_Boundaries
+     */
     protected $boundaries;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $transferEncoding = '';
     
     public function __construct(RequestHelper_Boundaries $boundaries, string $content)
@@ -60,46 +60,46 @@ 
         return strlen($this->content);
     }
     
-   /**
-    * Sets the name of the request parameter.
-    * 
-    * @param string $name
-    * @return RequestHelper_Boundaries_Boundary
-    */
+    /**
+     * Sets the name of the request parameter.
+     * 
+     * @param string $name
+     * @return RequestHelper_Boundaries_Boundary
+     */
     public function setName(string $name) : RequestHelper_Boundaries_Boundary
     {
         return $this->setDispositionParam('name', $name);
     }
     
-   /**
-    * Sets the filename to use for the content, if applicable.
-    *  
-    * @param string $fileName
-    * @return RequestHelper_Boundaries_Boundary
-    */
+    /**
+     * Sets the filename to use for the content, if applicable.
+     *  
+     * @param string $fileName
+     * @return RequestHelper_Boundaries_Boundary
+     */
     public function setFileName(string $fileName) : RequestHelper_Boundaries_Boundary
     {
         return $this->setDispositionParam('filename', $fileName);
     }
     
-   /**
-    * Sets the content type to use for the content.
-    * 
-    * @param string $contentType
-    * @return RequestHelper_Boundaries_Boundary
-    */
+    /**
+     * Sets the content type to use for the content.
+     * 
+     * @param string $contentType
+     * @return RequestHelper_Boundaries_Boundary
+     */
     public function setContentType(string $contentType) : RequestHelper_Boundaries_Boundary
     {
         $this->contentType = $contentType;
         return $this;
     }
     
-   /**
-    * Sets the encoding to specify for the content.
-    * 
-    * @param string $encoding An encoding string, e.g. "UTF-8", "ASCII"
-    * @return RequestHelper_Boundaries_Boundary
-    */
+    /**
+     * Sets the encoding to specify for the content.
+     * 
+     * @param string $encoding An encoding string, e.g. "UTF-8", "ASCII"
+     * @return RequestHelper_Boundaries_Boundary
+     */
     public function setContentEncoding(string $encoding) : RequestHelper_Boundaries_Boundary
     {
         $this->contentEncoding = $encoding;
@@ -119,11 +119,11 @@ 
         return $this;
     }
     
-   /**
-    * Renders the mime boundary text.
-    * 
-    * @return string
-    */
+    /**
+     * Renders the mime boundary text.
+     * 
+     * @return string
+     */
     public function render()
     {
         $eol = $this->boundaries->getEOL();

Spacing +8 added lines, -8 removed lines

@@ -132,12 +132,12 @@ 
         $lines[] = '--'.$this->boundaries->getMimeBoundary();
         $lines[] = $this->renderContentDisposition();
         
-        if(!empty($this->contentType)) 
+        if (!empty($this->contentType)) 
         {
             $lines[] = $this->renderContentType();
         }
         
-        if(!empty($this->transferEncoding))
+        if (!empty($this->transferEncoding))
         {
             $lines[] = $this->renderTransferEncoding();
         }
@@ -152,9 +152,9 @@ 
     {
         $result = 'Content-Disposition: form-data';
         
-        foreach($this->dispositionParams as $name => $value) 
+        foreach ($this->dispositionParams as $name => $value) 
         {
-            $result .= '; '.$name.'="' . $value . '"';
+            $result .= '; '.$name.'="'.$value.'"';
         }   
         
         return $result;
@@ -162,11 +162,11 @@ 
     
     protected function renderContentType() : string
     {
-        $result = 'Content-Type: ' . $this->contentType; 
+        $result = 'Content-Type: '.$this->contentType; 
         
-        if(!empty($this->contentEncoding)) 
+        if (!empty($this->contentEncoding)) 
         {
-            $result .= '; charset="' . $this->contentEncoding.'"';
+            $result .= '; charset="'.$this->contentEncoding.'"';
         }
         
         return $result;
@@ -174,7 +174,7 @@ 
     
     protected function renderTransferEncoding() : string
     {
-        $result = 'Content-Transfer-Encoding: ' . $this->transferEncoding;
+        $result = 'Content-Transfer-Encoding: '.$this->transferEncoding;
         
         return $result;
     }

src/RequestHelper/Boundaries.php

Spacing +6 added lines, -6 removed lines

@@ -83,12 +83,12 @@ 
     */
     public function addFile(string $varName, string $fileName, string $content, string $contentType = '', string $encoding = '') : RequestHelper_Boundaries
     {
-        if(empty($contentType))
+        if (empty($contentType))
         {
             $contentType = (string)FileHelper::detectMimeType($fileName);
         }
         
-        if(empty($encoding))
+        if (empty($encoding))
         {
             $encoding = RequestHelper::ENCODING_UTF8;
             $content = ConvertHelper::string2utf8($content);
@@ -153,7 +153,7 @@ 
     */
     public function render() : string
     {
-        if(empty($this->boundaries)) 
+        if (empty($this->boundaries)) 
         {
             throw new RequestHelper_Exception(
                 'No mime boundaries added',
@@ -164,13 +164,13 @@ 
         
         $result = '';
         
-        foreach($this->boundaries as $boundary)
+        foreach ($this->boundaries as $boundary)
         {
             $result .= $boundary->render();
         }
         
-        $result .= "--" . $this->getMimeBoundary() . "--" . 
-        $this->getEOL() . $this->getEOL(); // always finish with two eol's!!
+        $result .= "--".$this->getMimeBoundary()."--". 
+        $this->getEOL().$this->getEOL(); // always finish with two eol's!!
         
         return $result;
     }

Indentation +52 added lines, -52 removed lines

@@ -22,19 +22,19 @@ 
 {
     const ERROR_NO_BOUNDARIES_SPECIFIED = 44401;
     
-   /**
-    * @var RequestHelper
-    */
+    /**
+     * @var RequestHelper
+     */
     protected $helper;
 
-   /**
-    * @var RequestHelper_Boundaries_Boundary[]
-    */
+    /**
+     * @var RequestHelper_Boundaries_Boundary[]
+     */
     protected $boundaries = array();
     
-   /**
-    * @var integer
-    */
+    /**
+     * @var integer
+     */
     protected $contentLength = 0;
     
     public function __construct(RequestHelper $helper)
@@ -42,31 +42,31 @@ 
         $this->helper = $helper;
     }
     
-   /**
-    * Retrieves the string that is used to separate mime boundaries in the body.
-    * 
-    * @return string
-    */
+    /**
+     * Retrieves the string that is used to separate mime boundaries in the body.
+     * 
+     * @return string
+     */
     public function getMimeBoundary() : string
     {
         return $this->helper->getMimeBoundary();
     }
     
-   /**
-    * Retrieves the end of line character(s) used in the body.
-    * 
-    * @return string
-    */
+    /**
+     * Retrieves the end of line character(s) used in the body.
+     * 
+     * @return string
+     */
     public function getEOL() : string
     {
         return $this->helper->getEOL();
     }
     
-   /**
-    * Retrieves the total content length of all boundary contents.
-    * 
-    * @return int
-    */
+    /**
+     * Retrieves the total content length of all boundary contents.
+     * 
+     * @return int
+     */
     public function getContentLength() : int
     {
         // this must use strlen, and not mb_strlen: the content length
@@ -75,15 +75,15 @@ 
         return strlen($this->render());
     }
     
-   /**
-    * Adds a file to be sent with the request.
-    *
-    * @param string $varName The variable name to send the file in
-    * @param string $fileName The name of the file as it should be received at the destination
-    * @param string $content The raw content of the file
-    * @param string $contentType The content type, use the constants to specify this
-    * @param string $encoding The encoding of the file, use the constants to specify this
-    */
+    /**
+     * Adds a file to be sent with the request.
+     *
+     * @param string $varName The variable name to send the file in
+     * @param string $fileName The name of the file as it should be received at the destination
+     * @param string $content The raw content of the file
+     * @param string $contentType The content type, use the constants to specify this
+     * @param string $encoding The encoding of the file, use the constants to specify this
+     */
     public function addFile(string $varName, string $fileName, string $content, string $contentType = '', string $encoding = '') : RequestHelper_Boundaries
     {
         if(empty($contentType))
@@ -107,13 +107,13 @@ 
         return $this->addBoundary($boundary);
     }
     
-   /**
-    * Adds arbitrary content.
-    *
-    * @param string $varName
-    * @param string $content
-    * @param string $contentType
-    */
+    /**
+     * Adds arbitrary content.
+     *
+     * @param string $varName
+     * @param string $content
+     * @param string $contentType
+     */
     public function addContent(string $varName, string $content, string $contentType) : RequestHelper_Boundaries
     {
         $content = ConvertHelper::string2utf8($content);
@@ -127,13 +127,13 @@ 
         return $this->addBoundary($boundary);
     }
     
-   /**
-    * Adds a variable to be sent with the request. If it
-    * already exists, its value is overwritten.
-    *
-    * @param string $name
-    * @param string $value
-    */
+    /**
+     * Adds a variable to be sent with the request. If it
+     * already exists, its value is overwritten.
+     *
+     * @param string $name
+     * @param string $value
+     */
     public function addVariable(string $name, string $value) : RequestHelper_Boundaries
     {
         $boundary = $this->createBoundary($value)
@@ -149,11 +149,11 @@ 
         return $this;
     }
     
-   /**
-    * Renders the response body with all mime boundaries.
-    * 
-    * @return string
-    */
+    /**
+     * Renders the response body with all mime boundaries.
+     * 
+     * @return string
+     */
     public function render() : string
     {
         if(empty($this->boundaries)) 

src/URLInfo/Highlighter.php

Indentation +10 added lines, -10 removed lines

@@ -20,9 +20,9 @@ 
  */
 class URLInfo_Highlighter
 {
-   /**
-    * @var URLInfo
-    */
+    /**
+     * @var URLInfo
+     */
     protected $info;
     
     public function __construct(URLInfo $info)
@@ -158,13 +158,13 @@ 
         );
     }
     
-   /**
-    * Fetches all parameters in the URL, regardless of 
-    * whether parameter exclusion is enabled, so they
-    * can be highlighted is need be.
-    * 
-    * @return array
-    */
+    /**
+     * Fetches all parameters in the URL, regardless of 
+     * whether parameter exclusion is enabled, so they
+     * can be highlighted is need be.
+     * 
+     * @return array
+     */
     protected function resolveParams() : array
     {
         $previous = $this->info->isParamExclusionEnabled();

Spacing +15 added lines, -15 removed lines

@@ -77,7 +77,7 @@ 
             'fragment'
         );
         
-        foreach($parts as $part) 
+        foreach ($parts as $part) 
         {
             $method = 'render_'.$part;
             $result[] = (string)$this->$method();
@@ -88,7 +88,7 @@ 
     
     protected function render_scheme() : string
     {
-        if(!$this->info->hasScheme()) {
+        if (!$this->info->hasScheme()) {
             return '';
         }
         
@@ -103,7 +103,7 @@ 
     
     protected function render_username() : string
     {
-        if(!$this->info->hasUsername()) {
+        if (!$this->info->hasUsername()) {
             return '';
         }
         
@@ -119,7 +119,7 @@ 
     
     protected function render_host() : string
     {
-        if(!$this->info->hasHost()) {
+        if (!$this->info->hasHost()) {
             return '';
         }
         
@@ -131,7 +131,7 @@ 
     
     protected function render_port() : string
     {
-        if(!$this->info->hasPort()) {
+        if (!$this->info->hasPort()) {
             return '';
         }
         
@@ -144,7 +144,7 @@ 
        
     protected function render_path() : string
     {
-        if(!$this->info->hasPath()) {
+        if (!$this->info->hasPath()) {
             return '';
         }
         
@@ -169,7 +169,7 @@ 
     {
         $previous = $this->info->isParamExclusionEnabled();
         
-        if($previous)
+        if ($previous)
         {
             $this->info->setParamExclusion(false);
         }
@@ -185,19 +185,19 @@ 
     {
         $params = $this->resolveParams();
         
-        if(empty($params)) {
+        if (empty($params)) {
             return '';
         }
         
         $tokens = array();
         $excluded = array();
         
-        if($this->info->isParamExclusionEnabled())
+        if ($this->info->isParamExclusionEnabled())
         {
             $excluded = $this->info->getExcludedParams();
         }
         
-        foreach($params as $param => $value)
+        foreach ($params as $param => $value)
         {
             // If the parameter is numeric, it will automatically
             // be an integer, so we need the conversion here.
@@ -218,7 +218,7 @@ 
             
             $tag = $this->resolveTag($excluded, $param);
             
-            if(!empty($tag))
+            if (!empty($tag))
             {
                 $tokens[] = sprintf($tag, $parts);
             }
@@ -232,13 +232,13 @@ 
     protected function resolveTag(array $excluded, string $paramName) : string
     {
         // regular, non-excluded parameter
-        if(!isset($excluded[$paramName]))
+        if (!isset($excluded[$paramName]))
         {
             return '<span class="link-param">%s</span>';
         }
 
         // highlight excluded parameters is disabled, ignore this parameter
-        if(!$this->info->isHighlightExcludeEnabled())
+        if (!$this->info->isHighlightExcludeEnabled())
         {
             return '';
         }
@@ -254,7 +254,7 @@ 
      
     protected function render_fragment() : string
     {
-        if(!$this->info->hasFragment()) {
+        if (!$this->info->hasFragment()) {
             return '';
         }
         
@@ -269,7 +269,7 @@ 
     {
         $cssFolder = realpath(__DIR__.'/../../css');
         
-        if($cssFolder === false) {
+        if ($cssFolder === false) {
             throw new BaseException(
                 'Cannot find package CSS folder.',
                 null,