Mistralys / application-utils

src/ConvertHelper/StringMatch.php

Indentation +8 added lines, -8 removed lines

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

src/XMLHelper/SimpleXML/Error.php

Indentation +3 added lines, -3 removed lines

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

src/XMLHelper/Converter.php

Indentation +41 added lines, -41 removed lines

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

Spacing +2 added lines, -2 removed lines

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

src/XMLHelper/SimpleXML.php

Indentation +16 added lines, -16 removed lines

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

Spacing +1 added lines, -1 removed lines

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

src/Request/URLComparer.php

Spacing +15 added lines, -15 removed lines

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

src/RegexHelper.php

Indentation +12 added lines, -12 removed lines

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

src/VariableInfo.php

Braces +1 added lines, -2 removed lines

@@ -55,8 +55,7 @@
         if(is_array($serialized))
         {
             $this->parseSerialized($serialized);
-        }
-        else
+        } else
         {
             $this->parseValue($value);
         }

Indentation +41 added lines, -41 removed lines

@@ -19,25 +19,25 @@ 
     const TYPE_UNKNOWN = 'unknown type';
     const TYPE_CALLABLE = 'callable';
 
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $string;
     
-   /**
-    * @var mixed
-    */
+    /**
+     * @var mixed
+     */
     protected $value;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $type;
     
-   /**
-    * @param mixed $value
-    * @param array|null $serialized
-    */
+    /**
+     * @param mixed $value
+     * @param array|null $serialized
+     */
     public function __construct($value, $serialized=null)
     {
         if(is_array($serialized))
@@ -50,26 +50,26 @@ 
         }
     }
     
-   /**
-    * Creates a new variable info instance from a PHP variable
-    * of any type.
-    * 
-    * @param mixed $variable
-    * @return VariableInfo
-    */
+    /**
+     * Creates a new variable info instance from a PHP variable
+     * of any type.
+     * 
+     * @param mixed $variable
+     * @return VariableInfo
+     */
     public static function fromVariable($variable) : VariableInfo
     {
         return new VariableInfo($variable);
     }
     
-   /**
-    * Restores a variable info instance using a previously serialized
-    * array using the serialize() method.
-    * 
-    * @param array $serialized
-    * @return VariableInfo
-    * @see VariableInfo::serialize()
-    */
+    /**
+     * Restores a variable info instance using a previously serialized
+     * array using the serialize() method.
+     * 
+     * @param array $serialized
+     * @return VariableInfo
+     * @see VariableInfo::serialize()
+     */
     public static function fromSerialized(array $serialized) : VariableInfo
     {
         return new VariableInfo(null, $serialized);
@@ -100,12 +100,12 @@ 
         return $this->value;
     }
     
-   /**
-    * The variable type - this is the same string that
-    * is returned by the PHP function `gettype`.
-    * 
-    * @return string
-    */
+    /**
+     * The variable type - this is the same string that
+     * is returned by the PHP function `gettype`.
+     * 
+     * @return string
+     */
     public function getType() : string
     {
         return $this->type;
@@ -119,13 +119,13 @@ 
         );
     }
     
-   /**
-    * Whether to prepend the variable type before the value, 
-    * like the var_dump function. Example: <code>string "Some text"</code>.
-    * 
-    * @param bool $enable
-    * @return VariableInfo
-    */
+    /**
+     * Whether to prepend the variable type before the value, 
+     * like the var_dump function. Example: <code>string "Some text"</code>.
+     * 
+     * @param bool $enable
+     * @return VariableInfo
+     */
     public function enableType(bool $enable=true) : VariableInfo
     {
         return $this->setOption('prepend-type', $enable);

Spacing +6 added lines, -6 removed lines

@@ -38,9 +38,9 @@ 
     * @param mixed $value
     * @param array|null $serialized
     */
-    public function __construct($value, $serialized=null)
+    public function __construct($value, $serialized = null)
     {
-        if(is_array($serialized))
+        if (is_array($serialized))
         {
             $this->parseSerialized($serialized);
         }
@@ -88,7 +88,7 @@ 
         $this->value = $value;
         $this->type = strtolower(gettype($value));
         
-        if(is_array($value) && is_callable($value)) {
+        if (is_array($value) && is_callable($value)) {
             $this->type = self::TYPE_CALLABLE;
         }
         
@@ -126,7 +126,7 @@ 
     * @param bool $enable
     * @return VariableInfo
     */
-    public function enableType(bool $enable=true) : VariableInfo
+    public function enableType(bool $enable = true) : VariableInfo
     {
         return $this->setOption('prepend-type', $enable);
     }
@@ -135,9 +135,9 @@ 
     {
         $converted = $this->string;
         
-        if($this->getOption('prepend-type') === true && !$this->isNull())
+        if ($this->getOption('prepend-type') === true && !$this->isNull())
         {
-            if($this->isString())
+            if ($this->isString())
             {
                 $converted = '"'.$converted.'"';
             }

src/BaseException.php

Braces +2 added lines, -4 removed lines

@@ -59,8 +59,7 @@ 
         try
         {
             throw new BaseException('');
-        }
-        catch(BaseException $e) 
+        } catch(BaseException $e) 
         {
             echo self::createInfo($e)->toString();
         }
@@ -74,8 +73,7 @@ 
         try
         {
             throw new BaseException('');
-        }
-        catch(BaseException $e)
+        } catch(BaseException $e)
         {
             echo '<pre style="background:#fff;font-family:monospace;font-size:14px;color:#444;padding:16px;border:solid 1px #999;border-radius:4px;">';
             echo self::createInfo($e)->toString();

Spacing +5 added lines, -5 removed lines

@@ -31,7 +31,7 @@ 
     * @param int $code
     * @param \Exception $previous
     */
-    public function __construct(string $message, $details=null, $code=null, $previous=null)
+    public function __construct(string $message, $details = null, $code = null, $previous = null)
     {
         parent::__construct($message, $code, $previous);
         
@@ -44,7 +44,7 @@ 
     */
     public function getDetails() : string
     {
-        if($this->details !== null) {
+        if ($this->details !== null) {
             return $this->details;
         }
         
@@ -57,7 +57,7 @@ 
     */
     public function display()
     {
-        if(!headers_sent()) {
+        if (!headers_sent()) {
             header('Content-type:text/plain; charset=utf-8');
         }
         
@@ -85,7 +85,7 @@ 
         {
             throw new BaseException('');
         }
-        catch(BaseException $e) 
+        catch (BaseException $e) 
         {
             echo self::createInfo($e)->toString();
         }
@@ -100,7 +100,7 @@ 
         {
             throw new BaseException('');
         }
-        catch(BaseException $e)
+        catch (BaseException $e)
         {
             echo '<pre style="background:#fff;font-family:monospace;font-size:14px;color:#444;padding:16px;border:solid 1px #999;border-radius:4px;">';
             echo self::createInfo($e)->toString();

Indentation +35 added lines, -35 removed lines

@@ -20,17 +20,17 @@ 
  */
 class BaseException extends \Exception
 {
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $details;
     
-   /**
-    * @param string $message
-    * @param string $details
-    * @param int $code
-    * @param \Exception $previous
-    */
+    /**
+     * @param string $message
+     * @param string $details
+     * @param int $code
+     * @param \Exception $previous
+     */
     public function __construct(string $message, $details=null, $code=null, $previous=null)
     {
         parent::__construct($message, $code, $previous);
@@ -38,10 +38,10 @@ 
         $this->details = $details;
     }
     
-   /**
-    * Retrieves the detailed error description, if any.
-    * @return string
-    */
+    /**
+     * Retrieves the detailed error description, if any.
+     * @return string
+     */
     public function getDetails() : string
     {
         if($this->details !== null) {
@@ -51,9 +51,9 @@ 
         return '';
     }
     
-   /**
-    * Displays pertinent information on the exception.
-    */
+    /**
+     * Displays pertinent information on the exception.
+     */
     public function display()
     {
         if(!headers_sent()) {
@@ -63,20 +63,20 @@ 
         echo $this->getInfo();
     }
     
-   /**
-    * Retrieves information on the exception that can be
-    * easily accessed.
-    * 
-    * @return ConvertHelper_ThrowableInfo
-    */
+    /**
+     * Retrieves information on the exception that can be
+     * easily accessed.
+     * 
+     * @return ConvertHelper_ThrowableInfo
+     */
     public function getInfo() : ConvertHelper_ThrowableInfo
     {
         return ConvertHelper::throwable2info($this);
     }
     
-   /**
-    * Dumps a current PHP function trace, as a textonly string.
-    */
+    /**
+     * Dumps a current PHP function trace, as a textonly string.
+     */
     public static function dumpTraceAsString()
     {
         try
@@ -89,9 +89,9 @@ 
         }
     }
 
-   /**
-    * Dumps a current PHP function trace, with HTML styling.
-    */
+    /**
+     * Dumps a current PHP function trace, with HTML styling.
+     */
     public static function dumpTraceAsHTML()
     {
         try
@@ -106,13 +106,13 @@ 
         }
     }
     
-   /**
-    * Creates an exception info instance from a throwable instance.
-    * 
-    * @param \Throwable $e
-    * @return ConvertHelper_ThrowableInfo
-    * @see ConvertHelper::throwable2info()
-    */
+    /**
+     * Creates an exception info instance from a throwable instance.
+     * 
+     * @param \Throwable $e
+     * @return ConvertHelper_ThrowableInfo
+     * @see ConvertHelper::throwable2info()
+     */
     public static function createInfo(\Throwable $e) : ConvertHelper_ThrowableInfo
     {
         return ConvertHelper::throwable2info($e);

src/IniHelper/Line.php

Indentation +18 added lines, -18 removed lines

@@ -38,38 +38,38 @@
      */
     protected $text;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $trimmed;
     
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $lineNumber;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $type;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $varName = '';
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $varValue = '';
     
     protected $valueUnquoted = '';
     
     protected $quoteStyle = '';
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $sectionName = '';
     
     public function __construct(string $text, int $lineNumber)

Spacing +10 added lines, -10 removed lines

@@ -78,7 +78,7 @@ 
         $this->trimmed = trim($text);
         $this->lineNumber = $lineNumber;
         
-        if(empty($this->trimmed)) 
+        if (empty($this->trimmed)) 
         {
             $this->type = self::TYPE_EMPTY;
             return;
@@ -86,11 +86,11 @@ 
         
         $startChar = substr($this->trimmed, 0, 1);
         
-        if($startChar === ';')
+        if ($startChar === ';')
         {
             $this->type = self::TYPE_COMMENT;
         }
-        else if($startChar === '[')
+        else if ($startChar === '[')
         {
             $this->type = self::TYPE_SECTION_DECLARATION;
             $this->sectionName = trim($this->trimmed, '[]');
@@ -99,7 +99,7 @@ 
         else
         {
             $pos = strpos($this->trimmed, '=');
-            if($pos === false) 
+            if ($pos === false) 
             {
                 $this->type = self::TYPE_INVALID;
                 return;
@@ -108,7 +108,7 @@ 
             $this->type = self::TYPE_VALUE;
             $this->varName = trim(substr($this->trimmed, 0, $pos));
             
-            $this->parseValue(substr($this->trimmed, $pos+1));
+            $this->parseValue(substr($this->trimmed, $pos + 1));
         }
     }
     
@@ -118,12 +118,12 @@ 
         
         $value = $this->varValue;
         
-        if(substr($value, 0, 1) == '"' && substr($value, -1, 1) == '"')
+        if (substr($value, 0, 1) == '"' && substr($value, -1, 1) == '"')
         {
             $value = trim($value, '"');
             $this->quoteStyle = '"';
         }
-        else if(substr($value, 0, 1) == "'" && substr($value, -1, 1) == "'")
+        else if (substr($value, 0, 1) == "'" && substr($value, -1, 1) == "'")
         {
             $value = trim($value, "'");
             $this->quoteStyle = "'";
@@ -144,7 +144,7 @@ 
     
     public function getQuotedVarValue() : string
     {
-        if($this->quoteStyle === '') {
+        if ($this->quoteStyle === '') {
             return $this->getVarValue();
         }
         
@@ -198,7 +198,7 @@ 
     
     public function setValue($value) : IniHelper_Line
     {
-        if(!is_scalar($value)) 
+        if (!is_scalar($value)) 
         {
             throw new IniHelper_Exception(
                 'Cannot use non-scalar values.',
@@ -218,7 +218,7 @@ 
     
     public function toString() : string
     {
-        switch($this->type) 
+        switch ($this->type) 
         {
             case self::TYPE_EMPTY:
             case self::TYPE_INVALID:

Braces +3 added lines, -6 removed lines

@@ -89,14 +89,12 @@ 
         if($startChar === ';')
         {
             $this->type = self::TYPE_COMMENT;
-        }
-        else if($startChar === '[')
+        } else if($startChar === '[')
         {
             $this->type = self::TYPE_SECTION_DECLARATION;
             $this->sectionName = trim($this->trimmed, '[]');
             $this->sectionName = trim($this->sectionName); // remove any whitespace
-        }
-        else
+        } else
         {
             $pos = strpos($this->trimmed, '=');
             if($pos === false) 
@@ -122,8 +120,7 @@ 
         {
             $value = trim($value, '"');
             $this->quoteStyle = '"';
-        }
-        else if(substr($value, 0, 1) == "'" && substr($value, -1, 1) == "'")
+        } else if(substr($value, 0, 1) == "'" && substr($value, -1, 1) == "'")
         {
             $value = trim($value, "'");
             $this->quoteStyle = "'";