Mistralys / application-utils

src/Request/Param/Validator/Json.php

Spacing +5 added lines, -5 removed lines

@@ -29,26 +29,26 @@
     
     protected function _validate()
     {
-        if(!is_string($this->value)) {
+        if (!is_string($this->value)) {
             return '';
         }
         
         $value = trim($this->value);
         
-        if(empty($value)) {
+        if (empty($value)) {
             return '';
         }
         
         // strictly validate for objects?
-        if($this->getBoolOption('arrays') === false)
+        if ($this->getBoolOption('arrays') === false)
         {
-            if(is_object(json_decode($value))) {
+            if (is_object(json_decode($value))) {
                 return $value;
             }
         }
         else
         {
-            if(is_array(json_decode($value, true))) {
+            if (is_array(json_decode($value, true))) {
                 return $value;
             }
         }

Braces +1 added lines, -2 removed lines

@@ -45,8 +45,7 @@
             if(is_object(json_decode($value))) {
                 return $value;
             }
-        }
-        else
+        } else
         {
             if(is_array(json_decode($value, true))) {
                 return $value;

src/Request/Param/Validator/Regex.php

Spacing +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@ 
     
     protected function _validate()
     {
-        if(!is_scalar($this->value)) {
+        if (!is_scalar($this->value)) {
             return null;
         }
         
@@ -35,13 +35,13 @@ 
         // is a boolan, which is converted to an integer when
         // converted to string, which in turn can be validated
         // with a regex.
-        if(is_bool($this->value)) {
+        if (is_bool($this->value)) {
             return null;
         }
         
         $value = (string)$this->value;
         
-        if(preg_match($this->getStringOption('regex'), $value)) {
+        if (preg_match($this->getStringOption('regex'), $value)) {
             return $value;
         }
         

src/Request/Param/Validator/Enum.php

Spacing +1 added lines, -1 removed lines

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

src/VariableInfo/Renderer/String.php

Indentation +3 added lines, -3 removed lines

@@ -6,9 +6,9 @@
 
 abstract class VariableInfo_Renderer_String extends VariableInfo_Renderer
 {
-   /**
-    * @var mixed
-    */
+    /**
+     * @var mixed
+     */
     protected $value;
     
     protected function init()

src/VariableInfo/Renderer/HTML.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
             str_replace(' ', '-', $this->type)
         );
         
-        if($this->info->getBoolOption('prepend-type') && !$this->info->isNull())
+        if ($this->info->getBoolOption('prepend-type') && !$this->info->isNull())
         {
             $typeLabel = '<span style="color:#1c2eb1" class="variable-type">'.$this->info->getType().'</span> ';
             $converted = $typeLabel.' '.$converted;

src/VariableInfo/Renderer/String/Callable.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
     {
         $string = '';
         
-        if(is_string($this->value[0])) 
+        if (is_string($this->value[0])) 
         {
             $string .= $this->value[0].'::';
         } 

Braces +1 added lines, -2 removed lines

@@ -13,8 +13,7 @@
         if(is_string($this->value[0])) 
         {
             $string .= $this->value[0].'::';
-        } 
-        else 
+        } else 
         {
             $string .= get_class($this->value[0]).'->';
         }

src/VariableInfo/Renderer.php

Indentation +14 added lines, -14 removed lines

@@ -6,19 +6,19 @@ 
 
 abstract class VariableInfo_Renderer
 {
-   /**
-    * @var mixed
-    */
+    /**
+     * @var mixed
+     */
     protected $value;
     
-   /**
-    * @var VariableInfo
-    */
+    /**
+     * @var VariableInfo
+     */
     protected $info;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $type;
     
     public function __construct(VariableInfo $info)
@@ -31,11 +31,11 @@ 
     
     abstract protected function init();
 
-   /**
-    * Renders the value to the target format.
-    * 
-    * @return mixed
-    */
+    /**
+     * Renders the value to the target format.
+     * 
+     * @return mixed
+     */
     public function render()
     {
         return $this->_render();

src/XMLHelper/Converter/Decorator.php

Indentation +27 added lines, -27 removed lines

@@ -21,25 +21,25 @@ 
  */
 class XMLHelper_Converter_Decorator implements \JsonSerializable
 {
-   /**
-    * @var \SimpleXMLElement
-    */
+    /**
+     * @var \SimpleXMLElement
+     */
     private $subject;
     
     const DEF_DEPTH = 512;
     
-   /**
-    * @var array
-    */
+    /**
+     * @var array
+     */
     private $options = array(
         '@attributes' => true,
         '@text' => true,
         'depth' => self::DEF_DEPTH
     );
 
-   /**
-    * @var array|string|null
-    */
+    /**
+     * @var array|string|null
+     */
     protected $result = array();
     
     public function __construct(\SimpleXMLElement $element)
@@ -47,36 +47,36 @@ 
         $this->subject = $element;
     }
     
-   /**
-    * Whether to use the `@attributes` key to store element attributes.
-    * 
-    * @param bool $bool
-    * @return XMLHelper_Converter_Decorator
-    */
+    /**
+     * Whether to use the `@attributes` key to store element attributes.
+     * 
+     * @param bool $bool
+     * @return XMLHelper_Converter_Decorator
+     */
     public function useAttributes(bool $bool) : XMLHelper_Converter_Decorator 
     {
         $this->options['@attributes'] = (bool)$bool;
         return $this;
     }
     
-   /**
-    * Whether to use the `@text` key to store the node text.
-    * 
-    * @param bool $bool
-    * @return XMLHelper_Converter_Decorator
-    */
+    /**
+     * Whether to use the `@text` key to store the node text.
+     * 
+     * @param bool $bool
+     * @return XMLHelper_Converter_Decorator
+     */
     public function useText(bool $bool) : XMLHelper_Converter_Decorator 
     {
         $this->options['@text'] = (bool)$bool;
         return $this;
     }
     
-   /**
-    * Set the maximum depth to parse in the document.
-    * 
-    * @param int $depth
-    * @return XMLHelper_Converter_Decorator
-    */
+    /**
+     * Set the maximum depth to parse in the document.
+     * 
+     * @param int $depth
+     * @return XMLHelper_Converter_Decorator
+     */
     public function setDepth(int $depth) : XMLHelper_Converter_Decorator 
     {
         $this->options['depth'] = (int)max(0, $depth);

Spacing +7 added lines, -7 removed lines

@@ -107,13 +107,13 @@ 
     
     protected function detectAttributes()
     {
-        if(!$this->options['@attributes']) {
+        if (!$this->options['@attributes']) {
             return;
         }
         
         $attributes = $this->subject->attributes();
         
-        if(!empty($attributes)) 
+        if (!empty($attributes)) 
         {
             $this->result['@attributes'] = array_map('strval', iterator_to_array($attributes));
         }
@@ -124,7 +124,7 @@ 
         $children = $this->subject;
         $depth = $this->options['depth'] - 1;
         
-        if($depth <= 0) 
+        if ($depth <= 0) 
         {
             $children = [];
         }
@@ -137,9 +137,9 @@ 
             
             $decorator->options = ['depth' => $depth] + $this->options;
             
-            if(isset($this->result[$name])) 
+            if (isset($this->result[$name])) 
             {
-                if(!is_array($this->result[$name])) 
+                if (!is_array($this->result[$name])) 
                 {
                     $this->result[$name] = [$this->result[$name]];
                 }
@@ -158,9 +158,9 @@ 
         // json encode non-whitespace element simplexml text values.
         $text = trim((string)$this->subject);
         
-        if(strlen($text)) 
+        if (strlen($text)) 
         {
-            if($this->options['@text']) 
+            if ($this->options['@text']) 
             {
                 $this->result['@text'] = $text;
             } 

Braces +2 added lines, -4 removed lines

@@ -145,8 +145,7 @@ 
                 }
                 
                 $this->result[$name][] = $decorator;
-            } 
-            else 
+            } else 
             {
                 $this->result[$name] = $decorator;
             }
@@ -163,8 +162,7 @@ 
             if($this->options['@text']) 
             {
                 $this->result['@text'] = $text;
-            } 
-            else 
+            } else 
             {
                 $this->result = $text;
             }

src/FileHelper/FileFinder.php

Indentation +137 added lines, -137 removed lines

@@ -33,24 +33,24 @@ 
     
     const PATH_MODE_STRIP = 'strip';
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $path;
     
-   /**
-    * @var array
-    */
+    /**
+     * @var array
+     */
     protected $found;
     
-   /**
-    * The path must exist when the class is instantiated: its
-    * real path will be determined to work with.
-    * 
-    * @param string $path The absolute path to the target folder.
-    * @throws FileHelper_Exception
-    * @see FileHelper_FileFinder::ERROR_PATH_DOES_NOT_EXIST
-    */
+    /**
+     * The path must exist when the class is instantiated: its
+     * real path will be determined to work with.
+     * 
+     * @param string $path The absolute path to the target folder.
+     * @throws FileHelper_Exception
+     * @see FileHelper_FileFinder::ERROR_PATH_DOES_NOT_EXIST
+     */
     public function __construct(string $path)
     {
         $real = realpath($path);
@@ -82,66 +82,66 @@ 
         );
     }
     
-   /**
-    * Enables extension stripping, to return file names without extension.
-    * 
-    * @return FileHelper_FileFinder
-    */
+    /**
+     * Enables extension stripping, to return file names without extension.
+     * 
+     * @return FileHelper_FileFinder
+     */
     public function stripExtensions() : FileHelper_FileFinder
     {
         return $this->setOption('strip-extensions', true);
     }
     
-   /**
-    * Enables recursing into subfolders.
-    * 
-    * @return FileHelper_FileFinder
-    */
+    /**
+     * Enables recursing into subfolders.
+     * 
+     * @return FileHelper_FileFinder
+     */
     public function makeRecursive() : FileHelper_FileFinder
     {
         return $this->setOption('recursive', true);
     }
     
-   /**
-    * Retrieves all extensions that were added to
-    * the include list.
-    * 
-    * @return array
-    */
+    /**
+     * Retrieves all extensions that were added to
+     * the include list.
+     * 
+     * @return array
+     */
     public function getIncludeExtensions() : array
     {
         return $this->getArrayOption('include-extensions');
     }
     
-   /**
-    * Includes a single extension in the file search: only
-    * files with this extension will be used in the results.
-    * 
-    * NOTE: Included extensions take precedence before excluded
-    * extensions. If any excluded extensions are specified, they
-    * will be ignored.
-    * 
-    * @param string $extension Extension name, without dot (`php` for example).
-    * @return FileHelper_FileFinder
-    * @see FileHelper_FileFinder::includeExtensions()
-    */
+    /**
+     * Includes a single extension in the file search: only
+     * files with this extension will be used in the results.
+     * 
+     * NOTE: Included extensions take precedence before excluded
+     * extensions. If any excluded extensions are specified, they
+     * will be ignored.
+     * 
+     * @param string $extension Extension name, without dot (`php` for example).
+     * @return FileHelper_FileFinder
+     * @see FileHelper_FileFinder::includeExtensions()
+     */
     public function includeExtension(string $extension) : FileHelper_FileFinder
     {
         return $this->includeExtensions(array($extension));
     }
     
-   /**
-    * Includes several extensions in the file search: only
-    * files with these extensions wil be used in the results.
-    * 
-    * NOTE: Included extensions take precedence before excluded
-    * extensions. If any excluded extensions are specified, they
-    * will be ignored.
-    * 
-    * @param array $extensions Extension names, without dot (`php` for example).
-    * @return FileHelper_FileFinder
-    * @see FileHelper_FileFinder::includeExtension()
-    */
+    /**
+     * Includes several extensions in the file search: only
+     * files with these extensions wil be used in the results.
+     * 
+     * NOTE: Included extensions take precedence before excluded
+     * extensions. If any excluded extensions are specified, they
+     * will be ignored.
+     * 
+     * @param array $extensions Extension names, without dot (`php` for example).
+     * @return FileHelper_FileFinder
+     * @see FileHelper_FileFinder::includeExtension()
+     */
     public function includeExtensions(array $extensions) : FileHelper_FileFinder
     {
         $items = $this->getIncludeExtensions();
@@ -152,37 +152,37 @@ 
         return $this;
     }
 
-   /**
-    * Retrieves a list of all extensions currently set as 
-    * excluded from the search.
-    * 
-    * @return array
-    */
+    /**
+     * Retrieves a list of all extensions currently set as 
+     * excluded from the search.
+     * 
+     * @return array
+     */
     public function getExcludeExtensions() : array
     {
         return $this->getArrayOption('exclude-extensions');
     }
     
-   /**
-    * Excludes a single extension from the search.
-    * 
-    * @param string $extension Extension name, without dot (`php` for example).
-    * @return FileHelper_FileFinder
-    * @see FileHelper_FileFinder::excludeExtensions()
-    */
+    /**
+     * Excludes a single extension from the search.
+     * 
+     * @param string $extension Extension name, without dot (`php` for example).
+     * @return FileHelper_FileFinder
+     * @see FileHelper_FileFinder::excludeExtensions()
+     */
     public function excludeExtension(string $extension) : FileHelper_FileFinder
     {
         return $this->excludeExtensions(array($extension));
     }
 
-   /**
-    * Add several extensions to the list of extensions to
-    * exclude from the file search.
-    *  
-    * @param array $extensions Extension names, without dot (`php` for example).
-    * @return FileHelper_FileFinder
-    * @see FileHelper_FileFinder::excludeExtension()
-    */
+    /**
+     * Add several extensions to the list of extensions to
+     * exclude from the file search.
+     *  
+     * @param array $extensions Extension names, without dot (`php` for example).
+     * @return FileHelper_FileFinder
+     * @see FileHelper_FileFinder::excludeExtension()
+     */
     public function excludeExtensions(array $extensions) : FileHelper_FileFinder
     {
         $items = $this->getExcludeExtensions();
@@ -193,52 +193,52 @@ 
         return $this;
     }
     
-   /**
-    * In this mode, the entire path to the file will be stripped,
-    * leaving only the file name in the files list.
-    * 
-    * @return FileHelper_FileFinder
-    */
+    /**
+     * In this mode, the entire path to the file will be stripped,
+     * leaving only the file name in the files list.
+     * 
+     * @return FileHelper_FileFinder
+     */
     public function setPathmodeStrip() : FileHelper_FileFinder
     {
         return $this->setPathmode(self::PATH_MODE_STRIP);
     }
     
-   /**
-    * In this mode, only the path relative to the source folder
-    * will be included in the files list.
-    * 
-    * @return FileHelper_FileFinder
-    */
+    /**
+     * In this mode, only the path relative to the source folder
+     * will be included in the files list.
+     * 
+     * @return FileHelper_FileFinder
+     */
     public function setPathmodeRelative() : FileHelper_FileFinder
     {
         return $this->setPathmode(self::PATH_MODE_RELATIVE);
     }
     
-   /**
-    * In this mode, the full, absolute paths to the files will
-    * be included in the files list.
-    * 
-    * @return FileHelper_FileFinder
-    */
+    /**
+     * In this mode, the full, absolute paths to the files will
+     * be included in the files list.
+     * 
+     * @return FileHelper_FileFinder
+     */
     public function setPathmodeAbsolute() : FileHelper_FileFinder
     {
         return $this->setPathmode(self::PATH_MODE_ABSOLUTE);
     }
     
-   /**
-    * This sets a character or string to replace the slashes
-    * in the paths with. 
-    * 
-    * This is used for example in the `getPHPClassNames()` 
-    * method, to return files from subfolders as class names
-    * using the "_" character:
-    * 
-    * Subfolder/To/File.php => Subfolder_To_File.php
-    * 
-    * @param string $character
-    * @return \AppUtils\FileHelper_FileFinder
-    */
+    /**
+     * This sets a character or string to replace the slashes
+     * in the paths with. 
+     * 
+     * This is used for example in the `getPHPClassNames()` 
+     * method, to return files from subfolders as class names
+     * using the "_" character:
+     * 
+     * Subfolder/To/File.php => Subfolder_To_File.php
+     * 
+     * @param string $character
+     * @return \AppUtils\FileHelper_FileFinder
+     */
     public function setSlashReplacement(string $character) : FileHelper_FileFinder
     {
         return $this->setOption('slash-replacement', $character);
@@ -249,12 +249,12 @@ 
         return $this->setOption('pathmode', $mode);
     }
     
-   /**
-    * Retrieves a list of all matching file names/paths,
-    * depending on the selected options.
-    * 
-    * @return array
-    */
+    /**
+     * Retrieves a list of all matching file names/paths,
+     * depending on the selected options.
+     * 
+     * @return array
+     */
     public function getAll() : array
     {
         $this->find($this->path, true);
@@ -262,24 +262,24 @@ 
         return $this->found;
     }
     
-   /**
-    * Retrieves only PHP files. Can be combined with other
-    * options like enabling recursion into subfolders.
-    * 
-    * @return array
-    */
+    /**
+     * Retrieves only PHP files. Can be combined with other
+     * options like enabling recursion into subfolders.
+     * 
+     * @return array
+     */
     public function getPHPFiles() : array
     {
         $this->includeExtensions(array('php'));
         return $this->getAll();
     }
     
-   /**
-    * Generates PHP class names from file paths: it replaces
-    * slashes with underscores, and removes file extensions.
-    * 
-    * @return array An array of PHP file names without extension.
-    */
+    /**
+     * Generates PHP class names from file paths: it replaces
+     * slashes with underscores, and removes file extensions.
+     * 
+     * @return array An array of PHP file names without extension.
+     */
     public function getPHPClassNames() : array
     {
         $this->includeExtensions(array('php'));
@@ -350,13 +350,13 @@ 
         return $path;
     }
     
-   /**
-    * Checks whether the specified extension is allowed 
-    * with the current settings.
-    * 
-    * @param string $extension
-    * @return bool
-    */
+    /**
+     * Checks whether the specified extension is allowed 
+     * with the current settings.
+     * 
+     * @param string $extension
+     * @return bool
+     */
     protected function filterExclusion(string $extension) : bool
     {
         $include = $this->getOption('include-extensions');
@@ -378,12 +378,12 @@ 
         return true;
     }
     
-   /**
-    * Adjusts the path according to the selected path mode.
-    * 
-    * @param string $path
-    * @return string
-    */
+    /**
+     * Adjusts the path according to the selected path mode.
+     * 
+     * @param string $path
+     * @return string
+     */
     protected function filterPath(string $path) : string
     {
         switch($this->getStringOption('pathmode'))

Spacing +17 added lines, -17 removed lines

@@ -7,7 +7,7 @@ 
  * @see FileHelper_FileFinder
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace AppUtils;
 
@@ -55,7 +55,7 @@ 
     {
         $real = realpath($path);
         
-        if($real === false) 
+        if ($real === false) 
         {
             throw new FileHelper_Exception(
                 'Target path does not exist',
@@ -290,22 +290,22 @@ 
         return $this->getAll();
     }
     
-    protected function find(string $path, bool $isRoot=false) : void
+    protected function find(string $path, bool $isRoot = false) : void
     {
-        if($isRoot) {
+        if ($isRoot) {
             $this->found = array();
         }
         
         $recursive = $this->getBoolOption('recursive');
         
         $d = new \DirectoryIterator($path);
-        foreach($d as $item)
+        foreach ($d as $item)
         {
             $pathname = $item->getPathname();
             
-            if($item->isDir())
+            if ($item->isDir())
             {
-                if($recursive && !$item->isDot()) {
+                if ($recursive && !$item->isDot()) {
                     $this->find($pathname);
                 }
                 
@@ -314,7 +314,7 @@ 
             
             $file = $this->filterFile($pathname);
             
-            if($file !== null) 
+            if ($file !== null) 
             {
                 $this->found[] = $file;
             }
@@ -327,23 +327,23 @@ 
         
         $extension = FileHelper::getExtension($path);
         
-        if(!$this->filterExclusion($extension)) {
+        if (!$this->filterExclusion($extension)) {
             return null;
         }
         
         $path = $this->filterPath($path);
         
-        if($this->getOption('strip-extensions') === true)
+        if ($this->getOption('strip-extensions') === true)
         {
             $path = str_replace('.'.$extension, '', $path);
         }
         
-        if($path === '') {
+        if ($path === '') {
             return null;
         }
         
         $replace = $this->getOption('slash-replacement');
-        if(!empty($replace)) {
+        if (!empty($replace)) {
             $path = str_replace('/', $replace, $path);
         }
         
@@ -362,15 +362,15 @@ 
         $include = $this->getOption('include-extensions');
         $exclude = $this->getOption('exclude-extensions');
         
-        if(!empty($include))
+        if (!empty($include))
         {
-            if(!in_array($extension, $include)) {
+            if (!in_array($extension, $include)) {
                 return false;
             }
         }
-        else if(!empty($exclude))
+        else if (!empty($exclude))
         {
-            if(in_array($extension, $exclude)) {
+            if (in_array($extension, $exclude)) {
                 return false;
             }
         }
@@ -386,7 +386,7 @@ 
     */
     protected function filterPath(string $path) : string
     {
-        switch($this->getStringOption('pathmode'))
+        switch ($this->getStringOption('pathmode'))
         {
             case self::PATH_MODE_STRIP:
                 return basename($path);

Braces +1 added lines, -2 removed lines

@@ -367,8 +367,7 @@
             if(!in_array($extension, $include)) {
                 return false;
             }
-        }
-        else if(!empty($exclude))
+        } else if(!empty($exclude))
         {
             if(in_array($extension, $exclude)) {
                 return false;