Mistralys / application-utils

src/NumberInfo.php

Spacing +38 added lines, -38 removed lines

@@ -84,7 +84,7 @@ 
      */
     public function setValue($value) : NumberInfo
     {
-        if($value instanceof NumberInfo) {
+        if ($value instanceof NumberInfo) {
             $value = $value->getValue();
         }
         
@@ -117,7 +117,7 @@ 
     
     public function isPositive() : bool
     {
-        if(!$this->isEmpty()) {
+        if (!$this->isEmpty()) {
             $number = $this->getNumber();
             return $number > 0;
         }
@@ -148,7 +148,7 @@ 
      */
     public function hasValue() : bool
     {
-        if(!$this->isEmpty() && !$this->isZero()) {
+        if (!$this->isEmpty() && !$this->isZero()) {
             return true;
         }
         
@@ -221,7 +221,7 @@ 
      */
     public function getUnits()
     {
-        if(!$this->hasUnits()) {
+        if (!$this->hasUnits()) {
             return 'px';
         }
         
@@ -255,15 +255,15 @@ 
      */
     public function toAttribute()
     {
-        if($this->isEmpty()) {
+        if ($this->isEmpty()) {
             return null;
         }
         
-        if($this->isZero()) {
+        if ($this->isZero()) {
             return '0';
         }
         
-        if($this->isPercent()) {
+        if ($this->isPercent()) {
             return $this->getNumber().$this->getUnits();
         }
         
@@ -276,11 +276,11 @@ 
      */
     public function toCSS() : string
     {
-        if($this->isEmpty()) {
+        if ($this->isEmpty()) {
             return '';
         }
         
-        if($this->isZero()) {
+        if ($this->isZero()) {
             return '0';
         }
         
@@ -289,7 +289,7 @@ 
     
     public function __toString()
     {
-        if($this->isEmpty()) {
+        if ($this->isEmpty()) {
             return '';
         }
         
@@ -307,7 +307,7 @@ 
     public function isBiggerThan($number)
     {
         $number = parseNumber($number);
-        if($number->getUnits() != $this->getUnits()) {
+        if ($number->getUnits() != $this->getUnits()) {
             return false;
         }
         
@@ -325,7 +325,7 @@ 
     public function isSmallerThan($number)
     {
         $number = parseNumber($number);
-        if($number->getUnits() != $this->getUnits()) {
+        if ($number->getUnits() != $this->getUnits()) {
             return false;
         }
         
@@ -335,7 +335,7 @@ 
     public function isBiggerEqual($number)
     {
         $number = parseNumber($number);
-        if($number->getUnits() != $this->getUnits()) {
+        if ($number->getUnits() != $this->getUnits()) {
             return false;
         }
         
@@ -352,14 +352,14 @@ 
      */
     public function add($value)
     {
-        if($this->isEmpty()) {
+        if ($this->isEmpty()) {
             $this->setValue($value);
             return $this;
         }
         
         $number = parseNumber($value);
         
-        if($number->getUnits() == $this->getUnits() || !$number->hasUnits())
+        if ($number->getUnits() == $this->getUnits() || !$number->hasUnits())
         {
             $new = $this->getNumber() + $number->getNumber();
             $this->setValue($new.$this->getUnits());
@@ -378,14 +378,14 @@ 
      */
     public function subtract($value)
     {
-        if($this->isEmpty()) {
+        if ($this->isEmpty()) {
             $this->setValue($value);
             return $this;
         }
         
         $number = parseNumber($value);
         
-        if($number->getUnits() == $this->getUnits() || !$number->hasUnits())
+        if ($number->getUnits() == $this->getUnits() || !$number->hasUnits())
         {
             $new = $this->getNumber() - $number->getNumber();
             $this->setValue($new.$this->getUnits());
@@ -412,25 +412,25 @@ 
     
     protected function percentOperation($operation, $percent)
     {
-        if($this->isZeroOrEmpty()) {
+        if ($this->isZeroOrEmpty()) {
             return $this;
         }
         
         $percent = parseNumber($percent);
-        if($percent->hasUnits() && !$percent->isPercent()) {
+        if ($percent->hasUnits() && !$percent->isPercent()) {
             return $this;
         }
         
         $number = $this->getNumber();
         $value = $number * $percent->getNumber() / 100;
         
-        if($operation == '-') {
+        if ($operation == '-') {
             $number = $number - $value;
         } else {
             $number = $number + $value;
         }
         
-        if($this->isUnitInteger()) {
+        if ($this->isUnitInteger()) {
             $number = intval($number);
         }
         
@@ -481,7 +481,7 @@ 
         
         $key = $this->createValueKey($value);
 
-        if(array_key_exists($key, $cache)) {
+        if (array_key_exists($key, $cache)) {
             return $cache[$key];
         }
         
@@ -491,13 +491,13 @@ 
             'number' => null
         );
         
-        if($key === '_EMPTY_') 
+        if ($key === '_EMPTY_') 
         {
             $cache[$key]['empty'] = true;
             return $cache[$key];
         }
         
-        if($value === 0 || $value === '0') 
+        if ($value === 0 || $value === '0') 
         {
             $cache[$key]['number'] = 0;
             $cache[$key] = $this->filterInfo($cache[$key]);
@@ -506,20 +506,20 @@ 
         
         $test = trim((string)$value);
         
-        if($test === '') 
+        if ($test === '') 
         {
             $cache[$key]['empty'] = true;
             return $cache[$key];
         }
         
         // replace comma notation (which is only possible if it's a string)
-        if(is_string($value))
+        if (is_string($value))
         {
             $test = $this->preProcess($test, $cache, $value);
         }
         
         // convert to a number if it's numeric
-        if(is_numeric($test)) 
+        if (is_numeric($test)) 
         {
             $cache[$key]['number'] = $test * 1;
             $cache[$key] = $this->filterInfo($cache[$key]);
@@ -545,19 +545,19 @@ 
         $empty = false;
         
         $found = $this->findUnits($test);
-        if($found !== null) 
+        if ($found !== null) 
         {
             $number = $found['number'];
             $units = $found['units'];
         }
         
         // the filters have to restore the value
-        if($this->postProcess)
+        if ($this->postProcess)
         {
             $number = $this->postProcess($number, $test);
         }
         // empty number
-        else if($number === '' || $number === null || is_bool($number))
+        else if ($number === '' || $number === null || is_bool($number))
         {
             $number = null;
             $empty = true;
@@ -568,7 +568,7 @@ 
             $number = trim($number);
             
             // may be an arbitrary string in some cases
-            if(!is_numeric($number))
+            if (!is_numeric($number))
             {
                 $number = null;
                 $empty = true;
@@ -600,17 +600,17 @@ 
         $vlength = strlen($value);
         $names = array_keys($this->knownUnits);
         
-        foreach($names as $unit)
+        foreach ($names as $unit)
         {
             $ulength = strlen($unit);
-            $start = $vlength-$ulength;
-            if($start < 0) {
+            $start = $vlength - $ulength;
+            if ($start < 0) {
                 continue;
             }
             
             $search = substr($value, $start, $ulength);
             
-            if($search==$unit) 
+            if ($search == $unit) 
             {
                 return array(
                     'units' => $unit,
@@ -630,7 +630,7 @@ 
     */
     private function createValueKey($value) : string
     {
-        if(!is_string($value) && !is_numeric($value))
+        if (!is_string($value) && !is_numeric($value))
         {
             return '_EMPTY_';
         }
@@ -696,12 +696,12 @@ 
     protected function filterInfo(array $info) : array
     {
         $useUnits = 'px';
-        if($info['units'] !== null) {
+        if ($info['units'] !== null) {
             $useUnits = $info['units'];
         }
         
         // the units are non-decimal: convert decimal values
-        if($useUnits !== null && $this->knownUnits[$useUnits] === false && !$info['empty'] && is_numeric($info['number']))
+        if ($useUnits !== null && $this->knownUnits[$useUnits] === false && !$info['empty'] && is_numeric($info['number']))
         {
             $info['number'] = intval($info['number']);
         }

src/Request.php

Spacing +35 added lines, -35 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);
         }
         
@@ -143,9 +143,9 @@ 
         
         $exclude = array_merge($exclude, $this->getExcludeParams());
         
-        foreach($exclude as $name) 
+        foreach ($exclude as $name) 
         {
-            if(isset($vars[$name])) 
+            if (isset($vars[$name])) 
             {
                 unset($vars[$name]);
             }
@@ -156,9 +156,9 @@ 
         // remove the HTML_QuickForm2 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) 
+        foreach ($names as $name) 
         {
-            if(strstr($name, '_qf__')) 
+            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];
         }
         
@@ -300,7 +300,7 @@ 
     {
         static $accept;
         
-        if(!isset($accept)) {
+        if (!isset($accept)) {
             $accept = new Request_AcceptHeaders();
         }
         
@@ -319,7 +319,7 @@ 
     {
         $_REQUEST[$name] = $value;
         
-        if(isset($this->knownParams[$name])) {
+        if (isset($this->knownParams[$name])) {
             unset($this->knownParams[$name]);
         }
         
@@ -353,11 +353,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]);
         }
         
@@ -372,7 +372,7 @@ 
     */
     public function removeParams(array $names) : Request
     {
-        foreach($names as $name) {
+        foreach ($names as $name) {
             $this->removeParam($name);
         }
         
@@ -388,10 +388,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);
         }
         
@@ -400,11 +400,11 @@ 
     
     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,
@@ -426,10 +426,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');
         }
         
@@ -448,24 +448,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();
         }
         
@@ -482,7 +482,7 @@ 
     public function getJSONAssoc(string $name) : array
     {
         $result = $this->getJSON($name);
-        if(is_array($result)) {
+        if (is_array($result)) {
             return $result;
         }
         
@@ -499,7 +499,7 @@ 
     public function getJSONObject(string $name) : object
     {
         $result = $this->getJSON($name, false);
-        if(is_object($result)) {
+        if (is_object($result)) {
             return $result;
         }
         
@@ -512,10 +512,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);
         }
         
@@ -525,7 +525,7 @@ 
         
         echo $payload;
         
-        if($exit) 
+        if ($exit) 
         {
             exit;
         }
@@ -537,7 +537,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');
@@ -545,7 +545,7 @@ 
         
         echo $html;
         
-        if($exit)
+        if ($exit)
         {
             exit;
         }
@@ -561,7 +561,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/Request/Param/Filter.php

Indentation +3 added lines, -3 removed lines

@@ -22,9 +22,9 @@
 {
     use Traits_Optionable;
     
-   /**
-    * @var Request_Param
-    */
+    /**
+     * @var Request_Param
+     */
     protected $param;
     
     protected $value;

src/Request/Param/Filter/Boolean.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
     
     protected function _filter()
     {
-        if($this->value === 'yes' || $this->value === 'true' || $this->value === true) {
+        if ($this->value === 'yes' || $this->value === 'true' || $this->value === true) {
             return true;
         }
         

src/Request/Param/Filter/CommaSeparated.php

Spacing +6 added lines, -6 removed lines

@@ -23,11 +23,11 @@ 
     
     protected function _filter()
     {
-        if(is_array($this->value)) {
+        if (is_array($this->value)) {
             return $this->value;
         }
         
-        if($this->value === '' || $this->value === null || !is_string($this->value)) {
+        if ($this->value === '' || $this->value === null || !is_string($this->value)) {
             return array();
         }
         
@@ -35,19 +35,19 @@ 
         $stripEmptyEntries = $this->getBoolOption('stripEmptyEntries');
         $result = explode(',', $this->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;
             }
             

src/Request/Param/Filter/String.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
     
     protected function _filter()
     {
-        if(!is_scalar($this->value)) {
+        if (!is_scalar($this->value)) {
             return '';
         }
         

src/Request/Param/Validator/Alpha.php

Spacing +2 added lines, -2 removed lines

@@ -27,11 +27,11 @@
     
     protected function _validate()
     {
-        if(!is_scalar($this->value)) {
+        if (!is_scalar($this->value)) {
             return null;
         }
         
-        if(preg_match('/\A[a-zA-Z]+\z/', $this->value)) {
+        if (preg_match('/\A[a-zA-Z]+\z/', $this->value)) {
             return $this->value;
         }
         

src/Request/Param/Validator/Callback.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
         array_unshift($args, $this->value);
         
         $result = call_user_func_array($this->getOption('callback'), $args);
-        if($result !== false) {
+        if ($result !== false) {
             return $this->value;
         }
         

src/Request/Param/Validator/Integer.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
     
     protected function _validate()
     {
-        if(ConvertHelper::isInteger($this->value)) {
+        if (ConvertHelper::isInteger($this->value)) {
             return intval($this->value);
         }