Mistralys / application-utils

src/FileHelper/FolderTree.php

Spacing +6 added lines, -6 removed lines

@@ -22,7 +22,7 @@ 
     {
         $info = FileHelper::getFolderInfo($rootFolder);
 
-        if(!$info->exists())
+        if (!$info->exists())
         {
             return true;
         }
@@ -31,7 +31,7 @@ 
 
         foreach ($d as $item)
         {
-            if(self::processDeleteItem($item) === false)
+            if (self::processDeleteItem($item) === false)
             {
                 return false;
             }
@@ -90,11 +90,11 @@ 
     {
         $target = FileHelper::createFolder($target);
 
-        $d =  $source->requireIsFolder()->getIterator();
+        $d = $source->requireIsFolder()->getIterator();
 
         foreach ($d as $item)
         {
-            if($item->isDot())
+            if ($item->isDot())
             {
                 continue;
             }
@@ -115,9 +115,9 @@ 
 
         if ($item->isFolder())
         {
-            self::copy($item, $target . '/' . $item->getName());
+            self::copy($item, $target.'/'.$item->getName());
         }
-        else if($item->isFile())
+        else if ($item->isFile())
         {
             $item
                 ->requireIsFile()

Braces +2 added lines, -4 removed lines

@@ -69,8 +69,7 @@ 
             try
             {
                 FileHelper::deleteFile($itemPath);
-            }
-            catch (FileHelper_Exception $e)
+            } catch (FileHelper_Exception $e)
             {
                 return false;
             }
@@ -116,8 +115,7 @@ 
         if ($item->isFolder())
         {
             self::copy($item, $target . '/' . $item->getName());
-        }
-        else if($item->isFile())
+        } else if($item->isFile())
         {
             $item
                 ->requireIsFile()

src/FileHelper/UploadFileSizeInfo.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
         $unit = preg_replace('/[^bkmgtpezy]/i', '', $size); // Remove the non-unit characters from the size.
         $result = (float)preg_replace('/[^0-9\.]/', '', $size); // Remove the non-numeric characters from the size.
 
-        if($unit)
+        if ($unit)
         {
             // Find the position of the unit in the ordered string which is the power of magnitude to multiply a kilobyte by.
             return (int)round($result * (1024 ** stripos('bkmgtpezy', $unit[0])));

src/FileHelper/PathRelativizer.php

Spacing +6 added lines, -6 removed lines

@@ -18,7 +18,7 @@ 
      * @param int $depth The folder depth to reduce the path to
      * @return string
      */
-    public static function relativizeByDepth(string $path, int $depth=2) : string
+    public static function relativizeByDepth(string $path, int $depth = 2) : string
     {
         $path = FileHelper::normalizePath($path);
 
@@ -26,17 +26,17 @@ 
         $tokens = array_filter($tokens); // remove empty entries (trailing slash for example)
         $tokens = array_values($tokens); // re-index keys
 
-        if(empty($tokens)) {
+        if (empty($tokens)) {
             return '';
         }
 
         // remove the drive if present
-        if(strpos($tokens[0], ':') !== false) {
+        if (strpos($tokens[0], ':') !== false) {
             array_shift($tokens);
         }
 
         // path was only the drive
-        if(count($tokens) === 0) {
+        if (count($tokens) === 0) {
             return '';
         }
 
@@ -45,8 +45,8 @@ 
 
         // reduce the path to the specified depth
         $length = count($tokens);
-        if($length > $depth) {
-            $tokens = array_slice($tokens, $length-$depth);
+        if ($length > $depth) {
+            $tokens = array_slice($tokens, $length - $depth);
         }
 
         // append the last element again

src/FileHelper/FileFinder.php

Indentation +130 added lines, -130 removed lines

@@ -43,20 +43,20 @@ 
 
     protected FolderInfo $path;
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected array $found = array();
     
-   /**
-    * The path must exist when the class is instantiated: its
-    * real path will be determined to work with.
-    * 
-    * @param string|PathInfoInterface|DirectoryIterator $path The absolute path to the target folder.
-    *
-    * @throws FileHelper_Exception
-    * @see FileHelper::ERROR_PATH_IS_NOT_A_FOLDER
-    */
+    /**
+     * The path must exist when the class is instantiated: its
+     * real path will be determined to work with.
+     * 
+     * @param string|PathInfoInterface|DirectoryIterator $path The absolute path to the target folder.
+     *
+     * @throws FileHelper_Exception
+     * @see FileHelper::ERROR_PATH_IS_NOT_A_FOLDER
+     */
     public function __construct($path)
     {
         $this->path = AbstractPathInfo::resolveType($path)->requireExists()->requireIsFolder();
@@ -74,11 +74,11 @@ 
         );
     }
     
-   /**
-    * Enables extension stripping, to return file names without extension.
-    * 
-    * @return FileFinder
-    */
+    /**
+     * Enables extension stripping, to return file names without extension.
+     * 
+     * @return FileFinder
+     */
     public function stripExtensions() : FileFinder
     {
         return $this->setOption('strip-extensions', true);
@@ -95,46 +95,46 @@ 
         return $this->setOption('recursive', $enabled);
     }
     
-   /**
-    * Retrieves all extensions that were added to
-    * the list of included extensions.
-    * 
-    * @return string[]
-    */
+    /**
+     * Retrieves all extensions that were added to
+     * the list of included extensions.
+     * 
+     * @return string[]
+     */
     public function getIncludeExtensions() : array
     {
         return $this->getArrayOption(self::OPTION_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 FileFinder
-    * @see 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 FileFinder
+     * @see FileFinder::includeExtensions()
+     */
     public function includeExtension(string $extension) : 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 string[] $extensions Extension names, without dot (`php` for example).
-    * @return FileFinder
-    * @see 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 string[] $extensions Extension names, without dot (`php` for example).
+     * @return FileFinder
+     * @see FileFinder::includeExtension()
+     */
     public function includeExtensions(array $extensions) : FileFinder
     {
         $items = $this->getIncludeExtensions();
@@ -145,37 +145,37 @@ 
         return $this;
     }
 
-   /**
-    * Retrieves a list of all extensions currently set as 
-    * excluded from the search.
-    * 
-    * @return string[]
-    */
+    /**
+     * Retrieves a list of all extensions currently set as 
+     * excluded from the search.
+     * 
+     * @return string[]
+     */
     public function getExcludeExtensions() : array
     {
         return $this->getArrayOption(self::OPTION_EXCLUDE_EXTENSIONS);
     }
     
-   /**
-    * Excludes a single extension from the search.
-    * 
-    * @param string $extension Extension name, without dot (`php` for example).
-    * @return FileFinder
-    * @see FileFinder::excludeExtensions()
-    */
+    /**
+     * Excludes a single extension from the search.
+     * 
+     * @param string $extension Extension name, without dot (`php` for example).
+     * @return FileFinder
+     * @see FileFinder::excludeExtensions()
+     */
     public function excludeExtension(string $extension) : FileFinder
     {
         return $this->excludeExtensions(array($extension));
     }
 
-   /**
-    * Add several extensions to the list of extensions to
-    * exclude from the file search.
-    *  
-    * @param string[] $extensions Extension names, without dot (`php` for example).
-    * @return FileFinder
-    * @see FileFinder::excludeExtension()
-    */
+    /**
+     * Add several extensions to the list of extensions to
+     * exclude from the file search.
+     *  
+     * @param string[] $extensions Extension names, without dot (`php` for example).
+     * @return FileFinder
+     * @see FileFinder::excludeExtension()
+     */
     public function excludeExtensions(array $extensions) : FileFinder
     {
         $items = $this->getExcludeExtensions();
@@ -186,52 +186,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 FileFinder
-    */
+    /**
+     * In this mode, the entire path to the file will be stripped,
+     * leaving only the file name in the files list.
+     * 
+     * @return FileFinder
+     */
     public function setPathmodeStrip() : 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 FileFinder
-    */
+    /**
+     * In this mode, only the path relative to the source folder
+     * will be included in the files list.
+     * 
+     * @return FileFinder
+     */
     public function setPathmodeRelative() : 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 FileFinder
-    */
+    /**
+     * In this mode, the full, absolute paths to the files will
+     * be included in the files list.
+     * 
+     * @return FileFinder
+     */
     public function setPathmodeAbsolute() : 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 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 FileFinder
+     */
     public function setSlashReplacement(string $character) : FileFinder
     {
         return $this->setOption('slash-replacement', $character);
@@ -254,12 +254,12 @@ 
         return $this->setOption(self::OPTION_PATHMODE, $mode);
     }
     
-   /**
-    * Retrieves a list of all matching file names/paths,
-    * depending on the selected options.
-    * 
-    * @return string[]
-    */
+    /**
+     * Retrieves a list of all matching file names/paths,
+     * depending on the selected options.
+     * 
+     * @return string[]
+     */
     public function getAll() : array
     {
         $this->find((string)$this->path, true);
@@ -267,24 +267,24 @@ 
         return $this->found;
     }
     
-   /**
-    * Retrieves only PHP files. Can be combined with other
-    * options like enabling recursion into sub-folders.
-    * 
-    * @return string[]
-    */
+    /**
+     * Retrieves only PHP files. Can be combined with other
+     * options like enabling recursion into sub-folders.
+     * 
+     * @return string[]
+     */
     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 string[] 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 string[] An array of PHP file names without extension.
+     */
     public function getPHPClassNames() : array
     {
         $this->includeExtensions(array('php'));
@@ -355,13 +355,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(self::OPTION_INCLUDE_EXTENSIONS);
@@ -381,12 +381,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(self::OPTION_PATHMODE))

Spacing +16 added lines, -16 removed lines

@@ -7,7 +7,7 @@ 
  * @see \AppUtils\FileHelper\FileFinder
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace AppUtils\FileHelper;
 
@@ -90,7 +90,7 @@ 
      * @param bool $enabled
      * @return FileFinder
      */
-    public function makeRecursive(bool $enabled=true) : FileFinder
+    public function makeRecursive(bool $enabled = true) : FileFinder
     {
         return $this->setOption('recursive', $enabled);
     }
@@ -295,22 +295,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);
                 }
                 
@@ -319,7 +319,7 @@ 
             
             $file = $this->filterFile($pathname);
             
-            if($file !== null) 
+            if ($file !== null) 
             {
                 $this->found[] = $file;
             }
@@ -332,23 +332,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);
         }
         
@@ -367,13 +367,13 @@ 
         $include = $this->getOption(self::OPTION_INCLUDE_EXTENSIONS);
         $exclude = $this->getOption(self::OPTION_EXCLUDE_EXTENSIONS);
         
-        if(!empty($include))
+        if (!empty($include))
         {
-            if(!in_array($extension, $include, true)) {
+            if (!in_array($extension, $include, true)) {
                 return false;
             }
         }
-        else if(!empty($exclude) && in_array($extension, $exclude, true))
+        else if (!empty($exclude) && in_array($extension, $exclude, true))
         {
             return false;
         }
@@ -389,7 +389,7 @@ 
     */
     protected function filterPath(string $path) : string
     {
-        switch($this->getStringOption(self::OPTION_PATHMODE))
+        switch ($this->getStringOption(self::OPTION_PATHMODE))
         {
             case self::PATH_MODE_STRIP:
                 return basename($path);

Braces +1 added lines, -2 removed lines

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

src/FileHelper/FolderInfo.php

Spacing +7 added lines, -7 removed lines

@@ -29,7 +29,7 @@ 
     {
         $pathString = AbstractPathInfo::type2string($path);
 
-        if(!isset(self::$infoCache[$pathString]))
+        if (!isset(self::$infoCache[$pathString]))
         {
             self::$infoCache[$pathString] = new FolderInfo($pathString);
         }
@@ -58,7 +58,7 @@ 
     {
         parent::__construct($path);
 
-        if(!self::is_dir($this->path))
+        if (!self::is_dir($this->path))
         {
             throw new FileHelper_Exception(
                 'Not a folder',
@@ -80,12 +80,12 @@ 
     {
         $path = trim($path);
 
-        if($path === '' || $path === '.' || $path === '..')
+        if ($path === '' || $path === '.' || $path === '..')
         {
             return false;
         }
 
-        if(is_dir($path))
+        if (is_dir($path))
         {
             return true;
         }
@@ -103,12 +103,12 @@ 
      */
     public function delete() : FolderInfo
     {
-        if(!$this->exists())
+        if (!$this->exists())
         {
             return $this;
         }
 
-        if(rmdir($this->path))
+        if (rmdir($this->path))
         {
             return $this;
         }
@@ -134,7 +134,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;
         }

src/FileHelper/AbstractPathInfo.php

Spacing +14 added lines, -14 removed lines

@@ -94,7 +94,7 @@ 
 
         $path = realpath($this->path);
 
-        if($path !== false)
+        if ($path !== false)
         {
             return FileHelper::normalizePath($path);
         }
@@ -113,14 +113,14 @@ 
      * @return $this
      * @throws FileHelper_Exception
      */
-    private function requireTrue(bool $condition, string $conditionLabel, ?int $errorCode=null) : self
+    private function requireTrue(bool $condition, string $conditionLabel, ?int $errorCode = null) : self
     {
-        if($condition === true)
+        if ($condition === true)
         {
             return $this;
         }
 
-        if($errorCode === null)
+        if ($errorCode === null)
         {
             $errorCode = FileHelper::ERROR_FILE_DOES_NOT_EXIST;
         }
@@ -137,7 +137,7 @@ 
      * @return $this
      * @throws FileHelper_Exception
      */
-    public function requireExists(?int $errorCode=null) : self
+    public function requireExists(?int $errorCode = null) : self
     {
         return $this->requireTrue(
             !empty($this->path) && realpath($this->path) !== false,
@@ -151,7 +151,7 @@ 
      * @return $this
      * @throws FileHelper_Exception
      */
-    public function requireReadable(?int $errorCode=null) : self
+    public function requireReadable(?int $errorCode = null) : self
     {
         $this->requireExists($errorCode);
 
@@ -167,7 +167,7 @@ 
      * @return $this
      * @throws FileHelper_Exception
      */
-    public function requireWritable(?int $errorCode=null) : self
+    public function requireWritable(?int $errorCode = null) : self
     {
         return $this->requireTrue(
             $this->isWritable(),
@@ -184,7 +184,7 @@ 
      */
     public function requireIsFile() : FileInfo
     {
-        if($this instanceof FileInfo)
+        if ($this instanceof FileInfo)
         {
             return $this;
         }
@@ -207,7 +207,7 @@ 
      */
     public function requireIsFolder() : FolderInfo
     {
-        if($this instanceof FolderInfo)
+        if ($this instanceof FolderInfo)
         {
             return $this;
         }
@@ -228,12 +228,12 @@ 
      */
     public static function type2string($path) : string
     {
-        if($path instanceof PathInfoInterface)
+        if ($path instanceof PathInfoInterface)
         {
             return $path->getPath();
         }
 
-        if($path instanceof DirectoryIterator)
+        if ($path instanceof DirectoryIterator)
         {
             return $path->getPathname();
         }
@@ -255,19 +255,19 @@ 
      */
     public static function resolveType($path) : PathInfoInterface
     {
-        if($path instanceof PathInfoInterface)
+        if ($path instanceof PathInfoInterface)
         {
             return $path;
         }
 
         $path = self::type2string($path);
 
-        if(FolderInfo::is_dir($path))
+        if (FolderInfo::is_dir($path))
         {
             return FolderInfo::factory($path);
         }
 
-        if(FileInfo::is_file($path))
+        if (FileInfo::is_file($path))
         {
             return FileInfo::factory($path);
         }

src/Request/RequestParam.php

Indentation +119 added lines, -119 removed lines

@@ -177,12 +177,12 @@ 
         return $this->applyValidations($value);
     }
     
-   /**
-    * Runs the value through all validations that were added.
-    * 
-    * @param mixed $value
-    * @return mixed
-    */
+    /**
+     * Runs the value through all validations that were added.
+     * 
+     * @param mixed $value
+     * @return mixed
+     */
     protected function applyValidations($value, bool $subval=false)
     {
         // go through all enqueued validations in turn, each time
@@ -195,17 +195,17 @@ 
         return $value;
     }
     
-   /**
-    * Validates the specified value using the validation type. Returns
-    * the validated value. 
-    * 
-    * @param mixed $value
-    * @param string $type
-    * @param array<string,mixed> $params
-    * @param bool $subval Whether this is a subvalue in a list
-    * @throws Request_Exception
-    * @return mixed
-    */
+    /**
+     * Validates the specified value using the validation type. Returns
+     * the validated value. 
+     * 
+     * @param mixed $value
+     * @param string $type
+     * @param array<string,mixed> $params
+     * @param bool $subval Whether this is a subvalue in a list
+     * @throws Request_Exception
+     * @return mixed
+     */
     protected function validateType($value, string $type, array $params, bool $subval)
     {
         $class = Request_Param_Validator::class.'_'.ucfirst($type);
@@ -270,13 +270,13 @@ 
         return $this->setValidation(self::VALIDATION_TYPE_URL);
     }
     
-   /**
-    * Sets the variable to contain a comma-separated list of integer IDs.
-    * Example: <code>145,248,4556</code>. A single ID is also allowed, e.g.
-    * <code>145</code>.
-    * 
-    * @return $this
-    */
+    /**
+     * Sets the variable to contain a comma-separated list of integer IDs.
+     * Example: <code>145,248,4556</code>. A single ID is also allowed, e.g.
+     * <code>145</code>.
+     * 
+     * @return $this
+     */
     public function setIDList() : self
     {
         $this->valueType = self::VALUE_TYPE_LIST;
@@ -286,13 +286,13 @@ 
         return $this;
     }
     
-   /**
-    * Sets the variable to be an alias, as defined by the
-    * {@link RegexHelper::REGEX_ALIAS} regular expression.
-    * 
-    * @return $this
-    * @see RegexHelper::REGEX_ALIAS
-    */
+    /**
+     * Sets the variable to be an alias, as defined by the
+     * {@link RegexHelper::REGEX_ALIAS} regular expression.
+     * 
+     * @return $this
+     * @see RegexHelper::REGEX_ALIAS
+     */
     public function setAlias() : self
     {
         return $this->setRegex(RegexHelper::REGEX_ALIAS);
@@ -333,12 +333,12 @@ 
         return $this->setValidation(self::VALIDATION_TYPE_ALPHA);
     }
     
-   /**
-    * Sets the parameter value as a string containing lowercase
-    * and/or uppercase letters, as well as numbers.
-    * 
-    * @return $this
-    */
+    /**
+     * Sets the parameter value as a string containing lowercase
+     * and/or uppercase letters, as well as numbers.
+     * 
+     * @return $this
+     */
     public function setAlnum() : self
     {
         return $this->setValidation(self::VALIDATION_TYPE_ALNUM);   
@@ -396,11 +396,11 @@ 
         );
     }
     
-   /**
-    * Whether the parameter is a list of values.
-    * 
-    * @return bool
-    */
+    /**
+     * Whether the parameter is a list of values.
+     * 
+     * @return bool
+     */
     public function isList() : bool
     {
         return $this->valueType === self::VALUE_TYPE_LIST;
@@ -442,28 +442,28 @@ 
         return $this->setValidation(self::VALIDATION_TYPE_JSON, array('arrays' => false));
     }
     
-   /**
-    * The parameter is a string boolean representation. This means
-    * it can be any of the following: "yes", "true", "no", "false".
-    * The value is automatically converted to a boolean when retrieving
-    * the parameter.
-    * 
-    * @return $this
-    */
+    /**
+     * The parameter is a string boolean representation. This means
+     * it can be any of the following: "yes", "true", "no", "false".
+     * The value is automatically converted to a boolean when retrieving
+     * the parameter.
+     * 
+     * @return $this
+     */
     public function setBoolean() : self
     {
         return $this->addClassFilter('Boolean');
     }
     
-   /**
-    * Validates the request parameter as an MD5 string,
-    * so that only values resembling md5 values are accepted.
-    * 
-    * NOTE: This can only guarantee the format, not whether
-    * it is an actual valid hash of something.
-    * 
-    * @return $this
-    */
+    /**
+     * Validates the request parameter as an MD5 string,
+     * so that only values resembling md5 values are accepted.
+     * 
+     * NOTE: This can only guarantee the format, not whether
+     * it is an actual valid hash of something.
+     * 
+     * @return $this
+     */
     public function setMD5() : self
     {
         return $this->setRegex(RegexHelper::REGEX_MD5);
@@ -503,14 +503,14 @@ 
         return $this;
     }
     
-   /**
-    * Retrieves the value of the request parameter,
-    * applying all filters (if any) and validation
-    * (if any).
-    * 
-    * @param mixed $default
-    * @return mixed
-    */
+    /**
+     * Retrieves the value of the request parameter,
+     * applying all filters (if any) and validation
+     * (if any).
+     * 
+     * @param mixed $default
+     * @return mixed
+     */
     public function get($default=null)
     {
         $value = $this->request->getParam($this->paramName);
@@ -523,17 +523,17 @@ 
 
     // region: Filtering
 
-   /**
-    * Filters the specified value by going through all available
-    * filters, if any. If none have been set, the value is simply
-    * passed through.
-    *
-    * @param mixed $value
-    * @return mixed
-    *
-    * @see RequestParam::applyFilter_callback()
-    * @see RequestParam::applyFilter_class()
-    */
+    /**
+     * Filters the specified value by going through all available
+     * filters, if any. If none have been set, the value is simply
+     * passed through.
+     *
+     * @param mixed $value
+     * @return mixed
+     *
+     * @see RequestParam::applyFilter_callback()
+     * @see RequestParam::applyFilter_class()
+     */
     protected function filter($value)
     {
         foreach ($this->filters as $filter)
@@ -622,12 +622,12 @@ 
         return $this;
     }
     
-   /**
-    * Adds a filter that trims whitespace from the request
-    * parameter using the PHP <code>trim</code> function.
-    * 
-    * @return $this
-    */
+    /**
+     * Adds a filter that trims whitespace from the request
+     * parameter using the PHP <code>trim</code> function.
+     * 
+     * @return $this
+     */
     public function addFilterTrim() : self
     {
         // to guarantee we only work with strings
@@ -636,13 +636,13 @@ 
         return $this->addCallbackFilter('trim');
     }
 
-   /**
-    * Converts the value to a string, even if it is not
-    * a string value. Complex types like arrays and objects
-    * are converted to an empty string.
-    * 
-    * @return $this
-    */
+    /**
+     * Converts the value to a string, even if it is not
+     * a string value. Complex types like arrays and objects
+     * are converted to an empty string.
+     * 
+     * @return $this
+     */
     public function addStringFilter() : self
     {
         return $this->addClassFilter('String');
@@ -694,12 +694,12 @@ 
         return $this->addCallbackFilter('strip_tags', array($allowedTags));
     }
     
-   /**
-    * Adds a filter that strips all whitespace from the
-    * request parameter, from spaces to tabs and newlines.
-    * 
-    * @return $this
-    */
+    /**
+     * Adds a filter that strips all whitespace from the
+     * request parameter, from spaces to tabs and newlines.
+     * 
+     * @return $this
+     */
     public function addStripWhitespaceFilter() : self
     {
         // to ensure we only work with strings.
@@ -708,14 +708,14 @@ 
         return $this->addClassFilter('StripWhitespace');
     }   
     
-   /**
-    * Adds a filter that transforms comma separated values
-    * into an array of values.
-    * 
-    * @param bool $trimEntries Trim whitespace from each entry?
-    * @param bool $stripEmptyEntries Remove empty entries from the array?
-    * @return $this
-    */
+    /**
+     * Adds a filter that transforms comma separated values
+     * into an array of values.
+     * 
+     * @param bool $trimEntries Trim whitespace from each entry?
+     * @param bool $stripEmptyEntries Remove empty entries from the array?
+     * @return $this
+     */
     public function addCommaSeparatedFilter(bool $trimEntries=true, bool $stripEmptyEntries=true) : self
     {
         $this->setArray();
@@ -746,12 +746,12 @@ 
         );
     }
     
-   /**
-    * Adds a filter that encodes all HTML special characters
-    * using the PHP <code>htmlspecialchars</code> function.
-    * 
-    * @return $this
-    */
+    /**
+     * Adds a filter that encodes all HTML special characters
+     * using the PHP <code>htmlspecialchars</code> function.
+     * 
+     * @return $this
+     */
     public function addHTMLSpecialcharsFilter() : self
     {
         return $this->addCallbackFilter('htmlspecialchars', array(ENT_QUOTES, 'UTF-8'));
@@ -764,14 +764,14 @@ 
         return $this->paramName;
     }
     
-   /**
-    * Marks this request parameter as required. To use this feature,
-    * you have to call the request's {@link Request::validate()}
-    * method.
-    * 
-    * @return RequestParam
-    * @see Request::validate()
-    */
+    /**
+     * Marks this request parameter as required. To use this feature,
+     * you have to call the request's {@link Request::validate()}
+     * method.
+     * 
+     * @return RequestParam
+     * @see Request::validate()
+     */
     public function makeRequired() : RequestParam
     {
         $this->required = true;

Spacing +15 added lines, -15 removed lines

@@ -124,7 +124,7 @@ 
      * @return $this
      * @throws Request_Exception
      */
-    public function setCallback(callable $callback, array $args=array()) : self
+    public function setCallback(callable $callback, array $args = array()) : self
     {
         return $this->setValidation(
             self::VALIDATION_TYPE_CALLBACK, 
@@ -149,22 +149,22 @@ 
         // first off, apply filtering
         $value = $this->filter($value);
         
-        if($this->valueType === self::VALUE_TYPE_LIST)
+        if ($this->valueType === self::VALUE_TYPE_LIST)
         {
-            if(!is_array($value))
+            if (!is_array($value))
             {
                 $value = explode(',', $value);
             }
             
             $keep = array();
             
-            foreach($value as $subval)
+            foreach ($value as $subval)
             {
                 $subval = $this->filter($subval);
                 
                 $subval = $this->applyValidations($subval, true);
 
-                if($subval !== null) {
+                if ($subval !== null) {
                     $keep[] = $subval;
                 }
             }
@@ -183,11 +183,11 @@ 
     * @param mixed $value
     * @return mixed
     */
-    protected function applyValidations($value, bool $subval=false)
+    protected function applyValidations($value, bool $subval = false)
     {
         // go through all enqueued validations in turn, each time
         // replacing the value with the adjusted, validated value.
-        foreach($this->validations as $validateDef)
+        foreach ($this->validations as $validateDef)
         {
             $value = $this->validateType($value, $validateDef['type'], $validateDef['params'], $subval);
         }
@@ -210,7 +210,7 @@ 
     {
         $class = Request_Param_Validator::class.'_'.ucfirst($type);
         
-        if(!class_exists($class))
+        if (!class_exists($class))
         {
             throw new Request_Exception(
                 'Unknown validation type.',
@@ -361,7 +361,7 @@ 
     {
         $args = func_get_args(); // cannot be used as function parameter in some PHP versions
         
-        if(is_array($args[0])) 
+        if (is_array($args[0])) 
         {
             $args = $args[0];
         }
@@ -511,10 +511,10 @@ 
     * @param mixed $default
     * @return mixed
     */
-    public function get($default=null)
+    public function get($default = null)
     {
         $value = $this->request->getParam($this->paramName);
-        if($value !== null && $value !== '') {
+        if ($value !== null && $value !== '') {
             return $value;
         }
 
@@ -538,7 +538,7 @@ 
     {
         foreach ($this->filters as $filter)
         {
-            $method = 'applyFilter_' . $filter['type'];
+            $method = 'applyFilter_'.$filter['type'];
             $value = $this->$method($value, $filter['params']);
         }
 
@@ -557,7 +557,7 @@ 
         
         $filter = new $class($this);
 
-        if($filter instanceof Request_Param_Filter)
+        if ($filter instanceof Request_Param_Filter)
         {
             $filter->setOptions($config['params']);
             return $filter->filter($value);
@@ -716,7 +716,7 @@ 
     * @param bool $stripEmptyEntries Remove empty entries from the array?
     * @return $this
     */
-    public function addCommaSeparatedFilter(bool $trimEntries=true, bool $stripEmptyEntries=true) : self
+    public function addCommaSeparatedFilter(bool $trimEntries = true, bool $stripEmptyEntries = true) : self
     {
         $this->setArray();
         
@@ -735,7 +735,7 @@ 
      * @return $this
      * @throws Request_Exception
      */
-    protected function addClassFilter(string $name, array $params=array()) : self
+    protected function addClassFilter(string $name, array $params = array()) : self
     {
         return $this->addFilter(
             self::FILTER_TYPE_CLASS,

src/Request/Param/Filter.php

Indentation +3 added lines, -3 removed lines

@@ -24,9 +24,9 @@
 {
     use Traits_Optionable;
     
-   /**
-    * @var RequestParam
-    */
+    /**
+     * @var RequestParam
+     */
     protected $param;
     
     protected $value;

src/Request/Param/Validator.php

Indentation +6 added lines, -6 removed lines

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