Mistralys / application-utils

src/IniHelper.php

Indentation +77 added lines, -77 removed lines

@@ -62,10 +62,10 @@ 
         }
     }
     
-   /**
-    * The end of line character used in the INI source string.
-    * @return string
-    */
+    /**
+     * The end of line character used in the INI source string.
+     * @return string
+     */
     public function getEOLChar() : string
     {
         return $this->eol;
@@ -99,35 +99,35 @@ 
         );
     }
     
-   /**
-    * Factory method: Creates a new ini helper instance from an ini string.
-    * 
-    * @param string $iniContent
-    * @return IniHelper
-    */
+    /**
+     * Factory method: Creates a new ini helper instance from an ini string.
+     * 
+     * @param string $iniContent
+     * @return IniHelper
+     */
     public static function createFromString(string $iniContent) : IniHelper
     {
         return new IniHelper($iniContent);
     }
     
-   /**
-    * Factory method: Creates a new empty ini helper.
-    *  
-    * @return IniHelper
-    */
+    /**
+     * Factory method: Creates a new empty ini helper.
+     *  
+     * @return IniHelper
+     */
     public static function createNew() : IniHelper
     {
         return self::createFromString('');
     }
     
-   /**
-    * Adds a new data section, and returns the section instance.
-    * If a section with the name already exists, returns that
-    * section instead of creating a new one.
-    *  
-    * @param string $name
-    * @return IniHelper_Section
-    */
+    /**
+     * Adds a new data section, and returns the section instance.
+     * If a section with the name already exists, returns that
+     * section instead of creating a new one.
+     *  
+     * @param string $name
+     * @return IniHelper_Section
+     */
     public function addSection(string $name) : IniHelper_Section
     {
         if(!isset($this->sections[$name])) {
@@ -137,22 +137,22 @@ 
         return $this->sections[$name];
     }
     
-   /**
-    * Retrieves a section by its name, if it exists.
-    * 
-    * @param string $name
-    * @return IniHelper_Section|NULL
-    */
+    /**
+     * Retrieves a section by its name, if it exists.
+     * 
+     * @param string $name
+     * @return IniHelper_Section|NULL
+     */
     public function getSection(string $name) : ?IniHelper_Section
     {
         return $this->sections[$name] ?? null;
     }
     
-   /**
-    * Gets the data from the INI file as an associative array.
-    * 
-    * @return array<string,mixed>
-    */
+    /**
+     * Gets the data from the INI file as an associative array.
+     * 
+     * @return array<string,mixed>
+     */
     public function toArray() : array
     {
         $result = array();
@@ -172,17 +172,17 @@ 
         return $result;
     }
     
-   /**
-    * Saves the INI content to the target file.
-    * 
-    * @param string $filePath
-    * @return IniHelper
-    * @throws FileHelper_Exception
-    * 
-    * @see FileHelper::ERROR_SAVE_FOLDER_NOT_WRITABLE
-    * @see FileHelper::ERROR_SAVE_FILE_NOT_WRITABLE
-    * @see FileHelper::ERROR_SAVE_FILE_WRITE_FAILED
-    */
+    /**
+     * Saves the INI content to the target file.
+     * 
+     * @param string $filePath
+     * @return IniHelper
+     * @throws FileHelper_Exception
+     * 
+     * @see FileHelper::ERROR_SAVE_FOLDER_NOT_WRITABLE
+     * @see FileHelper::ERROR_SAVE_FILE_NOT_WRITABLE
+     * @see FileHelper::ERROR_SAVE_FILE_WRITE_FAILED
+     */
     public function saveToFile(string $filePath) : IniHelper
     {
         FileHelper::saveFile($filePath, $this->saveToString());
@@ -190,11 +190,11 @@ 
         return $this;
     }
     
-   /**
-    * Returns the INI content as string.
-    * 
-    * @return string
-    */
+    /**
+     * Returns the INI content as string.
+     * 
+     * @return string
+     */
     public function saveToString() : string
     {
         $parts = array();
@@ -207,15 +207,15 @@ 
         return implode($this->eol, $parts);
     }
     
-   /**
-    * Sets or adds the value of a setting in the INI content.
-    * If the setting does not exist, it is added. Otherwise,
-    * the existing value is overwritten.
-    * 
-    * @param string $path A variable path, either <code>varname</code> or <code>section.varname</code>.
-    * @param mixed $value
-    * @return IniHelper
-    */
+    /**
+     * Sets or adds the value of a setting in the INI content.
+     * If the setting does not exist, it is added. Otherwise,
+     * the existing value is overwritten.
+     * 
+     * @param string $path A variable path, either <code>varname</code> or <code>section.varname</code>.
+     * @param mixed $value
+     * @return IniHelper
+     */
     public function setValue(string $path, $value) : IniHelper
     {
         $info = $this->parsePath($path);
@@ -239,12 +239,12 @@ 
         return $this;
     }
     
-   /**
-    * Checks whether a section with the specified name exists.
-    * 
-    * @param string $name
-    * @return bool
-    */
+    /**
+     * Checks whether a section with the specified name exists.
+     * 
+     * @param string $name
+     * @return bool
+     */
     public function sectionExists(string $name) : bool
     {
         foreach($this->sections as $section) {
@@ -256,23 +256,23 @@ 
         return false;
     }
     
-   /**
-    * Retrieves the default section, which is used to add
-    * values in the root of the document.
-    * 
-    * @return IniHelper_Section
-    */
+    /**
+     * Retrieves the default section, which is used to add
+     * values in the root of the document.
+     * 
+     * @return IniHelper_Section
+     */
     public function getDefaultSection() : IniHelper_Section
     {
         return $this->addSection(self::SECTION_DEFAULT);
     }
     
-   /**
-    * Retrieves all variable lines for the specified path.
-    * 
-    * @param string $path A variable path. Either <code>varname</code> or <code>section.varname</code>.
-    * @return INILine[]
-    */
+    /**
+     * Retrieves all variable lines for the specified path.
+     * 
+     * @param string $path A variable path. Either <code>varname</code> or <code>section.varname</code>.
+     * @return INILine[]
+     */
     public function getLinesByVariable(string $path) : array
     {
         $info = $this->parsePath($path);

Spacing +12 added lines, -12 removed lines

@@ -39,12 +39,12 @@ 
     {
         $section = $this->addSection(self::SECTION_DEFAULT);
         
-        if(empty($iniString)) {
+        if (empty($iniString)) {
             return;
         }
         
         $eol = ConvertHelper::detectEOLCharacter($iniString);
-        if($eol !== null) {
+        if ($eol !== null) {
             $this->eol = $eol->getCharacter();
         }
         
@@ -54,7 +54,7 @@ 
         {
             $line = new INILine($value, $index);
             
-            if($line->isSection()) {
+            if ($line->isSection()) {
                 $section = $this->addSection($line->getSectionName());
             }
 
@@ -85,7 +85,7 @@ 
         $iniPath = FileHelper::requireFileExists($iniPath);
         
         $content = file_get_contents($iniPath);
-        if($content !== false) {
+        if ($content !== false) {
             return self::createFromString($content);
         }
         
@@ -130,7 +130,7 @@ 
     */
     public function addSection(string $name) : IniHelper_Section
     {
-        if(!isset($this->sections[$name])) {
+        if (!isset($this->sections[$name])) {
             $this->sections[$name] = new IniHelper_Section($this, $name);
         }
         
@@ -157,9 +157,9 @@ 
     {
         $result = array();
         
-        foreach($this->sections as $section)
+        foreach ($this->sections as $section)
         {
-            if($section->isDefault()) 
+            if ($section->isDefault()) 
             {
                 $result = array_merge($result, $section->toArray());
             } 
@@ -199,7 +199,7 @@ 
     {
         $parts = array();
         
-        foreach($this->sections as $section)
+        foreach ($this->sections as $section)
         {
             $parts[] = $section->toString();
         }
@@ -247,8 +247,8 @@ 
     */
     public function sectionExists(string $name) : bool
     {
-        foreach($this->sections as $section) {
-            if($section->getName() === $name) {
+        foreach ($this->sections as $section) {
+            if ($section->getName() === $name) {
                 return true;
             }
         }
@@ -277,7 +277,7 @@ 
     {
         $info = $this->parsePath($path);
         
-        if(!$this->sectionExists($info['section'])) {
+        if (!$this->sectionExists($info['section'])) {
             return array();
         }
         
@@ -292,7 +292,7 @@ 
     {
         $parts = explode($this->pathSeparator, $path);
         
-        if(count($parts) === 1)
+        if (count($parts) === 1)
         {
             return array(
                 'section' => self::SECTION_DEFAULT,

src/ConvertHelper/WordSplitter.php

Spacing +9 added lines, -9 removed lines

@@ -27,14 +27,14 @@ 
         $this->subject = $subject;
     }
 
-    public function setRemoveDuplicates(bool $remove=true, bool $caseInsensitive=false) : self
+    public function setRemoveDuplicates(bool $remove = true, bool $caseInsensitive = false) : self
     {
         $this->removeDuplicates = $remove;
         $this->duplicatesCaseInsensitive = $caseInsensitive;
         return $this;
     }
 
-    public function setSorting(bool $sorting=true) : self
+    public function setSorting(bool $sorting = true) : self
     {
         $this->sorting = $sorting;
         return $this;
@@ -55,11 +55,11 @@ 
 
         $words = $this->filterEmpty($words);
 
-        if($this->removeDuplicates) {
+        if ($this->removeDuplicates) {
             $words = $this->filterDuplicates($words);
         }
 
-        if($this->sorting) {
+        if ($this->sorting) {
             usort($words, 'strnatcasecmp');
         }
 
@@ -72,7 +72,7 @@ 
      */
     private function filterDuplicates(array $words) : array
     {
-        if($this->duplicatesCaseInsensitive) {
+        if ($this->duplicatesCaseInsensitive) {
             return $this->filterDuplicatesCaseInsensitive($words);
         }
 
@@ -87,7 +87,7 @@ 
     {
         return array_intersect_key(
             $array,
-            array_unique( array_map( "strtolower", $array ) )
+            array_unique(array_map("strtolower", $array))
         );
     }
 
@@ -99,13 +99,13 @@ 
     {
         $keep = array();
 
-        foreach($words as $word)
+        foreach ($words as $word)
         {
-            if(empty($word)) {
+            if (empty($word)) {
                 continue;
             }
 
-            if(mb_strlen($word) < $this->minWordLength) {
+            if (mb_strlen($word) < $this->minWordLength) {
                 continue;
             }
 

src/IniHelper/Section.php

Indentation +47 added lines, -47 removed lines

@@ -26,9 +26,9 @@ 
     protected IniHelper $ini;
     protected string $name;
     
-   /**
-    * @var INILine[]
-    */
+    /**
+     * @var INILine[]
+     */
     protected array $lines = array();
     
     public function __construct(IniHelper $ini, string $name)
@@ -37,33 +37,33 @@ 
         $this->name = $name;
     }
     
-   /**
-    * The section's name.
-    * @return string
-    */
+    /**
+     * The section's name.
+     * @return string
+     */
     public function getName() : string
     {
         return $this->name;
     }
     
-   /**
-    * Whether this is the default section: this 
-    * is used internally to store all variables that
-    * are not in any specific section.
-    * 
-    * @return bool
-    */
+    /**
+     * Whether this is the default section: this 
+     * is used internally to store all variables that
+     * are not in any specific section.
+     * 
+     * @return bool
+     */
     public function isDefault() : bool
     {
         return $this->name === IniHelper::SECTION_DEFAULT;
     }
     
-   /**
-    * Adds a line instance to the section.
-    * 
-    * @param INILine $line
-    * @return IniHelper_Section
-    */
+    /**
+     * Adds a line instance to the section.
+     * 
+     * @param INILine $line
+     * @return IniHelper_Section
+     */
     public function addLine(INILine $line) : IniHelper_Section
     {
         $this->lines[] = $line;
@@ -71,12 +71,12 @@ 
         return $this;
     }
     
-   /**
-    * Converts the values contained in the section into 
-    * an associative array.
-    * 
-    * @return array<string,array<int,string>>
-    */
+    /**
+     * Converts the values contained in the section into 
+     * an associative array.
+     * 
+     * @return array<string,array<int,string>>
+     */
     public function toArray() : array
     {
         $result = array();
@@ -136,12 +136,12 @@ 
         return implode($this->ini->getEOLChar(), $lines);
     }
 
-   /**
-    * Deletes a line from the section.
-    * 
-    * @param INILine $toDelete
-    * @return IniHelper_Section
-    */
+    /**
+     * Deletes a line from the section.
+     * 
+     * @param INILine $toDelete
+     * @return IniHelper_Section
+     */
     public function deleteLine(INILine $toDelete) : IniHelper_Section
     {
         $keep = array();
@@ -226,15 +226,15 @@ 
         return $this;
     }
     
-   /**
-    * Adds a variable value to the section. Unlike setValue(), this
-    * will not overwrite any existing value. If the name is an existing
-    * variable name, it will be converted to duplicate keys.
-    * 
-    * @param string $name
-    * @param mixed $value If this is an array, it will be treated as duplicate keys, and all values that are not present yet will be added.
-    * @return IniHelper_Section
-    */
+    /**
+     * Adds a variable value to the section. Unlike setValue(), this
+     * will not overwrite any existing value. If the name is an existing
+     * variable name, it will be converted to duplicate keys.
+     * 
+     * @param string $name
+     * @param mixed $value If this is an array, it will be treated as duplicate keys, and all values that are not present yet will be added.
+     * @return IniHelper_Section
+     */
     public function addValue(string $name, $value) : IniHelper_Section
     {
         // array value? Treat it as duplicate keys.
@@ -297,12 +297,12 @@ 
     }
     
     
-   /**
-    * Retrieves all lines for the specified variable name.
-    *  
-    * @param string $name
-    * @return INILine[]
-    */
+    /**
+     * Retrieves all lines for the specified variable name.
+     *  
+     * @param string $name
+     * @return INILine[]
+     */
     public function getLinesByVariable(string $name) : array
     {
         $result = array();

Spacing +24 added lines, -24 removed lines

@@ -81,15 +81,15 @@ 
     {
         $result = array();
         
-        foreach($this->lines as $line)
+        foreach ($this->lines as $line)
         {
-            if(!$line->isValue()) {
+            if (!$line->isValue()) {
                 continue;
             }
 
             $name = $line->getVarName();
             
-            if(!isset($result[$name])) 
+            if (!isset($result[$name])) 
             {
                 $result[$name] = $line->getVarValue();
                 continue;
@@ -98,7 +98,7 @@ 
             // name exists in collection? Then this is a
             // duplicate key, and we need to convert it to
             // an indexed array of values.
-            if(!is_array($result[$name])) 
+            if (!is_array($result[$name])) 
             {
                 $result[$name] = array($result[$name]);
             }
@@ -118,15 +118,15 @@ 
     public function toString() : string
     {
         $lines = array();
-        if(!$this->isDefault()) 
+        if (!$this->isDefault()) 
         {
             $lines[] = '['.$this->getName().']';
         }
         
-        foreach($this->lines as $line) 
+        foreach ($this->lines as $line) 
         {
             // we already did this
-            if($line->isSection()) {
+            if ($line->isSection()) {
                 continue;
             }
             
@@ -146,9 +146,9 @@ 
     {
         $keep = array();
         
-        foreach($this->lines as $line)
+        foreach ($this->lines as $line)
         {
-            if($line !== $toDelete) {
+            if ($line !== $toDelete) {
                 $keep[] = $line;
             }
         }
@@ -174,23 +174,23 @@ 
         // Removes any superfluous values that may
         // already exist, if there are more than the
         // new set of values.
-        if(is_array($value))
+        if (is_array($value))
         {
             $values = array_values($value);
             $amountNew = count($values);
             $amountExisting = count($lines);
             
             $max = $amountNew;
-            if($amountExisting > $max) {
+            if ($amountExisting > $max) {
                 $max = $amountExisting;
             }
             
-            for($i=0; $i < $max; $i++) 
+            for ($i = 0; $i < $max; $i++) 
             {
                 // new value exists
-                if(isset($values[$i]))
+                if (isset($values[$i]))
                 {
-                    if(isset($lines[$i])) {
+                    if (isset($lines[$i])) {
                         $lines[$i]->setValue($values[$i]);
                     } else {
                         $this->addValueLine($name, $values[$i]);
@@ -208,12 +208,12 @@ 
         else
         {
             // remove all superfluous lines
-            if(!empty($lines))
+            if (!empty($lines))
             {
                 $line = array_shift($lines); // keep only the first line
                 $line->setValue($value);
                 
-                foreach($lines as $delete) {
+                foreach ($lines as $delete) {
                     $this->deleteLine($delete);
                 }
             }
@@ -238,11 +238,11 @@ 
     public function addValue(string $name, $value) : IniHelper_Section
     {
         // array value? Treat it as duplicate keys.
-        if(is_array($value))
+        if (is_array($value))
         {
             $values = array_values($value);
             
-            foreach($values as $setValue)
+            foreach ($values as $setValue)
             {
                 $this->addValue($name, $setValue);
             }
@@ -252,7 +252,7 @@ 
         
         $lines = $this->getLinesByVariable($name);
         
-        if(empty($lines))
+        if (empty($lines))
         {
             $this->addValueLine($name, $value);
         }
@@ -260,15 +260,15 @@ 
         {
             $found = false;
             
-            foreach($lines as $line)
+            foreach ($lines as $line)
             {
-                if($line->getVarValue() === $value) {
+                if ($line->getVarValue() === $value) {
                     $found = $line;
                     break;
                 }
             }
             
-            if(!$found)
+            if (!$found)
             {
                 $this->addValueLine($name, $value);
             }
@@ -307,9 +307,9 @@ 
     {
         $result = array();
         
-        foreach($this->lines as $line)
+        foreach ($this->lines as $line)
         {
-            if($line->isValue() && $line->getVarName() === $name) {
+            if ($line->isValue() && $line->getVarName() === $name) {
                 $result[] = $line;
             }
         }

src/Request/Param/Validator.php

Indentation +3 added lines, -3 removed lines

@@ -27,9 +27,9 @@
     protected RequestParam $param;
     protected bool $isSubvalue = false;
 
-   /**
-    * @var mixed|NULL
-    */
+    /**
+     * @var mixed|NULL
+     */
     protected $value;
     
     public function __construct(RequestParam $param, bool $subval)

src/Request/Param/Filter/String.php

Spacing +1 added lines, -1 removed lines

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

src/Request/Param/Filter/CommaSeparated.php

Spacing +6 added lines, -6 removed lines

@@ -26,11 +26,11 @@ 
      */
     protected function _filter() : array
     {
-        if(is_array($this->value)) {
+        if (is_array($this->value)) {
             return $this->value;
         }
         
-        if($this->value === '' || !is_string($this->value)) {
+        if ($this->value === '' || !is_string($this->value)) {
             return array();
         }
         
@@ -38,19 +38,19 @@ 
         $stripEmptyEntries = $this->getBoolOption('stripEmptyEntries');
         $result = explode(',', $this->value);
         
-        if(!$trimEntries && !$stripEmptyEntries) {
+        if (!$trimEntries && !$stripEmptyEntries) {
             return $result;
         }
         
         $keep = array();
         
-        foreach($result as $entry)
+        foreach ($result as $entry)
         {
-            if($trimEntries === true) {
+            if ($trimEntries === true) {
                 $entry = trim($entry);
             }
             
-            if($stripEmptyEntries === true && $entry === '') {
+            if ($stripEmptyEntries === true && $entry === '') {
                 continue;
             }
             

src/Request/Param/Validator/Enum.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
      */
     protected function _validate()
     {
-        if(in_array($this->value, $this->getArrayOption('values'), true)) {
+        if (in_array($this->value, $this->getArrayOption('values'), true)) {
             return $this->value;
         }
         

src/Request/Param/Validator/Integer.php

Spacing +1 added lines, -1 removed lines

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

src/Request/Param/Validator/Alpha.php

Spacing +2 added lines, -2 removed lines

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