Mistralys / application-utils

src/FileHelper/PHPFile.php

Spacing +2 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
      */
     public function checkSyntax()
     {
-        if(!FileHelper::canMakePHPCalls())
+        if (!FileHelper::canMakePHPCalls())
         {
             return true;
         }
@@ -68,7 +68,7 @@ 
         // when the validation is successful, the first entry
         // in the array contains the success message. When it
         // is invalid, the first entry is always empty.
-        if(!empty($output[0])) {
+        if (!empty($output[0])) {
             return true;
         }
 

src/FileHelper/FolderInfo.php

Spacing +9 added lines, -9 removed lines

@@ -30,7 +30,7 @@ 
     {
         $pathString = AbstractPathInfo::type2string($path);
 
-        if(empty($path)) {
+        if (empty($path)) {
             throw new FileHelper_Exception(
                 'Invalid',
                 '',
@@ -38,7 +38,7 @@ 
             );
         }
 
-        if($path instanceof FileInfo || FileInfo::is_file($pathString))
+        if ($path instanceof FileInfo || FileInfo::is_file($pathString))
         {
             throw new FileHelper_Exception(
                 'Cannot use a file',
@@ -50,7 +50,7 @@ 
             );
         }
 
-        if(!isset(self::$infoCache[$pathString]))
+        if (!isset(self::$infoCache[$pathString]))
         {
             self::$infoCache[$pathString] = new FolderInfo($pathString);
         }
@@ -87,7 +87,7 @@ 
         $path = trim($path);
         $test = trim($path, '/\\');
 
-        if($path === '' || $test === '.' || $test === '..')
+        if ($path === '' || $test === '.' || $test === '..')
         {
             return false;
         }
@@ -105,12 +105,12 @@ 
      */
     public function delete() : FolderInfo
     {
-        if(!$this->exists())
+        if (!$this->exists())
         {
             return $this;
         }
 
-        if(rmdir($this->path))
+        if (rmdir($this->path))
         {
             return $this;
         }
@@ -136,7 +136,7 @@ 
      */
     public function create() : FolderInfo
     {
-        if(is_dir($this->path) || mkdir($this->path, 0777, true) || is_dir($this->path))
+        if (is_dir($this->path) || mkdir($this->path, 0777, true) || is_dir($this->path))
         {
             return $this;
         }
@@ -186,7 +186,7 @@ 
         return FileHelper::createFolder($this->getPath().'/'.$name);
     }
 
-    public function saveFile(string $fileName, string $content='') : FileInfo
+    public function saveFile(string $fileName, string $content = '') : FileInfo
     {
         return FileHelper::saveFile($this.'/'.$fileName, $content);
     }
@@ -198,7 +198,7 @@ 
      * @return JSONFile
      * @throws FileHelper_Exception
      */
-    public function saveJSONFile(array $data, string $fileName, bool $pretty=false) : JSONFile
+    public function saveJSONFile(array $data, string $fileName, bool $pretty = false) : JSONFile
     {
         return FileHelper::saveAsJSON($data, $this.'/'.$fileName, $pretty);
     }

src/FileHelper/FileInfo.php

Spacing +19 added lines, -19 removed lines

@@ -66,7 +66,7 @@ 
         $pathString = AbstractPathInfo::type2string($path);
         $endingChar = $pathString[strlen($pathString) - 1];
 
-        if(empty($path)) {
+        if (empty($path)) {
             throw new FileHelper_Exception(
                 'Invalid',
                 '',
@@ -74,7 +74,7 @@ 
             );
         }
 
-        if($path instanceof FolderInfo || $endingChar === '/' || $endingChar === '\\')
+        if ($path instanceof FolderInfo || $endingChar === '/' || $endingChar === '\\')
         {
             throw new FileHelper_Exception(
                 'Cannot use a folder as a file',
@@ -88,12 +88,12 @@ 
 
         $key = $pathString.';'.static::class;
 
-        if(!isset(self::$infoCache[$key]))
+        if (!isset(self::$infoCache[$key]))
         {
             $class = static::class;
             $instance = new $class($pathString);
 
-            if(!$instance instanceof self) {
+            if (!$instance instanceof self) {
                 throw new FileHelper_Exception(
                     'Invalid class created',
                     sprintf(
@@ -128,7 +128,7 @@ 
     {
         $path = trim($path);
 
-        if(empty($path) || FolderInfo::is_dir($path))
+        if (empty($path) || FolderInfo::is_dir($path))
         {
             return false;
         }
@@ -136,9 +136,9 @@ 
         return is_file($path) || pathinfo($path, PATHINFO_EXTENSION) !== '';
     }
 
-    public function removeExtension(bool $keepPath=false) : string
+    public function removeExtension(bool $keepPath = false) : string
     {
-        if(!$keepPath)
+        if (!$keepPath)
         {
             return (string)pathinfo($this->getName(), PATHINFO_FILENAME);
         }
@@ -163,11 +163,11 @@ 
         return $this->removeExtension();
     }
 
-    public function getExtension(bool $lowercase=true) : string
+    public function getExtension(bool $lowercase = true) : string
     {
         $ext = (string)pathinfo($this->path, PATHINFO_EXTENSION);
 
-        if($lowercase)
+        if ($lowercase)
         {
             $ext = mb_strtolower($ext);
         }
@@ -188,12 +188,12 @@ 
      */
     public function delete() : FileInfo
     {
-        if(!$this->exists())
+        if (!$this->exists())
         {
             return $this;
         }
 
-        if(unlink($this->path))
+        if (unlink($this->path))
         {
             return $this;
         }
@@ -220,7 +220,7 @@ 
     {
         $target = $this->checkCopyPrerequisites($targetPath);
 
-        if(copy($this->path, (string)$target))
+        if (copy($this->path, (string)$target))
         {
             return $target;
         }
@@ -257,7 +257,7 @@ 
         $target = FileHelper::getPathInfo($targetPath);
 
         // It's a file? Then we can use it as-is.
-        if($target instanceof self) {
+        if ($target instanceof self) {
             return $target
                 ->requireIsFile()
                 ->createFolder();
@@ -267,7 +267,7 @@ 
         // but is not a folder: very likely a file without extension.
         // In this case we create an empty file to be able to return
         // a FileInfo instance.
-        if($target instanceof IndeterminatePath)
+        if ($target instanceof IndeterminatePath)
         {
             return $target->convertToFile();
         }
@@ -296,7 +296,7 @@ 
      */
     public function getLineReader() : LineReader
     {
-        if($this->lineReader === null)
+        if ($this->lineReader === null)
         {
             $this->lineReader = new LineReader($this);
         }
@@ -315,7 +315,7 @@ 
 
         $result = file_get_contents($this->getPath());
 
-        if($result !== false) {
+        if ($result !== false) {
             return $result;
         }
 
@@ -337,7 +337,7 @@ 
      */
     public function putContents(string $content) : FileInfo
     {
-        if($this->exists())
+        if ($this->exists())
         {
             $this->requireWritable();
         }
@@ -348,7 +348,7 @@ 
                 ->requireWritable();
         }
 
-        if(file_put_contents($this->path, $content) !== false)
+        if (file_put_contents($this->path, $content) !== false)
         {
             return $this;
         }
@@ -378,7 +378,7 @@ 
      */
     private function createFolder() : FileInfo
     {
-        if(!$this->exists())
+        if (!$this->exists())
         {
             FolderInfo::factory($this->getFolderPath())
                 ->create()

src/ArrayDataCollection.php

Spacing +15 added lines, -15 removed lines

@@ -42,7 +42,7 @@ 
     /**
      * @param array<string,mixed> $data
      */
-    public function __construct(array $data=array())
+    public function __construct(array $data = array())
     {
         $this->data = $data;
     }
@@ -51,9 +51,9 @@ 
      * @param ArrayDataCollection|array<string,mixed>|NULL $data
      * @return ArrayDataCollection
      */
-    public static function create($data=array()) : ArrayDataCollection
+    public static function create($data = array()) : ArrayDataCollection
     {
-        if($data instanceof self) {
+        if ($data instanceof self) {
             return $data;
         }
 
@@ -74,7 +74,7 @@ 
      */
     public function setKeys(array $data) : self
     {
-        foreach($data as $key => $value)
+        foreach ($data as $key => $value)
         {
             $this->setKey($key, $value);
         }
@@ -142,11 +142,11 @@ 
     {
         $value = $this->getKey($name);
 
-        if(is_string($value)) {
+        if (is_string($value)) {
             return $value;
         }
 
-        if(is_numeric($value)) {
+        if (is_numeric($value)) {
             return (string)$value;
         }
 
@@ -165,7 +165,7 @@ 
     {
         $value = $this->getKey($name);
 
-        if(is_numeric($value)) {
+        if (is_numeric($value)) {
             return (int)$value;
         }
 
@@ -187,11 +187,11 @@ 
         $value = $this->getKey($name);
 
         // Does not need to be decoded after all
-        if(is_array($value)) {
+        if (is_array($value)) {
             return $value;
         }
 
-        if(empty($value) || !is_string($value)) {
+        if (empty($value) || !is_string($value)) {
             return array();
         }
 
@@ -202,7 +202,7 @@ 
     {
         $value = $this->getKey($name);
 
-        if(is_array($value)) {
+        if (is_array($value)) {
             return $value;
         }
 
@@ -213,7 +213,7 @@ 
     {
         $value = $this->getKey($name);
 
-        if(is_string($value)) {
+        if (is_string($value)) {
             $value = strtolower($value);
         }
 
@@ -231,7 +231,7 @@ 
     {
         $value = $this->getKey($name);
 
-        if(is_numeric($value)) {
+        if (is_numeric($value)) {
             return (float)$value;
         }
 
@@ -288,11 +288,11 @@ 
     {
         $value = $this->getString($name);
 
-        if(empty($value)) {
+        if (empty($value)) {
             return null;
         }
 
-        if(is_numeric($value)) {
+        if (is_numeric($value)) {
             $date = new DateTime();
             $date->setTimestamp((int)$value);
             return $date;
@@ -374,7 +374,7 @@ 
     {
         $date = $this->getDateTime($name);
 
-        if($date !== null)
+        if ($date !== null)
         {
             return $date->getTimestamp();
         }

src/ConvertHelper.php

Spacing +23 added lines, -23 removed lines

@@ -61,7 +61,7 @@ 
      * @param int $tabSize The amount of spaces per tab.
      * @return string
      */
-    public static function tabs2spaces(string $string, int $tabSize=4) : string
+    public static function tabs2spaces(string $string, int $tabSize = 4) : string
     {
         return ConvertHelper_String::tabs2spaces($string, $tabSize);
     }
@@ -73,7 +73,7 @@ 
     * @param int $tabSize The amount of spaces per tab in the source string.
     * @return string
     */
-    public static function spaces2tabs(string $string, int $tabSize=4) : string
+    public static function spaces2tabs(string $string, int $tabSize = 4) : string
     {
         return ConvertHelper_String::spaces2tabs($string, $tabSize);
     }
@@ -146,7 +146,7 @@ 
     * @deprecated Use the Highlighter class directly instead.
     * @see Highlighter::xml()
     */
-    public static function highlight_xml(string $xml, bool $formatSource=false) : string
+    public static function highlight_xml(string $xml, bool $formatSource = false) : string
     {
         return Highlighter::xml($xml, $formatSource);
     }
@@ -212,11 +212,11 @@ 
      * @param bool $html
      * @return string
      */
-    public static function var_dump($var, bool $html=true) : string
+    public static function var_dump($var, bool $html = true) : string
     {
         $info = parseVariable($var);
         
-        if($html) {
+        if ($html) {
             return $info->toHTML();
         }
         
@@ -231,11 +231,11 @@ 
     * @param bool $html Whether to style the dump as HTML.
     * @return string
     */
-    public static function print_r($var, bool $return=false, bool $html=true) : string
+    public static function print_r($var, bool $return = false, bool $html = true) : string
     {
         $result = parseVariable($var)->enableType()->toString();
         
-        if($html) 
+        if ($html) 
         {
             $result = 
             '<pre style="background:#fff;color:#333;padding:16px;border:solid 1px #bbb;border-radius:4px">'.
@@ -243,7 +243,7 @@ 
             '</pre>';
         }
         
-        if(!$return) 
+        if (!$return) 
         {
             echo $result;
         }
@@ -425,12 +425,12 @@ 
         $output = '';
         $split = str_split($unicodeChar);
         
-        foreach($split as $octet) 
+        foreach ($split as $octet) 
         {
             $ordInt = ord($octet);
             // Convert from int (base 10) to hex (base 16), for PHP \x syntax
             $ordHex = base_convert((string)$ordInt, 10, 16);
-            $output .= '\x' . $ordHex;
+            $output .= '\x'.$ordHex;
         }
         
         return $output;
@@ -658,7 +658,7 @@ 
     * 
     * @see JSHelper::buildRegexStatement()
     */
-    public static function regex2js(string $regex, string $statementType=JSHelper::JS_REGEX_OBJECT) : string
+    public static function regex2js(string $regex, string $statementType = JSHelper::JS_REGEX_OBJECT) : string
     {
         return JSHelper::buildRegexStatement($regex, $statementType);
     }
@@ -679,7 +679,7 @@ 
     * @throws JSONConverterException
     * @see ConvertHelper::ERROR_JSON_ENCODE_FAILED
     */
-    public static function var2json($variable, int $options=0, int $depth=512) : string
+    public static function var2json($variable, int $options = 0, int $depth = 512) : string
     {
         return JSONConverter::var2json($variable, $options, $depth);
     }
@@ -736,12 +736,12 @@ 
     {
         $boms = FileHelper::createUnicodeHandling()->getUTFBOMs();
 
-        foreach($boms as $bomChars)
+        foreach ($boms as $bomChars)
         {
             $length = mb_strlen($bomChars);
             $text = mb_substr($string, 0, $length);
 
-            if($text===$bomChars)
+            if ($text === $bomChars)
             {
                 return mb_substr($string, $length);
             }
@@ -813,7 +813,7 @@ 
     * @see ConvertHelper_TextComparer::OPTION_MAX_LEVENSHTEIN_DISTANCE
     * @see ConvertHelper_TextComparer::OPTION_PRECISION
     */
-    public static function matchString(string $source, string $target, array $options=array()) : float
+    public static function matchString(string $source, string $target, array $options = array()) : float
     {
         return (new ConvertHelper_TextComparer())
             ->setOptions($options)
@@ -891,7 +891,7 @@ 
     * @see ConvertHelper::INTERVAL_HOURS
     * @see ConvertHelper::INTERVAL_DAYS
     */
-    public static function interval2total(DateInterval $interval, string $unit=self::INTERVAL_SECONDS) : int
+    public static function interval2total(DateInterval $interval, string $unit = self::INTERVAL_SECONDS) : int
     {
         return ConvertHelper_DateInterval::toTotal($interval, $unit);
     }
@@ -903,7 +903,7 @@ 
     * @param bool $short
     * @return string|NULL
     */
-    public static function date2dayName(DateTime $date, bool $short=false) : ?string
+    public static function date2dayName(DateTime $date, bool $short = false) : ?string
     {
         return ConvertHelper_Date::toDayName($date, $short);
     }
@@ -923,7 +923,7 @@ 
     * @param bool $short
     * @return string[]
     */
-    public static function getDayNames(bool $short=false) : array
+    public static function getDayNames(bool $short = false) : array
     {
         return ConvertHelper_Date::getDayNames($short);
     }
@@ -1087,7 +1087,7 @@ 
     * @param bool $caseInsensitive
     * @return ConvertHelper_StringMatch[]
     */
-    public static function findString(string $needle, string $haystack, bool $caseInsensitive=false): array
+    public static function findString(string $needle, string $haystack, bool $caseInsensitive = false): array
     {
         return ConvertHelper_String::findString($needle, $haystack, $caseInsensitive);
     }
@@ -1137,17 +1137,17 @@ 
     */
     public static function isInteger($value) : bool
     {
-        if(is_int($value)) {
+        if (is_int($value)) {
             return true;
         }
         
         // booleans get converted to numbers, so they would
         // actually match the regex.
-        if(is_bool($value)) {
+        if (is_bool($value)) {
             return false;
         }
         
-        if(is_string($value) && $value !== '') {
+        if (is_string($value) && $value !== '') {
             return preg_match('/\A-?\d+\z/', $value) === 1;
         }
         
@@ -1213,7 +1213,7 @@ 
      * @param bool $keepKeys
      * @return array<number|string,mixed>
      */
-    public static function arrayRemoveValues(array $sourceArray, array $values, bool $keepKeys=false) : array
+    public static function arrayRemoveValues(array $sourceArray, array $values, bool $keepKeys = false) : array
     {
         return ConvertHelper_Array::removeValues($sourceArray, $values, $keepKeys);
     }

src/Highlighter.php

Spacing +5 added lines, -5 removed lines

@@ -112,7 +112,7 @@ 
      */
     public static function json($subject) : string
     {
-        if(!is_string($subject))
+        if (!is_string($subject))
         {
             $subject = JSONConverter::var2json($subject, JSON_PRETTY_PRINT);
         }
@@ -129,9 +129,9 @@ 
     * @param bool $formatSource Whether to format the source with indentation to make it readable.
     * @return string
     */
-    public static function xml(string $xml, bool $formatSource=false) : string
+    public static function xml(string $xml, bool $formatSource = false) : string
     {
-        if($formatSource)
+        if ($formatSource)
         {
             $dom = new DOMDocument();
             $dom->preserveWhiteSpace = false;
@@ -152,9 +152,9 @@ 
     * @param bool $formatSource
     * @return string
     */
-    public static function html(string $html, bool $formatSource=false) : string
+    public static function html(string $html, bool $formatSource = false) : string
     {
-        if($formatSource)
+        if ($formatSource)
         {
             $dom = new DOMDocument();
             $dom->preserveWhiteSpace = false;

src/ConvertHelper/JSONConverter.php

Spacing +7 added lines, -7 removed lines

@@ -41,7 +41,7 @@ 
      * @throws JSONConverterException
      * @see ConvertHelper::ERROR_JSON_ENCODE_FAILED
      */
-    public static function var2json($variable, int $options=0, int $depth=512) : string
+    public static function var2json($variable, int $options = 0, int $depth = 512) : string
     {
         try
         {
@@ -69,9 +69,9 @@ 
      * @return mixed|NULL
      * @throws JSONConverterException
      */
-    public static function json2var(string $json, bool $assoc=true)
+    public static function json2var(string $json, bool $assoc = true)
     {
-        if(empty($json)) {
+        if (empty($json)) {
             return null;
         }
 
@@ -112,12 +112,12 @@ 
      */
     public static function json2array($json) : array
     {
-        if(is_array($json)) {
+        if (is_array($json)) {
             return $json;
         }
 
         $result = self::json2var($json);
-        if(is_array($result)) {
+        if (is_array($result)) {
             return $result;
         }
 
@@ -165,7 +165,7 @@ 
      * @param int $depth
      * @return string
      */
-    public static function var2jsonSilent($variable, int $options=0, int $depth=512) : string
+    public static function var2jsonSilent($variable, int $options = 0, int $depth = 512) : string
     {
         try
         {
@@ -185,7 +185,7 @@ 
      * @param bool $assoc
      * @return mixed|null
      */
-    public static function json2varSilent(string $json, bool $assoc=true)
+    public static function json2varSilent(string $json, bool $assoc = true)
     {
         try
         {

src/FileHelper/JSONFile.php

Spacing +2 added lines, -2 removed lines

@@ -122,7 +122,7 @@ 
 
     private function convertEncoding(string $contents) : string
     {
-        if(!empty($this->targetEncoding))
+        if (!empty($this->targetEncoding))
         {
             return (string)mb_convert_encoding(
                 $contents,
@@ -144,7 +144,7 @@ 
     {
         $options = 0;
 
-        if($pretty)
+        if ($pretty)
         {
             $options = JSON_PRETTY_PRINT;
         }

src/JSHelper.php

Spacing +21 added lines, -21 removed lines

@@ -86,20 +86,20 @@ 
         $quoteStyle = array_shift($params);
         $method = array_shift($params);
         
-        $call = $method . '(';
+        $call = $method.'(';
         
         $total = count($params);
-        if($total > 0) {
-            for($i=0; $i < $total; $i++) 
+        if ($total > 0) {
+            for ($i = 0; $i < $total; $i++) 
             {
                 $call .= self::phpVariable2JS($params[$i], $quoteStyle);
-                if($i < ($total-1)) {
+                if ($i < ($total - 1)) {
                     $call .= ',';
                 }
             }
         }
         
-        return $call . ');';
+        return $call.');';
     }
 
     /**
@@ -125,7 +125,7 @@ 
      */
     public static function buildVariable(string $varName, $varValue) : string
     {
-        return $varName . "=" . self::phpVariable2JS($varValue) . ';';
+        return $varName."=".self::phpVariable2JS($varValue).';';
     }
 
     /**
@@ -138,7 +138,7 @@ 
      * @return string
      * @throws JSONConverterException
      */
-    public static function phpVariable2JS($variable, int $quoteStyle=self::QUOTE_STYLE_DOUBLE) : string
+    public static function phpVariable2JS($variable, int $quoteStyle = self::QUOTE_STYLE_DOUBLE) : string
     {
         // after much profiling, this variant of the method offers
         // the best performance. Repeat scalar values are cached 
@@ -146,22 +146,22 @@ 
         
         $type = gettype($variable);
         $hash = null;
-        if(is_scalar($variable) === true) 
+        if (is_scalar($variable) === true) 
         {
             $hash = $variable;
         
-            if($hash === true) 
+            if ($hash === true) 
             { 
                 $hash = 'true'; 
             } 
-            else if($hash === false) 
+            else if ($hash === false) 
             { 
                 $hash = 'false'; 
             }
             
             $hash .= '-'.$quoteStyle.'-'.$type;
             
-            if(isset(self::$variableCache[$hash])) {
+            if (isset(self::$variableCache[$hash])) {
                 return self::$variableCache[$hash];
             }
         }
@@ -169,13 +169,13 @@ 
         $result = 'null';
 
         // one gettype call is better than a strict if-else.
-        switch($type) 
+        switch ($type) 
         {
             case 'double':
             case 'string':
                 $string = JSONConverter::var2json($variable);
                 
-                if($quoteStyle === self::QUOTE_STYLE_SINGLE)
+                if ($quoteStyle === self::QUOTE_STYLE_SINGLE)
                 {
                     $string = mb_substr($string, 1, -1);
                     $string = "'".str_replace("'", "\'", $string)."'";
@@ -185,7 +185,7 @@ 
                 break;
                 
             case 'boolean':
-                if($variable === true) {
+                if ($variable === true) {
                     $result = 'true';
                 } else {
                     $result = 'false';
@@ -203,7 +203,7 @@ 
         }
 
         // cache cacheable values
-        if($hash !== null) 
+        if ($hash !== null) 
         {
             self::$variableCache[$hash] = $result;
         }
@@ -236,7 +236,7 @@ 
     {
         self::$elementCounter++;
 
-        return self::$idPrefix . self::$elementCounter;
+        return self::$idPrefix.self::$elementCounter;
     }
     
    /**
@@ -309,11 +309,11 @@ 
      * @see JSHelper::JS_REGEX_OBJECT
      * @see JSHelper::JS_REGEX_JSON
      */
-    public static function buildRegexStatement(string $regex, string $statementType=self::JS_REGEX_OBJECT) : string
+    public static function buildRegexStatement(string $regex, string $statementType = self::JS_REGEX_OBJECT) : string
     {
         $regex = trim($regex);
 
-        if(empty($regex))
+        if (empty($regex))
         {
             throw new JSHelperException(
                 'Empty regex.',
@@ -327,7 +327,7 @@ 
         array_shift($parts);
         
         $modifiers = array_pop($parts);
-        if($modifiers === $separator) {
+        if ($modifiers === $separator) {
             $modifiers = '';
         }
         
@@ -347,7 +347,7 @@ 
         // convert the anchors that are not supported in js regexes
         $format = str_replace(array('\\A', '\\Z', '\\z'), array('^', '$', ''), $format);
         
-        if($statementType === self::JS_REGEX_JSON)
+        if ($statementType === self::JS_REGEX_JSON)
         {
             return ConvertHelper::var2json(array(
                 'format' => $format,
@@ -355,7 +355,7 @@ 
             ));
         }
         
-        if(!empty($modifiers)) {
+        if (!empty($modifiers)) {
             return sprintf(
                 'new RegExp(%s, %s)',
                 ConvertHelper::var2json($format),