Mistralys / application-utils

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

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/Traits/Optionable.php

Spacing +15 added lines, -15 removed lines

@@ -40,7 +40,7 @@ 
     */
     public function setOption(string $name, $value)
     {
-        if(!isset($this->options)) {
+        if (!isset($this->options)) {
             $this->options = $this->getDefaultOptions();
         }
         
@@ -56,7 +56,7 @@ 
     */
     public function setOptions(array $options)
     {
-        foreach($options as $name => $value) {
+        foreach ($options as $name => $value) {
             $this->setOption($name, $value);
         }
         
@@ -73,13 +73,13 @@ 
     * @param mixed $default The default value to return if the option does not exist.
     * @return mixed
     */
-    public function getOption(string $name, $default=null)
+    public function getOption(string $name, $default = null)
     {
-        if(!isset($this->options)) {
+        if (!isset($this->options)) {
             $this->options = $this->getDefaultOptions();
         }
         
-        if(isset($this->options[$name])) {
+        if (isset($this->options[$name])) {
             return $this->options[$name];
         }
         
@@ -96,11 +96,11 @@ 
     * @param string $default Used if the option does not exist, is invalid, or empty.
     * @return string
     */
-    public function getStringOption(string $name, string $default='') : string
+    public function getStringOption(string $name, string $default = '') : string
     {
         $value = $this->getOption($name, false);
         
-        if((is_string($value) || is_numeric($value)) && !empty($value)) {
+        if ((is_string($value) || is_numeric($value)) && !empty($value)) {
             return (string)$value;
         }
         
@@ -116,9 +116,9 @@ 
     * @param string $name
     * @return bool
     */
-    public function getBoolOption(string $name, bool $default=false) : bool
+    public function getBoolOption(string $name, bool $default = false) : bool
     {
-        if($this->getOption($name) === true) {
+        if ($this->getOption($name) === true) {
             return true;
         }
         
@@ -134,10 +134,10 @@ 
     * @param int $default
     * @return int
     */
-    public function getIntOption(string $name, int $default=0) : int
+    public function getIntOption(string $name, int $default = 0) : int
     {
         $value = $this->getOption($name);
-        if(ConvertHelper::isInteger($value)) {
+        if (ConvertHelper::isInteger($value)) {
             return (int)$value;
         }
         
@@ -155,7 +155,7 @@ 
     public function getArrayOption(string $name) : array
     {
         $val = $this->getOption($name);
-        if(is_array($val)) {
+        if (is_array($val)) {
             return $val;
         }
         
@@ -171,7 +171,7 @@ 
     */
     public function hasOption(string $name) : bool
     {
-        if(!isset($this->options)) {
+        if (!isset($this->options)) {
             $this->options = $this->getDefaultOptions();
         }
         
@@ -184,7 +184,7 @@ 
     */
     public function getOptions() : array
     {
-        if(!isset($this->options)) {
+        if (!isset($this->options)) {
             $this->options = $this->getDefaultOptions();
         }
         
@@ -238,7 +238,7 @@ 
     * @param mixed $default
     * @return $this
     */
-    function getOption(string $name, $default=null);
+    function getOption(string $name, $default = null);
     
    /**
     * @param array $options

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;
     }

src/URLInfo/Normalizer.php

Spacing +11 added lines, -11 removed lines

@@ -39,7 +39,7 @@ 
     * @param bool $enable Whether to turn it on or off.
     * @return URLInfo_Normalizer
     */
-    public function enableAuth(bool $enable=true) : URLInfo_Normalizer
+    public function enableAuth(bool $enable = true) : URLInfo_Normalizer
     {
         $this->auth = $enable;
         return $this;
@@ -86,48 +86,48 @@ 
     
     protected function renderAuth(string $normalized) : string
     {
-        if(!$this->info->hasUsername() || !$this->auth) {
+        if (!$this->info->hasUsername() || !$this->auth) {
             return $normalized;
         }
          
-        return $normalized . urlencode($this->info->getUsername()).':'.urlencode($this->info->getPassword()).'@';
+        return $normalized.urlencode($this->info->getUsername()).':'.urlencode($this->info->getPassword()).'@';
     }
     
     protected function renderPort(string $normalized) : string
     {
-        if(!$this->info->hasPort()) {
+        if (!$this->info->hasPort()) {
             return $normalized;
         }
         
-        return $normalized . ':'.$this->info->getPort();
+        return $normalized.':'.$this->info->getPort();
     }
     
     protected function renderPath(string $normalized) : string
     {
-        if(!$this->info->hasPath()) {
+        if (!$this->info->hasPath()) {
             return $normalized; 
         }
         
-        return $normalized . $this->info->getPath();
+        return $normalized.$this->info->getPath();
     }
     
     protected function renderParams(string $normalized) : string
     {
         $params = $this->info->getParams();
         
-        if(empty($params)) {
+        if (empty($params)) {
             return $normalized;
         }
         
-        return $normalized . '?'.http_build_query($params, '', '&', PHP_QUERY_RFC3986);
+        return $normalized.'?'.http_build_query($params, '', '&', PHP_QUERY_RFC3986);
     }
     
     protected function renderFragment(string $normalized) : string
     {
-        if(!$this->info->hasFragment()) {
+        if (!$this->info->hasFragment()) {
             return $normalized;
         }
         
-        return $normalized . '#'.$this->info->getFragment();
+        return $normalized.'#'.$this->info->getFragment();
     }
 }

src/ConvertHelper/QueryParser.php

Spacing +2 added lines, -2 removed lines

@@ -46,7 +46,7 @@ 
         
         $result = array();
         
-        foreach($parts as $part)
+        foreach ($parts as $part)
         {
             $tokens = explode('=', $part);
             
@@ -55,7 +55,7 @@ 
 
             $trimmed = trim($name);
             
-            if(empty($trimmed))
+            if (empty($trimmed))
             {
                 continue;
             }

src/URLInfo/Parser.php

Spacing +28 added lines, -28 removed lines

@@ -82,7 +82,7 @@ 
         
         $this->parse();
         
-        if(!$this->detectType()) {
+        if (!$this->detectType()) {
             $this->validate();
         }
     }
@@ -108,7 +108,7 @@ 
         
         // if the URL contains any URL characters, and we
         // do not want them URL encoded, restore them.
-        if(!$this->encodeUTF && !empty($this->unicodeChars))
+        if (!$this->encodeUTF && !empty($this->unicodeChars))
         {
             $this->info = $this->restoreUnicodeChars($this->info);
         }
@@ -125,13 +125,13 @@ 
         
         $keep = array();
         
-        foreach($chars as $char)
+        foreach ($chars as $char)
         {
-            if(preg_match('/\p{L}/usix', $char))
+            if (preg_match('/\p{L}/usix', $char))
             {
                 $encoded = rawurlencode($char);
                 
-                if($encoded != $char)
+                if ($encoded != $char)
                 {
                     $this->unicodeChars[$encoded] = $char;
                     $char = $encoded;
@@ -152,11 +152,11 @@ 
             'phoneLink'
         );
         
-        foreach($types as $type)
+        foreach ($types as $type)
         {
             $method = 'detectType_'.$type;
             
-            if($this->$method() === true) 
+            if ($this->$method() === true) 
             {
                 $this->isValid = true;
                 return true;
@@ -174,11 +174,11 @@ 
             'hostIsPresent'
         );
         
-        foreach($validations as $validation) 
+        foreach ($validations as $validation) 
         {
             $method = 'validate_'.$validation;
             
-            if($this->$method() !== true) {
+            if ($this->$method() !== true) {
                 return;
             }
         }
@@ -191,13 +191,13 @@ 
         // every link needs a host. This case can happen for ex, if
         // the link starts with a typo with only one slash, like:
         // "http:/hostname"
-        if(isset($this->info['host'])) {
+        if (isset($this->info['host'])) {
             return true;
         }
         
         $this->setError(
             URLInfo::ERROR_MISSING_HOST,
-            t('Cannot determine the link\'s host name.') . ' ' .
+            t('Cannot determine the link\'s host name.').' '.
             t('This usually happens when there\'s a typo somewhere.')
         );
 
@@ -206,7 +206,7 @@ 
     
     protected function validate_schemeIsSet() : bool
     {
-        if(isset($this->info['scheme'])) {
+        if (isset($this->info['scheme'])) {
             return true;
         }
         
@@ -223,13 +223,13 @@ 
     
     protected function validate_schemeIsKnown() : bool
     {
-        if(in_array($this->info['scheme'], $this->knownSchemes)) {
+        if (in_array($this->info['scheme'], $this->knownSchemes)) {
             return true;
         }
         
         $this->setError(
             URLInfo::ERROR_INVALID_SCHEME,
-            t('The scheme %1$s is not supported for links.', $this->info['scheme']) . ' ' .
+            t('The scheme %1$s is not supported for links.', $this->info['scheme']).' '.
             t('Valid schemes are: %1$s.', implode(', ', $this->knownSchemes))
         );
 
@@ -246,23 +246,23 @@ 
         $this->info['params'] = array();
         $this->info['type'] = URLInfo::TYPE_URL;
         
-        if(isset($this->info['user'])) {
+        if (isset($this->info['user'])) {
             $this->info['user'] = urldecode($this->info['user']);
         }
 
-        if(isset($this->info['pass'])) {
+        if (isset($this->info['pass'])) {
             $this->info['pass'] = urldecode($this->info['pass']);
         }
         
-        if(isset($this->info['host'])) {
+        if (isset($this->info['host'])) {
             $this->info['host'] = str_replace(' ', '', $this->info['host']);
         }
         
-        if(isset($this->info['path'])) {
+        if (isset($this->info['path'])) {
             $this->info['path'] = str_replace(' ', '', $this->info['path']);
         }
         
-        if(isset($this->info['query']) && !empty($this->info['query']))
+        if (isset($this->info['query']) && !empty($this->info['query']))
         {
             $this->info['params'] = \AppUtils\ConvertHelper::parseQueryString($this->info['query']);
             ksort($this->info['params']);
@@ -280,9 +280,9 @@ 
     {
         $result = array();
         
-        foreach($subject as $key => $val)
+        foreach ($subject as $key => $val)
         {
-            if(is_array($val))
+            if (is_array($val))
             {
                 $val = $this->restoreUnicodeChars($val);
             }
@@ -308,7 +308,7 @@ 
     */
     protected function restoreUnicodeChar(string $string) : string
     {
-        if(strstr($string, '%'))
+        if (strstr($string, '%'))
         {
             return str_replace(array_keys($this->unicodeChars), array_values($this->unicodeChars), $string);
         }
@@ -318,12 +318,12 @@ 
     
     protected function detectType_email() : bool
     {
-        if(isset($this->info['scheme']) && $this->info['scheme'] == 'mailto') {
+        if (isset($this->info['scheme']) && $this->info['scheme'] == 'mailto') {
             $this->info['type'] = URLInfo::TYPE_EMAIL;
             return true;
         }
         
-        if(isset($this->info['path']) && preg_match(\AppUtils\RegexHelper::REGEX_EMAIL, $this->info['path']))
+        if (isset($this->info['path']) && preg_match(\AppUtils\RegexHelper::REGEX_EMAIL, $this->info['path']))
         {
             $this->info['scheme'] = 'mailto';
             $this->info['type'] = URLInfo::TYPE_EMAIL;
@@ -335,7 +335,7 @@ 
     
     protected function detectType_fragmentLink() : bool
     {
-        if(isset($this->info['fragment']) && !isset($this->info['scheme'])) {
+        if (isset($this->info['fragment']) && !isset($this->info['scheme'])) {
             $this->info['type'] = URLInfo::TYPE_FRAGMENT;
             return true;
         }
@@ -345,7 +345,7 @@ 
     
     protected function detectType_phoneLink() : bool
     {
-        if(isset($this->info['scheme']) && $this->info['scheme'] == 'tel') {
+        if (isset($this->info['scheme']) && $this->info['scheme'] == 'tel') {
             $this->info['type'] = URLInfo::TYPE_PHONE;
             return true;
         }
@@ -380,7 +380,7 @@ 
     */
     public function getErrorMessage() : string
     {
-        if(isset($this->error)) {
+        if (isset($this->error)) {
             return $this->error['message'];
         }
         
@@ -395,7 +395,7 @@ 
     */
     public function getErrorCode() : int
     {
-        if(isset($this->error)) {
+        if (isset($this->error)) {
             return $this->error['code'];
         }
         

src/ConvertHelper/ControlCharacters.php

Spacing +14 added lines, -14 removed lines

@@ -25,7 +25,7 @@ 
    /**
     * @var string[]
     */
-    protected static $controlChars =  array(
+    protected static $controlChars = array(
         '0000-0008', // control chars
         '000E-000F', // control chars
         '0010-001F', // control chars
@@ -50,7 +50,7 @@ 
     public function __construct()
     {
         // create the regex from the unicode characters list
-        if(!isset(self::$controlCharsRegex))
+        if (!isset(self::$controlCharsRegex))
         {
             $chars = $this->getCharsAsHex();
             
@@ -58,7 +58,7 @@ 
             // in the regular expression.
             $stack = array();
             
-            foreach($chars as $char) 
+            foreach ($chars as $char) 
             {
                 $stack[] = '\x{'.$char.'}';
             }
@@ -83,7 +83,7 @@ 
         
         $stack = array();
         
-        foreach(self::$controlChars as $char)
+        foreach (self::$controlChars as $char)
         {
             $tokens = explode('-', $char);
             $start = $tokens[0];
@@ -92,24 +92,24 @@ 
             
             $range = array();
             
-            foreach(self::$hexAlphabet as $number) 
+            foreach (self::$hexAlphabet as $number) 
             {
                 $range[] = $prefix.$number;
             }
             
             $use = false;
             
-            foreach($range as $number) 
+            foreach ($range as $number) 
             {
-                if($number == $start) {
+                if ($number == $start) {
                     $use = true;
                 }
                 
-                if($use) {
+                if ($use) {
                     $stack[] = $number;
                 }
                 
-                if($number == $end) {
+                if ($number == $end) {
                     break;
                 }
             }
@@ -132,7 +132,7 @@ 
         $chars = $this->getCharsAsHex();
         
         $result = array();
-        foreach($chars as $char) {
+        foreach ($chars as $char) {
             $result[] = hex2bin($char);
         }
         
@@ -150,7 +150,7 @@ 
         $chars = $this->getCharsAsHex();
         
         $result = array();
-        foreach($chars as $char) {
+        foreach ($chars as $char) {
             $result[] = '\u'.strtolower($char);
         }
         
@@ -170,7 +170,7 @@ 
     */
     public function stripControlCharacters(string $string) : string
     {
-        if(empty($string)) 
+        if (empty($string)) 
         {
             return $string;
         }
@@ -178,13 +178,13 @@ 
         $result = preg_replace(self::$controlCharsRegex, '', $string);
         
         // can happen if the text contains invalid UTF8
-        if($result === null)
+        if ($result === null)
         {
             $string = ConvertHelper::string2utf8($string);
             
             $result = preg_replace(self::$controlCharsRegex, '', $string);
             
-            if($result === null)
+            if ($result === null)
             {
                 throw new ConvertHelper_Exception(
                     'Cannot strip control characters: malformatted string encountered.',

src/Value/Bool.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 {
     protected $value = false;
     
-    public function __construct(bool $value=false)
+    public function __construct(bool $value = false)
     {
         $this->value = $value;
     }