mkungla / libhowi-filesystem

FS.inc

Braces +3 added lines, -2 removed lines

@@ -50,10 +50,11 @@
         /**
          * Minimum version of PHP must be atleast 5.5.11
          */
-        if ($PHP_VERSION_ID <= 50511)
-            return call_user_func(
+        if ($PHP_VERSION_ID <= 50511) {
+                    return call_user_func(
                 function () {
                     $self = new self();
+        }
                     $self->emergency(100);
                     return $self;
                 });

php7/TraitForSharedMethods.inc

Braces +51 added lines, -37 removed lines

@@ -37,13 +37,15 @@ 
      */
     protected function setCwd($path = false, $validate_dir_name = false)
     {
-        if (empty($path))
-            $current_working_directory = $this->getCwd();
-        else
-            $current_working_directory = $this->makeAbsolute($path);
+        if (empty($path)) {
+                    $current_working_directory = $this->getCwd();
+        } else {
+                    $current_working_directory = $this->makeAbsolute($path);
+        }
         
-        if (! empty($validate_dir_name) && (basename($current_working_directory) !== $validate_dir_name))
-            return false;
+        if (! empty($validate_dir_name) && (basename($current_working_directory) !== $validate_dir_name)) {
+                    return false;
+        }
         
         if (! is_dir($current_working_directory) || ! is_readable($current_working_directory) ||
              ! chdir($current_working_directory)) {
@@ -61,8 +63,9 @@ 
      */
     public function getCwd()
     {
-        if (empty($this->cwd))
-            $this->cwd = getcwd();
+        if (empty($this->cwd)) {
+                    $this->cwd = getcwd();
+        }
         
         return $this->cwd;
     }
@@ -78,8 +81,9 @@ 
         $bytestotal = empty($filename) ? ((method_exists(get_parent_class($this), 'getSize')) ? parent::getSize() : false) : filesize(
             $filename);
         
-        if (! $this->isDir($filename) && empty($convert))
-            return $bytestotal;
+        if (! $this->isDir($filename) && empty($convert)) {
+                    return $bytestotal;
+        }
         
         $suffixes = array(
             'B',
@@ -94,15 +98,17 @@ 
         );
         if ($this->isDir($filename)) {
             $path = ((method_exists(get_class($this), 'getPathname')) ? $this->getPathname() : $filename);
-            if ($path === '/home/nitrotrigger/tmp/libhowi-filesystem/log/phpunit_test.log')
-                die('ss');
+            if ($path === '/home/nitrotrigger/tmp/libhowi-filesystem/log/phpunit_test.log') {
+                            die('ss');
+            }
             
             foreach (new RecursiveIteratorIterator(
                 new RecursiveDirectoryIterator($path, RecursiveDirectoryIterator::SKIP_DOTS)) as $object) {
                 $bytestotal += $object->getSize();
             }
-            if (! $convert)
-                return $bytestotal;
+            if (! $convert) {
+                            return $bytestotal;
+            }
         }
         $base = log($bytestotal, 1024);
         
@@ -244,21 +250,24 @@ 
         for ($df = strtok($date_format, ','); $df !== false; $df = strtok(",")) {
             $lkey = ($df !== 'a') ? strtolower($df) : 'days';
             
-            if ($ommit_zero && $interval->$lkey === 0)
-                continue;
+            if ($ommit_zero && $interval->$lkey === 0) {
+                            continue;
+            }
             
             $fparam = $df . (empty($sfx) ? $locale[$lkey][0] : ' ' .
                  (($interval->$lkey === 1) ? $locale[$lkey][1] : $locale[$lkey][2]));
             
-            if (! empty($ago_single) && ! empty($dfs))
-                break;
-            else
-                $dfs = ! empty($dfs) ? $dfs . "%$fparam " : "%$fparam ";
+            if (! empty($ago_single) && ! empty($dfs)) {
+                            break;
+            } else {
+                            $dfs = ! empty($dfs) ? $dfs . "%$fparam " : "%$fparam ";
+            }
+        }
+        if (empty($dfs)) {
+                    $ret = $locale['now'];
+        } else {
+                    $ret = $interval->format($dfs) . $locale['ago'];
         }
-        if (empty($dfs))
-            $ret = $locale['now'];
-        else
-            $ret = $interval->format($dfs) . $locale['ago'];
         return $ret;
     }
 
@@ -269,8 +278,9 @@ 
      */
     public function openFile($open_mode = "r", $use_include_path = false, $context = null)
     {
-        if (! method_exists(get_parent_class($this), 'openFile'))
-            return false;
+        if (! method_exists(get_parent_class($this), 'openFile')) {
+                    return false;
+        }
         
         return ! $this->isDir() ? (! empty($context) ? parent::openFile($open_mode, $use_include_path, 
             $context) : parent::openFile($open_mode, $use_include_path)) : false;
@@ -283,8 +293,9 @@ 
      */
     public function setFileClass($class_name = "\HOWI3\libhowi\Filesystem\php5\Objects\FileObject")
     {
-        if (! method_exists(get_parent_class($this), 'setFileClass'))
-            return false;
+        if (! method_exists(get_parent_class($this), 'setFileClass')) {
+                    return false;
+        }
         
         if (is_subclass_of($class_name, 'SplFileObject') || $class_name === 'SplFileObject') {
             parent::setFileClass($class_name);
@@ -300,8 +311,9 @@ 
      */
     public function setInfoClass($class_name = "\HOWI3\libhowi\Filesystem\php5\Objects\InfoObject")
     {
-        if (! method_exists(get_parent_class($this), 'setInfoClass'))
-            return false;
+        if (! method_exists(get_parent_class($this), 'setInfoClass')) {
+                    return false;
+        }
         
         if (is_subclass_of($class_name, 'SplFileInfo') || $class_name === 'SplFileInfo') {
             parent::setInfoClass($class_name);
@@ -556,16 +568,17 @@ 
      */
     public function makeAbsolute($path = false)
     {
-        if (! empty($path) && $this->isAbsolute($path))
-            $absolute_path = $path;
-        elseif (! empty($path) && $this->isRelative($path)) {
+        if (! empty($path) && $this->isAbsolute($path)) {
+                    $absolute_path = $path;
+        } elseif (! empty($path) && $this->isRelative($path)) {
             
             if (preg_match('/^(~\/)/', $path) === 1) {
                 $absolute_path = getenv("HOME") . substr($path, 1);
             } elseif (preg_match('/^(.\/|..\/)/', $path) === 1) {
                 $absolute_path = realpath($path);
-            } else
-                $absolute_path = $this->getCwd() . ($path !== '.' ? DIRECTORY_SEPARATOR . $path : '');
+            } else {
+                            $absolute_path = $this->getCwd() . ($path !== '.' ? DIRECTORY_SEPARATOR . $path : '');
+            }
         } else {
             $absolute_path = $path;
         }
@@ -579,8 +592,9 @@ 
      */
     public function exists($pathname = false)
     {
-        if (empty($pathname))
-            return false;
+        if (empty($pathname)) {
+                    return false;
+        }
         
         $pathname = $this->makeAbsolute($pathname);
         

php7/Filesystem.inc

Braces +6 added lines, -4 removed lines

@@ -129,8 +129,9 @@ 
     public function file($filename = false, $dirname = false, $data = '', $flags = FILE_APPEND, $context = null)
     {
         if (! empty($filename) && array_key_exists($filename, $this->files) &&
-             is_object($this->files[$filename]))
-            return $this->files[$filename];
+             is_object($this->files[$filename])) {
+                    return $this->files[$filename];
+        }
         
         $this->debug(808);
         if (empty($filename)) {
@@ -169,8 +170,9 @@ 
     public function infoObject($basename = false, $directory = false)
     {
         if (! empty($basename) && array_key_exists($basename, $this->infos) && is_object(
-            $this->infos[$basename]))
-            return $this->infos[$basename];
+            $this->infos[$basename])) {
+                    return $this->infos[$basename];
+        }
         
         $this->debug(809);
         if (empty($basename)) {

php7/TraitForFileSystem.inc

Braces +77 added lines, -58 removed lines

@@ -103,11 +103,13 @@ 
      */
     public function getDiskTotalSpace($partition_location = false, $convert = false)
     {
-        if (empty($partition_location))
-            $partition_location = $this->getCwd();
+        if (empty($partition_location)) {
+                    $partition_location = $this->getCwd();
+        }
         
-        if (empty($convert))
-            return disk_total_space($partition_location);
+        if (empty($convert)) {
+                    return disk_total_space($partition_location);
+        }
         
         $bytestotal = 0;
         $suffixes = array(
@@ -137,11 +139,13 @@ 
      */
     public function getDiskFreeSpace($partition_location = false, $convert = false)
     {
-        if (empty($partition_location))
-            $partition_location = $this->getCwd();
+        if (empty($partition_location)) {
+                    $partition_location = $this->getCwd();
+        }
         
-        if (empty($convert))
-            return disk_free_space($partition_location);
+        if (empty($convert)) {
+                    return disk_free_space($partition_location);
+        }
         
         $result = [
             0,
@@ -191,10 +195,11 @@ 
     public function chmod($filename = false, $mode = false)
     {
         $filename = $this->makeAbsolute($filename);
-        if (file_exists($filename) && ! empty($mode) && is_int($mode))
-            return chmod($filename, octdec(str_pad($mode, 4, 0, STR_PAD_LEFT)));
-        else
-            return false;
+        if (file_exists($filename) && ! empty($mode) && is_int($mode)) {
+                    return chmod($filename, octdec(str_pad($mode, 4, 0, STR_PAD_LEFT)));
+        } else {
+                    return false;
+        }
     }
 
     /**
@@ -205,10 +210,11 @@ 
     public function chown($filename = false, $user = false)
     {
         $filename = $this->makeAbsolute($filename);
-        if (file_exists($filename) && ! empty($user))
-            return chown($filename, $user);
-        else
-            return false;
+        if (file_exists($filename) && ! empty($user)) {
+                    return chown($filename, $user);
+        } else {
+                    return false;
+        }
     }
 
     /**
@@ -218,10 +224,11 @@ 
      */
     public function clearstatcache($clear_realpath_cache = false, $filename = false)
     {
-        if (! empty($filename) && ! empty($clear_realpath_cache))
-            clearstatcache($clear_realpath_cache, $this->makeAbsolute($filename));
-        else
-            clearstatcache();
+        if (! empty($filename) && ! empty($clear_realpath_cache)) {
+                    clearstatcache($clear_realpath_cache, $this->makeAbsolute($filename));
+        } else {
+                    clearstatcache();
+        }
     }
 
     /**
@@ -236,10 +243,11 @@ 
         
         if (! empty($source) && ! empty($dest) && ! is_dir($source)) {
             
-            if (empty($context))
-                return copy($source, $dest);
-            else
-                return copy($source, $dest, $context);
+            if (empty($context)) {
+                            return copy($source, $dest);
+            } else {
+                            return copy($source, $dest, $context);
+            }
         } elseif ((! empty($source) && ! empty($dest)) && is_dir($source) && ! file_exists($dest)) {
             
             $tmp_key = basename($source);
@@ -257,23 +265,24 @@ 
                     if (empty($context)) {
                         mkdir($dest . DIRECTORY_SEPARATOR . $iterator->getSubPathName(), 
                             octdec(str_pad($iterator->getPerms(), 4, 0, STR_PAD_LEFT)));
-                    } 
-
-                    else
-                        mkdir($dest . DIRECTORY_SEPARATOR . $iterator->getSubPathName(), 
+                    } else {
+                                            mkdir($dest . DIRECTORY_SEPARATOR . $iterator->getSubPathName(), 
                             octdec(str_pad($iterator->getPerms(), 4, 0, STR_PAD_LEFT)), false, $context);
+                    }
                 } else {
-                    if (empty($context))
-                        $this->copy($item, $dest . DIRECTORY_SEPARATOR . $iterator->getSubPathName());
-                    else
-                        $this->copy($item, $dest . DIRECTORY_SEPARATOR . $iterator->getSubPathName(), 
+                    if (empty($context)) {
+                                            $this->copy($item, $dest . DIRECTORY_SEPARATOR . $iterator->getSubPathName());
+                    } else {
+                                            $this->copy($item, $dest . DIRECTORY_SEPARATOR . $iterator->getSubPathName(), 
                             $context);
+                    }
                 }
             }
             
             return true;
-        } else
-            return false;
+        } else {
+                    return false;
+        }
     }
 
     /**
@@ -283,14 +292,16 @@ 
      */
     public function mv($oldname = false, $newname = false, $context = false)
     {
-        if (empty($oldname) || empty($newname))
-            return false;
+        if (empty($oldname) || empty($newname)) {
+                    return false;
+        }
         
         $oldname = $this->makeAbsolute($oldname);
         $newname = $this->makeAbsolute($newname);
         
-        if (! empty($context))
-            return rename($oldname, $newname, $context);
+        if (! empty($context)) {
+                    return rename($oldname, $newname, $context);
+        }
         
         return rename($oldname, $newname);
     }
@@ -302,13 +313,15 @@ 
      */
     public function namePatternMatch($pattern = false, $string = false, $flags = false)
     {
-        if (empty($pattern))
-            return false;
+        if (empty($pattern)) {
+                    return false;
+        }
         
-        if (! empty($flags))
-            return fnmatch($pattern, $string, $flags);
-        else
-            return fnmatch($pattern, $string);
+        if (! empty($flags)) {
+                    return fnmatch($pattern, $string, $flags);
+        } else {
+                    return fnmatch($pattern, $string);
+        }
     }
 
     /**
@@ -380,8 +393,9 @@ 
      */
     public function touch($filename = false, $time = false, $atime = false)
     {
-        if (empty($filename))
-            return false;
+        if (empty($filename)) {
+                    return false;
+        }
         
         $filename = $this->makeAbsolute($filename);
         
@@ -419,23 +433,28 @@ 
     public function createStructure($rootpath, $data_array, $skip_debug = false)
     {
         $absolute_path = $this->makeAbsolute($rootpath);
-        if (empty($skip_debug))
-            $this->debug(810);
+        if (empty($skip_debug)) {
+                    $this->debug(810);
+        }
         if (empty($rootpath) || ! is_array($data_array) ||
-             (! $this->isWritable($absolute_path) && ! $this->isWritable(dirname($absolute_path))))
-            return $this->warning(506) && false;
+             (! $this->isWritable($absolute_path) && ! $this->isWritable(dirname($absolute_path)))) {
+                    return $this->warning(506) && false;
+        }
         
-        if (! $this->isDir($absolute_path))
-            mkdir($absolute_path, 0755, true);
+        if (! $this->isDir($absolute_path)) {
+                    mkdir($absolute_path, 0755, true);
+        }
         
         foreach ($data_array as $key => $val) {
-            if (is_array($val))
-                ! $this->createStructure($absolute_path . DIRECTORY_SEPARATOR . $key, $val, true);
-            else
-                touch($absolute_path . DIRECTORY_SEPARATOR . $val);
+            if (is_array($val)) {
+                            ! $this->createStructure($absolute_path . DIRECTORY_SEPARATOR . $key, $val, true);
+            } else {
+                            touch($absolute_path . DIRECTORY_SEPARATOR . $val);
+            }
+        }
+        if (empty($skip_debug)) {
+                    $this->info(704, $rootpath);
         }
-        if (empty($skip_debug))
-            $this->info(704, $rootpath);
         return true;
     }
 }

php7/Objects/FileObject.inc

Braces +3 added lines, -1 removed lines

@@ -87,7 +87,9 @@
      */
     public function dummyScale($size)
     {
-        if(!is_int($size) || $this->getSize() > $size) return false;
+        if(!is_int($size) || $this->getSize() > $size) {
+            return false;
+        }
         
         $this->fseek($size ,SEEK_SET);
         $this->fwrite(' ');

php7/Objects/DirectoryTreeObject.inc

Braces +24 added lines, -27 removed lines

@@ -47,9 +47,9 @@ 
      */
     public function c($basename = false)
     {
-        if (! empty($basename) && array_key_exists($basename, $this->dirkeys))
-            $c = $this->dirkeys[$basename];
-        elseif (! empty($basename) && is_dir($this->getPath() . DIRECTORY_SEPARATOR . $basename)) {
+        if (! empty($basename) && array_key_exists($basename, $this->dirkeys)) {
+                    $c = $this->dirkeys[$basename];
+        } elseif (! empty($basename) && is_dir($this->getPath() . DIRECTORY_SEPARATOR . $basename)) {
             $c = new DirectoryTreeObject($this->getPath() . DIRECTORY_SEPARATOR . $basename, 
                 DirectoryTreeObject::SKIP_DOTS);
             $c->setFileClass('\HOWI3\libhowi\Filesystem\php5\Objects\FileObject');
@@ -58,10 +58,9 @@ 
             $c->setLogLevel($this->getLogLevel());
             $c->setUID($this->getUID());
             $c->setUsername($this->getUsername());
-        } 
-
-        else
-            $c = false;
+        } else {
+                    $c = false;
+        }
         
         return $this->dirkeys[$basename] = $c;
     }
@@ -94,16 +93,15 @@ 
         
         while ($this->valid()) {
             if (! $this->isDot()) {
-                if ($this->isDir() && ! $this->isLink() && ! empty($sort))
-                    $ls['dir'][$this->getFilename()] = $this->getType();
-                
-                elseif ($this->isLink() && ! empty($sort))
-                    $ls['link'][$this->getFilename()] = $this->getType();
-                
-                elseif ($this->isFile() && ! empty($sort))
-                    $ls['file'][$this->getFilename()] = $this->getType();
-                else
-                    $display[$this->getFilename()] = $this->getType();
+                if ($this->isDir() && ! $this->isLink() && ! empty($sort)) {
+                                    $ls['dir'][$this->getFilename()] = $this->getType();
+                } elseif ($this->isLink() && ! empty($sort)) {
+                                    $ls['link'][$this->getFilename()] = $this->getType();
+                } elseif ($this->isFile() && ! empty($sort)) {
+                                    $ls['file'][$this->getFilename()] = $this->getType();
+                } else {
+                                    $display[$this->getFilename()] = $this->getType();
+                }
                 
                 if ($this->isDir() || $this->isLink()) {
                     $this->dirkeys[$this->getFilename()] = $this->getChildren();
@@ -153,16 +151,15 @@ 
                 $lsinfo[$cname]->tchange = $this->getCTime($timeformat);
                 $lsinfo[$cname]->tmodify = $this->getMTime($timeformat);
                 
-                if ($this->isDir() && ! $this->isLink() && ! empty($sort))
-                    $ls['dir'][$cname] = $lsinfo[$cname]->type;
-                
-                elseif ($this->isLink() && ! empty($sort))
-                    $ls['link'][$cname] = $lsinfo[$cname]->type;
-                
-                elseif ($this->isFile() && ! empty($sort))
-                    $ls['file'][$cname] = $lsinfo[$cname]->type;
-                else
-                    $display[$cname] = $lsinfo[$cname]->type;
+                if ($this->isDir() && ! $this->isLink() && ! empty($sort)) {
+                                    $ls['dir'][$cname] = $lsinfo[$cname]->type;
+                } elseif ($this->isLink() && ! empty($sort)) {
+                                    $ls['link'][$cname] = $lsinfo[$cname]->type;
+                } elseif ($this->isFile() && ! empty($sort)) {
+                                    $ls['file'][$cname] = $lsinfo[$cname]->type;
+                } else {
+                                    $display[$cname] = $lsinfo[$cname]->type;
+                }
             }
             $this->next();
         }

php7/Objects/TmpObject.inc

Braces +3 added lines, -2 removed lines

@@ -66,8 +66,9 @@
      */
     public function getTmp()
     {
-        if (empty($this->tmp_path))
-            $this->tmp_path = $this->setTmp();
+        if (empty($this->tmp_path)) {
+                    $this->tmp_path = $this->setTmp();
+        }
         
         $this->debug(805, $this->tmp_path);
         $this->response()->setStatus(true);

php7/Objects/DirectoryPlaceholderObject.inc

Braces +1 added lines, -3 removed lines

@@ -137,9 +137,7 @@
         if (! empty($HID) && is_resource($context)) {
             $this->context = $context;
             return true;
-        } 
-
-        else {
+        } else {
             $this->debug(802, 'DirectoryTrait->dirsetContext');
             return false;
         }

php7/Objects/LinkObject.inc

Braces +30 added lines, -20 removed lines

@@ -38,14 +38,16 @@ 
      */
     public function symlink($target = false, $link = false)
     {
-        if (empty($target) || empty($link))
-            return false;
+        if (empty($target) || empty($link)) {
+                    return false;
+        }
         
         $target = $this->makeAbsolute($target);
         $link = $this->makeAbsolute($link);
         
-        if (! file_exists($target) || file_exists($link))
-            return false;
+        if (! file_exists($target) || file_exists($link)) {
+                    return false;
+        }
         
         return symlink($target, $link);
     }
@@ -57,14 +59,16 @@ 
      */
     public function hardlink($target = false, $link = false)
     {
-        if (empty($target) || empty($link))
-            return false;
+        if (empty($target) || empty($link)) {
+                    return false;
+        }
         
         $target = $this->makeAbsolute($target);
         $link = $this->makeAbsolute($link);
         
-        if (! file_exists($target) || is_dir($target) || file_exists($link))
-            return false;
+        if (! file_exists($target) || is_dir($target) || file_exists($link)) {
+                    return false;
+        }
         
         return link($target, $link);
     }
@@ -76,8 +80,9 @@ 
      */
     public function lstat($link = false)
     {
-        if (empty($link))
-            return false;
+        if (empty($link)) {
+                    return false;
+        }
         $link = $this->makeAbsolute($link);
         return @lstat($link);
     }
@@ -89,8 +94,9 @@ 
      */
     public function lstatDiff($link = false)
     {
-        if (empty($link))
-            return false;
+        if (empty($link)) {
+                    return false;
+        }
         $link = $this->makeAbsolute($link);
         return array_diff(stat($link), lstat($link));
     }
@@ -102,8 +108,9 @@ 
      */
     public function readlink($link = false)
     {
-        if (empty($link))
-            return false;
+        if (empty($link)) {
+                    return false;
+        }
         
         $link = $this->makeAbsolute($link);
         return readlink($link);
@@ -116,8 +123,9 @@ 
      */
     public function lchgrp($link = false, $group = false)
     {
-        if (empty($link))
-            return false;
+        if (empty($link)) {
+                    return false;
+        }
         
         $link = $this->makeAbsolute($link);
         return @lchgrp($link, $group);
@@ -130,8 +138,9 @@ 
      */
     public function lchown($link = false, $group = false)
     {
-        if (empty($link))
-            return false;
+        if (empty($link)) {
+                    return false;
+        }
         
         $link = $this->makeAbsolute($link);
         return @lchown($link, $group);
@@ -144,8 +153,9 @@ 
      */
     public function linkinfo($link = false)
     {
-        if (empty($link))
-            return false;
+        if (empty($link)) {
+                    return false;
+        }
         
         $link = $this->makeAbsolute($link);
         return linkinfo($link);