Mistralys / application-utils

src/AttributeCollection/Filtering.php

Spacing +2 added lines, -2 removed lines

@@ -56,12 +56,12 @@
      */
     public static function value2string($value) : string
     {
-        if($value === true)
+        if ($value === true)
         {
             return 'true';
         }
 
-        if($value === false)
+        if ($value === false)
         {
             return 'false';
         }

src/Interfaces/AttributableInterface.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
      * @param bool $enabled
      * @return $this
      */
-    public function prop(string $name, bool $enabled=true) : self;
+    public function prop(string $name, bool $enabled = true) : self;
 
     /**
      * @param string $name

src/Interfaces/Optionable.php

Spacing +4 added lines, -4 removed lines

@@ -45,7 +45,7 @@ 
      * @param mixed $default The default value to return if the option does not exist.
      * @return mixed
      */
-    public function getOption(string $name, $default=null);
+    public function getOption(string $name, $default = null);
 
     /**
      * @param string $name
@@ -53,11 +53,11 @@ 
      */
     public function getArrayOption(string $name) : array;
 
-    public function getIntOption(string $name, int $default=0) : int;
+    public function getIntOption(string $name, int $default = 0) : int;
 
-    public function getBoolOption(string $name, bool $default=false) : bool;
+    public function getBoolOption(string $name, bool $default = false) : bool;
 
-    public function getStringOption(string $name, string $default='') : string;
+    public function getStringOption(string $name, string $default = '') : string;
 
     /**
      * Sets a collection of options at once, from an

src/Request/URLComparer.php

Spacing +12 added lines, -12 removed lines

@@ -81,7 +81,7 @@ 
     
     public function addLimitParam(string $name) : Request_URLComparer
     {
-        if(!in_array($name, $this->limitParams, true))
+        if (!in_array($name, $this->limitParams, true))
         {
             $this->limitParams[] = $name;
         }
@@ -95,7 +95,7 @@ 
      */
     public function addLimitParams(array $names) : Request_URLComparer
     {
-        foreach($names as $name)
+        foreach ($names as $name)
         {
             $this->addLimitParam($name);
         }
@@ -103,7 +103,7 @@ 
         return $this;
     }
     
-    public function setIgnoreFragment(bool $ignore=true) : Request_URLComparer
+    public function setIgnoreFragment(bool $ignore = true) : Request_URLComparer
     {
         $this->ignoreFragment = $ignore;
         return $this;
@@ -126,13 +126,13 @@ 
             'query' 
         );
         
-        if(!$this->ignoreFragment) {
+        if (!$this->ignoreFragment) {
             $keys[] = 'fragment';
         }
         
-        foreach($keys as $key)
+        foreach ($keys as $key)
         {
-            if(!$this->compareKey($key)) {
+            if (!$this->compareKey($key)) {
                 return false;
             }
         }
@@ -147,7 +147,7 @@ 
         
         $filter = 'filter_'.$key;
         
-        if(method_exists($this, $filter)) 
+        if (method_exists($this, $filter)) 
         {
             $sVal = $this->$filter($sVal);
             $tVal = $this->$filter($tVal);
@@ -159,7 +159,7 @@ 
     protected function filter_path(string $path) : string
     {
         // fix double slashes in URLs
-        while(strpos($path, '//') !== false)
+        while (strpos($path, '//') !== false)
         {
             $path = str_replace('//', '/', $path);
         }
@@ -169,7 +169,7 @@ 
     
     protected function filter_query(string $query) : string
     {
-        if(empty($query)) {
+        if (empty($query)) {
             return '';
         }
         
@@ -188,15 +188,15 @@ 
      */
     protected function limitParams(array $params) : array
     {
-        if(empty($this->limitParams)) {
+        if (empty($this->limitParams)) {
             return $params;
         }
         
         $keep = array();
         
-        foreach($this->limitParams as $name)
+        foreach ($this->limitParams as $name)
         {
-            if(isset($params[$name])) {
+            if (isset($params[$name])) {
                 $keep[$name] = $params[$name];
             }
         }

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

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

src/Request/RequestParam.php

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/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;
             }
@@ -100,11 +100,11 @@ 
     {
         $target = FileHelper::createFolder($target);
 
-        $d =  FileHelper::getPathInfo($source)->requireIsFolder()->getIterator();
+        $d = FileHelper::getPathInfo($source)->requireIsFolder()->getIterator();
 
         foreach ($d as $item)
         {
-            if($item->isDot())
+            if ($item->isDot())
             {
                 continue;
             }
@@ -125,9 +125,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()