Mistralys / application-utils

src/ConvertHelper/ControlCharacters.php

Indentation +43 added lines, -43 removed lines

@@ -22,9 +22,9 @@ 
 {
     const ERROR_MALFORMATTED_STRING = 53801;
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected static $controlChars =  array(
         '0000-0008', // control chars
         '000E-000F', // control chars
@@ -32,19 +32,19 @@ 
         '2000-200F', // non-breaking space and co
     );
     
-   /**
-    * @var string|NULL
-    */
+    /**
+     * @var string|NULL
+     */
     protected static $controlCharsRegex;
 
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected static $hexAlphabet = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F');
     
-   /**
-    * @var string[]|NULL
-    */
+    /**
+     * @var string[]|NULL
+     */
     protected static $charsAsHex;
     
     public function __construct()
@@ -67,13 +67,13 @@ 
         }
     }
     
-   /**
-    * Retrieves the HEX character codes for all control
-    * characters that the {@link stripControlCharacters()}
-    * method will remove.
-    *
-    * @return string[]
-    */
+    /**
+     * Retrieves the HEX character codes for all control
+     * characters that the {@link stripControlCharacters()}
+     * method will remove.
+     *
+     * @return string[]
+     */
     public function getCharsAsHex() : array
     {
         if (isset(self::$charsAsHex))
@@ -120,13 +120,13 @@ 
         return $stack;
     }
     
-   /**
-    * Retrieves an array of all control characters that
-    * the {@link stripControlCharacters()} method will
-    * remove, as the actual UTF-8 characters.
-    *
-    * @return string[]
-    */
+    /**
+     * Retrieves an array of all control characters that
+     * the {@link stripControlCharacters()} method will
+     * remove, as the actual UTF-8 characters.
+     *
+     * @return string[]
+     */
     public function getCharsAsUTF8() : array
     {
         $chars = $this->getCharsAsHex();
@@ -139,12 +139,12 @@ 
         return $result;
     }
     
-   /**
-    * Retrieves all control characters as JSON encoded
-    * characters, e.g. "\u200b".
-    *
-    * @return string[]
-    */
+    /**
+     * Retrieves all control characters as JSON encoded
+     * characters, e.g. "\u200b".
+     *
+     * @return string[]
+     */
     public function getCharsAsJSON() : array
     {
         $chars = $this->getCharsAsHex();
@@ -157,17 +157,17 @@ 
         return $result;
     }
     
-   /**
-    * Removes all control characters from the specified string
-    * that can cause problems in some cases, like creating
-    * valid XML documents. This includes invisible non-breaking
-    * spaces.
-    *
-    * @param string $string
-    * @return string
-    * @see https://stackoverflow.com/a/8171868/2298192
-    * @see https://unicode-table.com/en
-    */
+    /**
+     * Removes all control characters from the specified string
+     * that can cause problems in some cases, like creating
+     * valid XML documents. This includes invisible non-breaking
+     * spaces.
+     *
+     * @param string $string
+     * @return string
+     * @see https://stackoverflow.com/a/8171868/2298192
+     * @see https://unicode-table.com/en
+     */
     public function stripControlCharacters(string $string) : string
     {
         if(empty($string)) 

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

src/Value/Bool/False.php

Spacing +2 added lines, -2 removed lines

@@ -22,14 +22,14 @@
  */
 class Value_Bool_False extends Value_Bool
 {
-    public function __construct(bool $value=true)
+    public function __construct(bool $value = true)
     {
         parent::__construct($value);
     }
     
     public function set(bool $value) : Value_Bool
     {
-        if($value === false)
+        if ($value === false)
         {
             parent::set($value);
         }

src/Value/Bool/True.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 {
     public function set(bool $value) : Value_Bool
     {
-        if($value === true)
+        if ($value === true)
         {
             parent::set($value);
         }

src/VariableInfo/Renderer/String/Array.php

Spacing +4 added lines, -4 removed lines

@@ -13,15 +13,15 @@
         return print_r($result, true);
     }
     
-    protected function traverseArray(array $array, int $level=0) : array
+    protected function traverseArray(array $array, int $level = 0) : array
     {
         $result = array();
         
-        foreach($array as $key => $val)
+        foreach ($array as $key => $val)
         {
-            if(is_array($val))
+            if (is_array($val))
             {
-                $result[$key] = $this->traverseArray($val, ($level+1));
+                $result[$key] = $this->traverseArray($val, ($level + 1));
             }
             else
             {

Braces +1 added lines, -2 removed lines

@@ -22,8 +22,7 @@
             if(is_array($val))
             {
                 $result[$key] = $this->traverseArray($val, ($level+1));
-            }
-            else
+            } else
             {
                 $result[$key] = parseVariable($val)->toString();
             }

src/XMLHelper/SimpleXML.php

Indentation +22 added lines, -22 removed lines

@@ -23,37 +23,37 @@
 {
     const ERROR_NOT_LOADED_YET = 56501;
     
-   /**
-    * @var \SimpleXMLElement|NULL
-    */
+    /**
+     * @var \SimpleXMLElement|NULL
+     */
     private $element = null;
     
-   /**
-    * @var XMLHelper_SimpleXML_Error[]
-    */
+    /**
+     * @var XMLHelper_SimpleXML_Error[]
+     */
     private $errors = array();
     
-   /**
-    * Creates a simplexml instance from an XML string.
-    *
-    * NOTE: returns false in case of a fatal error.
-    *
-    * @param string $string
-    * @return \SimpleXMLElement|NULL
-    */
+    /**
+     * Creates a simplexml instance from an XML string.
+     *
+     * NOTE: returns false in case of a fatal error.
+     *
+     * @param string $string
+     * @return \SimpleXMLElement|NULL
+     */
     public function loadString(string $string) : ?\SimpleXMLElement
     {
         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|NULL
-    */
+    /**
+     * Creates a simplexml instance from an XML file.
+     * 
+     * NOTE: returns false in case of a fatal error.
+     * 
+     * @param string $file
+     * @return \SimpleXMLElement|NULL
+     */
     public function loadFile(string $file) : ?\SimpleXMLElement
     {
         return $this->load('file', $file);

Spacing +3 added lines, -3 removed lines

@@ -83,7 +83,7 @@ 
         // error wrappers.
         $errors = libxml_get_errors();
         
-        foreach($errors as $error) 
+        foreach ($errors as $error) 
         {
             $this->errors[] = new XMLHelper_SimpleXML_Error($this, $error);
         }
@@ -97,7 +97,7 @@ 
         
         $xml = $function($subject);
         
-        if($xml instanceof \SimpleXMLElement)
+        if ($xml instanceof \SimpleXMLElement)
         {
             return $xml;
         }
@@ -107,7 +107,7 @@ 
     
     public function getConverter() : XMLHelper_Converter
     {
-        if($this->element instanceof \SimpleXMLElement)
+        if ($this->element instanceof \SimpleXMLElement)
         {
             return XMLHelper::convertElement($this->element);
         }

src/XMLHelper/DOMErrors/Error.php

Indentation +3 added lines, -3 removed lines

@@ -24,9 +24,9 @@
     const ERROR_CANNOT_UNSERIALIZE_ERROR_DATA = 57201;
     const ERROR_ERROR_DATA_KEY_MISSING = 57202;
     
-   /**
-    * @var \LibXMLError
-    */
+    /**
+     * @var \LibXMLError
+     */
     private $error;
     
     private static $requiredKeys = array(

Spacing +3 added lines, -3 removed lines

@@ -46,7 +46,7 @@ 
     {
         $data = @json_decode($serialized, true);
         
-        if(!is_array($data))
+        if (!is_array($data))
         {
             throw new XMLHelper_Exception(
                 'Could not unserialize error data',
@@ -72,9 +72,9 @@ 
     
     private static function checkErrorData(array $data) : void
     {
-        foreach(self::$requiredKeys as $key)
+        foreach (self::$requiredKeys as $key)
         {
-            if(!array_key_exists($key, $data))
+            if (!array_key_exists($key, $data))
             {
                 throw new XMLHelper_Exception(
                     'Required key missing in error data',

src/XMLHelper/HTMLLoader.php

Indentation +66 added lines, -66 removed lines

@@ -36,19 +36,19 @@ 
 {
     const ERROR_STRING_ALREADY_HAS_BODY_TAG = 57001;
     
-   /**
-    * @var \DOMElement
-    */
+    /**
+     * @var \DOMElement
+     */
     private $bodyNode;
     
-   /**
-    * @var XMLHelper_DOMErrors
-    */
+    /**
+     * @var XMLHelper_DOMErrors
+     */
     private $errors;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     private static $htmlTemplate = 
     '<!DOCTYPE html>'.
     '<html>'.
@@ -60,9 +60,9 @@ 
         '</body>'.
     '</html>';
     
-   /**
-    * @var \DOMDocument
-    */
+    /**
+     * @var \DOMDocument
+     */
     private $dom;
 
     private function __construct(string $html)
@@ -70,13 +70,13 @@ 
         $this->load($html);
     }
     
-   /**
-    * Creates an HTML loader from an HTML fragment (without
-    * doctype, head and body elements).
-    * 
-    * @param string $fragment
-    * @return XMLHelper_HTMLLoader
-    */
+    /**
+     * Creates an HTML loader from an HTML fragment (without
+     * doctype, head and body elements).
+     * 
+     * @param string $fragment
+     * @return XMLHelper_HTMLLoader
+     */
     public static function loadFragment(string $fragment) : XMLHelper_HTMLLoader
     {
         self::checkFragment($fragment);
@@ -87,24 +87,24 @@ 
         return new XMLHelper_HTMLLoader($pseudoHTML);
     }
     
-   /**
-    * Creates an HTML loader from a full HTML document (including
-    * doctype, head and body elements).
-    * 
-    * @param string $html
-    * @return XMLHelper_HTMLLoader
-    */
+    /**
+     * Creates an HTML loader from a full HTML document (including
+     * doctype, head and body elements).
+     * 
+     * @param string $html
+     * @return XMLHelper_HTMLLoader
+     */
     public static function loadHTML(string $html) : XMLHelper_HTMLLoader
     {
         return  new XMLHelper_HTMLLoader($html);
     }
 
-   /**
-    * Verifies that the fragment does not already contain a body element or doctype.
-    * 
-    * @param string $fragment
-    * @throws XMLHelper_Exception
-    */
+    /**
+     * Verifies that the fragment does not already contain a body element or doctype.
+     * 
+     * @param string $fragment
+     * @throws XMLHelper_Exception
+     */
     private static function checkFragment(string $fragment) : void
     {
         if(!stristr($fragment, '<body') && !stristr($fragment, 'doctype'))
@@ -142,65 +142,65 @@ 
         return $this->bodyNode;
     }
     
-   /**
-    * Retrieves the document's `<body>` tag node.
-    * 
-    * @return \DOMDocument
-    */
+    /**
+     * Retrieves the document's `<body>` tag node.
+     * 
+     * @return \DOMDocument
+     */
     public function getDOM() : \DOMDocument
     {
         return $this->dom;
     }
     
-   /**
-    * Retrieves all nodes from the HTML fragment (= child nodes
-    * of the `<body>` element).
-    * 
-    * @return \DOMNodeList
-    */
+    /**
+     * Retrieves all nodes from the HTML fragment (= child nodes
+     * of the `<body>` element).
+     * 
+     * @return \DOMNodeList
+     */
     public function getFragmentNodes() : \DOMNodeList
     {
         return $this->bodyNode->childNodes;
     }
     
-   /**
-    * Retrieves the LibXML HTML parsing errors collection, which
-    * can be used to review any errors that occurred while loading
-    * the HTML document.
-    * 
-    * @return XMLHelper_DOMErrors
-    */
+    /**
+     * Retrieves the LibXML HTML parsing errors collection, which
+     * can be used to review any errors that occurred while loading
+     * the HTML document.
+     * 
+     * @return XMLHelper_DOMErrors
+     */
     public function getErrors() : XMLHelper_DOMErrors
     {
         return $this->errors;
     }
     
-   /**
-    * Returns a valid HTML string.
-    * 
-    * @return string
-    */
+    /**
+     * Returns a valid HTML string.
+     * 
+     * @return string
+     */
     public function toHTML() : string
     {
         return $this->dom->saveHTML();
     }
     
-   /**
-    * Returns a valid XML string.
-    * 
-    * @return string
-    */
+    /**
+     * Returns a valid XML string.
+     * 
+     * @return string
+     */
     public function toXML() : string
     {
         return $this->dom->saveXML();
     }
     
-   /**
-    * Converts the HTML fragment to valid XML (= all
-    * child nodes of the `<body>` element).
-    * 
-    * @return string
-    */
+    /**
+     * Converts the HTML fragment to valid XML (= all
+     * child nodes of the `<body>` element).
+     * 
+     * @return string
+     */
     public function fragmentToXML() : string
     {
         $nodes = $this->getFragmentNodes();

Spacing +2 added lines, -2 removed lines

@@ -107,7 +107,7 @@ 
     */
     private static function checkFragment(string $fragment) : void
     {
-        if(!stristr($fragment, '<body') && !stristr($fragment, 'doctype'))
+        if (!stristr($fragment, '<body') && !stristr($fragment, 'doctype'))
         {
             return;
         }
@@ -207,7 +207,7 @@ 
         
         // capture all elements except the body tag itself
         $xml = '';
-        foreach($nodes as $child) 
+        foreach ($nodes as $child) 
         {
             $xml .= $this->dom->saveXML($child);
         }

src/XMLHelper/DOMErrors.php

Indentation +50 added lines, -50 removed lines

@@ -23,14 +23,14 @@ 
 {
     const SERIALIZE_SEPARATOR = '__SERSEP__';
     
-   /**
-    * @var XMLHelper_DOMErrors_Error[]
-    */
+    /**
+     * @var XMLHelper_DOMErrors_Error[]
+     */
     private $errors;
     
-   /**
-    * @param \LibXMLError[]|XMLHelper_DOMErrors_Error[] $libxmlErrors
-    */
+    /**
+     * @param \LibXMLError[]|XMLHelper_DOMErrors_Error[] $libxmlErrors
+     */
     public function __construct(array $libxmlErrors)
     {
         foreach($libxmlErrors as $error)
@@ -56,11 +56,11 @@ 
         return $this->errors;
     }
     
-   /**
-    * Retrieves all warnings, if any.
-    * 
-    * @return XMLHelper_DOMErrors_Error[]
-    */
+    /**
+     * Retrieves all warnings, if any.
+     * 
+     * @return XMLHelper_DOMErrors_Error[]
+     */
     public function getWarnings()
     {
         return $this->getByLevel(LIBXML_ERR_WARNING);
@@ -107,12 +107,12 @@ 
     }
     
     
-   /**
-    * Retrieves all errors by the specified libxml error level.
-    * 
-    * @param int $level
-    * @return \AppUtils\XMLHelper_DOMErrors_Error[]
-    */
+    /**
+     * Retrieves all errors by the specified libxml error level.
+     * 
+     * @param int $level
+     * @return \AppUtils\XMLHelper_DOMErrors_Error[]
+     */
     public function getByLevel(int $level)
     {
         $result = array();
@@ -128,12 +128,12 @@ 
         return $result;
     }
     
-   /**
-    * Retrieves all errors by the specified libxml error code.
-    * 
-    * @param int $code
-    * @return \AppUtils\XMLHelper_DOMErrors_Error[]
-    */
+    /**
+     * Retrieves all errors by the specified libxml error code.
+     * 
+     * @param int $code
+     * @return \AppUtils\XMLHelper_DOMErrors_Error[]
+     */
     public function getByCode(int $code)
     {
         $result = array();
@@ -149,12 +149,12 @@ 
         return $result;
     }
     
-   /**
-    * Checks whether there are errors matching the libxml error level.
-    * 
-    * @param int $level
-    * @return bool
-    */
+    /**
+     * Checks whether there are errors matching the libxml error level.
+     * 
+     * @param int $level
+     * @return bool
+     */
     public function hasErrorsByLevel(int $level) : bool
     {
         foreach($this->errors as $error)
@@ -168,12 +168,12 @@ 
         return false;
     }
     
-   /**
-    * Checks whether there are any errors matching the libxml error code.
-    * 
-    * @param int $code
-    * @return bool
-    */
+    /**
+     * Checks whether there are any errors matching the libxml error code.
+     * 
+     * @param int $code
+     * @return bool
+     */
     public function hasErrorsByCode(int $code) : bool
     {
         foreach($this->errors as $error)
@@ -199,13 +199,13 @@ 
         return $result;
     }
     
-   /**
-    * Serializes the errors collection, so it can be stored and
-    * restored as needed, using the `fromSerialized()` method.
-    * 
-    * @return string
-    * @see XMLHelper_DOMErrors::fromSerialized()
-    */
+    /**
+     * Serializes the errors collection, so it can be stored and
+     * restored as needed, using the `fromSerialized()` method.
+     * 
+     * @return string
+     * @see XMLHelper_DOMErrors::fromSerialized()
+     */
     public function serialize() : string
     {
         $data = array();
@@ -218,14 +218,14 @@ 
         return implode(self::SERIALIZE_SEPARATOR, $data);
     }
     
-   /**
-    * Restores the errors collection from a previously serialized
-    * collection, using `serialize()`. 
-    * 
-    * @param string $serialized
-    * @return XMLHelper_DOMErrors
-    * @see XMLHelper_DOMErrors::serialize()
-    */
+    /**
+     * Restores the errors collection from a previously serialized
+     * collection, using `serialize()`. 
+     * 
+     * @param string $serialized
+     * @return XMLHelper_DOMErrors
+     * @see XMLHelper_DOMErrors::serialize()
+     */
     public static function fromSerialized(string $serialized) : XMLHelper_DOMErrors
     {
         $parts = explode(self::SERIALIZE_SEPARATOR, $serialized);

Spacing +14 added lines, -14 removed lines

@@ -33,13 +33,13 @@ 
     */
     public function __construct(array $libxmlErrors)
     {
-        foreach($libxmlErrors as $error)
+        foreach ($libxmlErrors as $error)
         {
-            if($error instanceof XMLHelper_DOMErrors_Error)
+            if ($error instanceof XMLHelper_DOMErrors_Error)
             {
                 $this->errors[] = $error;
             }
-            else if($error instanceof \LibXMLError)
+            else if ($error instanceof \LibXMLError)
             {
                 $this->errors[] = new XMLHelper_DOMErrors_Error($error);
             }
@@ -117,9 +117,9 @@ 
     {
         $result = array();
         
-        foreach($this->errors as $error)
+        foreach ($this->errors as $error)
         {
-            if($error->isLevel($level))
+            if ($error->isLevel($level))
             {
                 $result[] = $error;
             }
@@ -138,9 +138,9 @@ 
     {
         $result = array();
         
-        foreach($this->errors as $error)
+        foreach ($this->errors as $error)
         {
-            if($error->isCode($code))
+            if ($error->isCode($code))
             {
                 $result[] = $error;
             }
@@ -157,9 +157,9 @@ 
     */
     public function hasErrorsByLevel(int $level) : bool
     {
-        foreach($this->errors as $error)
+        foreach ($this->errors as $error)
         {
-            if($error->isLevel($level))
+            if ($error->isLevel($level))
             {
                 return true;
             }
@@ -176,9 +176,9 @@ 
     */
     public function hasErrorsByCode(int $code) : bool
     {
-        foreach($this->errors as $error)
+        foreach ($this->errors as $error)
         {
-            if($error->isCode($code))
+            if ($error->isCode($code))
             {
                 return true;
             }
@@ -191,7 +191,7 @@ 
     {
         $result = array();
         
-        foreach($this->errors as $error)
+        foreach ($this->errors as $error)
         {
             $result[] = $error->toArray();
         }
@@ -210,7 +210,7 @@ 
     {
         $data = array();
         
-        foreach($this->errors as $error)
+        foreach ($this->errors as $error)
         {
             $data[] = $error->serialize();
         }
@@ -231,7 +231,7 @@ 
         $parts = explode(self::SERIALIZE_SEPARATOR, $serialized);
         $list = array();
         
-        foreach($parts as $part)
+        foreach ($parts as $part)
         {
             $list[] = XMLHelper_DOMErrors_Error::fromSerialized($part);
         }

Braces +1 added lines, -2 removed lines

@@ -38,8 +38,7 @@
             if($error instanceof XMLHelper_DOMErrors_Error)
             {
                 $this->errors[] = $error;
-            }
-            else if($error instanceof \LibXMLError)
+            } else if($error instanceof \LibXMLError)
             {
                 $this->errors[] = new XMLHelper_DOMErrors_Error($error);
             }