mkungla / libhowi-filesystem

php5/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)) {

Spacing +19 added lines, -19 removed lines

@@ -51,7 +51,7 @@ 
     {
         $this->debug(801);
         $this->setStatus(true);
-        if (! $this->setCwd($setCwd)) {
+        if(!$this->setCwd($setCwd)) {
             $append = error_get_last();
             $this->warning(500, $append['message']);
         }
@@ -67,17 +67,17 @@ 
     public function dir($directory = false, $dirname = false, $recursive = true, $mode = false, $context = false)
     {
         $response = null;
-        if (empty($directory)) {
+        if(empty($directory)) {
             return false;
         }
         // ///////////
         $this->debug(807);
-        if (array_key_exists($directory, $this->dirkeys) &&
+        if(array_key_exists($directory, $this->dirkeys) &&
              array_key_exists($this->dirkeys[$directory], $this->dirs) &&
              is_object($this->dirs[$this->dirkeys[$directory]])) {
             $response = $this->dirs[$this->dirkeys[$directory]];
             $this->response = $this->dirs[$this->dirkeys[$directory]]->response();
-        } elseif (! empty($directory) && ! empty($dirname)) {
+        } elseif(!empty($directory) && !empty($dirname)) {
             
             $dir = $this->makeAbsolute($dirname . DIRECTORY_SEPARATOR . $directory);
             $HID = md5($dir);
@@ -86,12 +86,12 @@ 
                 DirectoryTreeObject::SKIP_DOTS) : new DirectoryPlaceholderObject($dir, $recursive, $mode, 
                 $context, $this->getLogFile(), $this->getLogLevel(), $this->getUID(), $this->getUsername());
             
-            if ($this->dirs[$HID] instanceof DirectoryPlaceholderObject) {
+            if($this->dirs[$HID] instanceof DirectoryPlaceholderObject) {
                 $this->setStatus($this->dirs[$HID]->getStatus());
                 $this->setCode($this->dirs[$HID]->getCode());
             }
             
-            if ($this->dirs[$HID] instanceof DirectoryTreeObject) {
+            if($this->dirs[$HID] instanceof DirectoryTreeObject) {
                 $this->dirs[$HID]->setFileClass('\HOWI3\libhowi\Filesystem\php5\Objects\FileObject');
                 $this->dirs[$HID]->setInfoClass('\HOWI3\libhowi\Filesystem\php5\Objects\InfoObject');
                 $this->dirs[$HID]->setLogFile($this->getLogFile());
@@ -103,7 +103,7 @@ 
             } else {
                 
                 /* We don't need DirectoryPlaceholderObject anymore for this directory */
-                if ($this->isDir($dir)) {
+                if($this->isDir($dir)) {
                     
                     $this->dirs[$HID] = new DirectoryTreeObject($dir, DirectoryTreeObject::SKIP_DOTS);
                     $this->dirs[$HID]->setFileClass('\HOWI3\libhowi\Filesystem\php5\Objects\FileObject');
@@ -128,12 +128,12 @@ 
      */
     public function file($filename = false, $dirname = false, $data = '', $flags = FILE_APPEND, $context = null)
     {
-        if (! empty($filename) && array_key_exists($filename, $this->files) &&
+        if(!empty($filename) && array_key_exists($filename, $this->files) &&
              is_object($this->files[$filename]))
             return $this->files[$filename];
         
         $this->debug(808);
-        if (empty($filename)) {
+        if(empty($filename)) {
             $this->notice(601);
             return false;
         }
@@ -142,16 +142,16 @@ 
         $real = $dirname . DIRECTORY_SEPARATOR . $filename;
         $real = str_replace(DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR, $real);
         
-        if (! $this->exists($real) && ! $this->isWritable(dirname($real))) {
+        if(!$this->exists($real) && !$this->isWritable(dirname($real))) {
             $this->warning(503, $real);
             return false;
-        } elseif (! $this->exists($real) && $this->isWritable(dirname($real))) {
-            $result = empty($context) || ! is_resource($context) ? file_put_contents($real, $data, $flags) : file_put_contents(
+        } elseif(!$this->exists($real) && $this->isWritable(dirname($real))) {
+            $result = empty($context) || !is_resource($context) ? file_put_contents($real, $data, $flags) : file_put_contents(
                 $real, $data, $flags, $context);
             $result = $result !== false ? $this->info(703, $real) : $this->warning(504, $real);
         }
         
-        if ($this->exists($real)) {
+        if($this->exists($real)) {
             $this->files[$filename] = new FileObject($real, 'r+');
             $this->files[$filename]->setFileClass('\HOWI3\libhowi\Filesystem\php5\Objects\FileObject');
             $this->files[$filename]->setInfoClass("\HOWI3\libhowi\Filesystem\php5\Objects\InfoObject");
@@ -168,12 +168,12 @@ 
      */
     public function infoObject($basename = false, $directory = false)
     {
-        if (! empty($basename) && array_key_exists($basename, $this->infos) && is_object(
+        if(!empty($basename) && array_key_exists($basename, $this->infos) && is_object(
             $this->infos[$basename]))
             return $this->infos[$basename];
         
         $this->debug(809);
-        if (empty($basename)) {
+        if(empty($basename)) {
             $this->notice(602);
             return false;
         }
@@ -183,10 +183,10 @@ 
         $real = str_replace(DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR, $real);
         
         
-        if (! $this->exists($real) && ! $this->isReadable($real)) {
+        if(!$this->exists($real) && !$this->isReadable($real)) {
             $this->warning(504, $real);
             $result = false;
-        } elseif ($this->exists($real)) {
+        } elseif($this->exists($real)) {
             $this->infos[$basename] = new InfoObject($real);
             $this->infos[$basename]->setFileClass('\HOWI3\libhowi\Filesystem\php5\Objects\FileObject');
             $this->infos[$basename]->setInfoClass("\HOWI3\libhowi\Filesystem\php5\Objects\InfoObject");
@@ -202,7 +202,7 @@ 
      */
     public function tmp($keyword = 'tmp')
     {
-        if (array_key_exists($keyword, $this->tmp) && is_object($this->tmp[$keyword]) &&
+        if(array_key_exists($keyword, $this->tmp) && is_object($this->tmp[$keyword]) &&
              $this->tmp[$keyword] instanceof \HOWI3\libhowi\Filesystem\Commons\ObjectInterfaces\TmpInterface) {
             return $this->tmp[$keyword];
         } else {
@@ -218,7 +218,7 @@ 
      */
     public function link($keyword = 'link')
     {
-        if (array_key_exists($keyword, $this->link) && is_object($this->link[$keyword]) &&
+        if(array_key_exists($keyword, $this->link) && is_object($this->link[$keyword]) &&
              $this->link[$keyword] instanceof \HOWI3\libhowi\Filesystem\Commons\ObjectInterfaces\LinkInterface) {
             return $this->link[$keyword];
         } else {

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

Doc Comments +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
      *
      * @name $FS = FS::load( string $pathname | $ser_cwd_by_caller boolean true = false, PHP_VERSION_ID );
      *      
-     * @param string|boolean $pathname|$ser_cwd_by_caller
+     * @param string|boolean $ser_cwd_by_caller
      *            Optional: defaults to false.
      *            If path is supplied then that will be current working directory.
      *            If boolean true is supplied it will try to set current working directory as one

Spacing +3 added lines, -3 removed lines

@@ -41,7 +41,7 @@ 
      */
     public static function load($ser_cwd_by_caller = false, $PHP_VERSION_ID = PHP_VERSION_ID)
     {
-        if (! empty($ser_cwd_by_caller) && is_bool($ser_cwd_by_caller)) {
+        if(!empty($ser_cwd_by_caller) && is_bool($ser_cwd_by_caller)) {
             $backtrace = debug_backtrace(
                 defined("DEBUG_BACKTRACE_IGNORE_ARGS") ? DEBUG_BACKTRACE_IGNORE_ARGS : FALSE);
             $cwd_caller = array_pop($backtrace);
@@ -50,9 +50,9 @@ 
         /**
          * Minimum version of PHP must be atleast 5.5.11
          */
-        if ($PHP_VERSION_ID <= 50511)
+        if($PHP_VERSION_ID <= 50511)
             return call_user_func(
-                function () {
+                function() {
                     $self = new self();
                     $self->emergency(100);
                     return $self;

php7/TraitForSharedMethods.inc

Indentation +1 added lines, -1 removed lines

@@ -248,7 +248,7 @@
                 continue;
             
             $fparam = $df . (empty($sfx) ? $locale[$lkey][0] : ' ' .
-                 (($interval->$lkey === 1) ? $locale[$lkey][1] : $locale[$lkey][2]));
+                    (($interval->$lkey === 1) ? $locale[$lkey][1] : $locale[$lkey][2]));
             
             if (! empty($ago_single) && ! empty($dfs))
                 break;

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

Doc Comments +6 added lines

@@ -58,6 +58,7 @@ 
      *
      * {@inheritDoc}
      *
+     * @return string
      */
     public function getCwd()
     {
@@ -196,6 +197,7 @@ 
      *
      * {@inheritDoc}
      *
+     * @param integer $timestamp
      */
     public function ct_ago($timestamp, $date_format = 'y,m,d,h,i,s', $sfx = true, $ommit_zero = true, $ago_single = true, $clocale = [])
     {
@@ -364,6 +366,7 @@ 
      *
      * {@inheritDoc}
      *
+     * @return string
      */
     public function getPath()
     {
@@ -375,6 +378,7 @@ 
      *
      * {@inheritDoc}
      *
+     * @return string
      */
     public function getPathname()
     {
@@ -487,6 +491,7 @@ 
      *
      * {@inheritDoc}
      *
+     * @return false|string
      */
     public function isWritable($path = false)
     {
@@ -591,6 +596,7 @@ 
      *
      * {@inheritDoc}
      *
+     * @return boolean
      */
     public function getFilename($filename = false)
     {

Spacing +52 added lines, -52 removed lines

@@ -37,16 +37,16 @@ 
      */
     protected function setCwd($path = false, $validate_dir_name = false)
     {
-        if (empty($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))
+        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)) {
+        if(!is_dir($current_working_directory) || !is_readable($current_working_directory) ||
+             !chdir($current_working_directory)) {
             $this->alert(200, false, $current_working_directory);
             return false;
         }
@@ -61,7 +61,7 @@ 
      */
     public function getCwd()
     {
-        if (empty($this->cwd))
+        if(empty($this->cwd))
             $this->cwd = getcwd();
         
         return $this->cwd;
@@ -74,11 +74,11 @@ 
      */
     public function getSize($convert = false, $filename = false)
     {
-        $filename = ! empty($filename) ? $this->makeAbsolute($filename) : false;
+        $filename = !empty($filename) ? $this->makeAbsolute($filename) : false;
         $bytestotal = empty($filename) ? ((method_exists(get_parent_class($this), 'getSize')) ? parent::getSize() : false) : filesize(
             $filename);
         
-        if (! $this->isDir($filename) && empty($convert))
+        if(!$this->isDir($filename) && empty($convert))
             return $bytestotal;
         
         $suffixes = array(
@@ -92,16 +92,16 @@ 
             'ZB',
             'YB'
         );
-        if ($this->isDir($filename)) {
+        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')
+            if($path === '/home/nitrotrigger/tmp/libhowi-filesystem/log/phpunit_test.log')
                 die('ss');
             
-            foreach (new RecursiveIteratorIterator(
+            foreach(new RecursiveIteratorIterator(
                 new RecursiveDirectoryIterator($path, RecursiveDirectoryIterator::SKIP_DOTS)) as $object) {
                 $bytestotal += $object->getSize();
             }
-            if (! $convert)
+            if(!$convert)
                 return $bytestotal;
         }
         $base = log($bytestotal, 1024);
@@ -110,14 +110,14 @@ 
             0,
             'B'
         ];
-        if ($bytestotal > 0) {
+        if($bytestotal > 0) {
             
             $result = array(
                 round(pow(1024, $base - floor($base)), 2),
                 $suffixes[floor($base)]
             );
         }
-        return ! empty($convert) ? $result : $result[0];
+        return !empty($convert) ? $result : $result[0];
     }
 
     /**
@@ -128,8 +128,8 @@ 
     public function getATime($timeformat = false, $pathname = false)
     {
         $atime = empty($pathname) ? parent::getATime() : fileatime($this->makeAbsolute($pathname));
-        if (! empty($timeformat) && is_int($atime)) {
-            switch ($timeformat) {
+        if(!empty($timeformat) && is_int($atime)) {
+            switch($timeformat) {
                 case 'ago':
                     $atime = $this->ct_ago($atime, 'y,m,d,h,i,s', false, true);
                     break;
@@ -152,8 +152,8 @@ 
     public function getCTime($timeformat = false, $pathname = false)
     {
         $ctime = empty($pathname) ? parent::getCTime() : filectime($this->makeAbsolute($pathname));
-        if (! empty($timeformat) && is_int($ctime)) {
-            switch ($timeformat) {
+        if(!empty($timeformat) && is_int($ctime)) {
+            switch($timeformat) {
                 case 'ago':
                     $ctime = $this->ct_ago($ctime, 'y,m,d,h,i,s', false, true);
                     break;
@@ -176,8 +176,8 @@ 
     public function getMTime($timeformat = false, $pathname = false)
     {
         $mtime = empty($pathname) ? parent::getMTime() : filemtime($this->makeAbsolute($pathname));
-        if (! empty($timeformat) && is_int($mtime)) {
-            switch ($timeformat) {
+        if(!empty($timeformat) && is_int($mtime)) {
+            switch($timeformat) {
                 case 'ago':
                     $mtime = $this->ct_ago($mtime, 'y,m,d,h,i,s', false, true);
                     break;
@@ -241,21 +241,21 @@ 
         
         $interval = $date->diff(new DateTime('now'));
         
-        for ($df = strtok($date_format, ','); $df !== false; $df = strtok(",")) {
+        for($df = strtok($date_format, ','); $df !== false; $df = strtok(",")) {
             $lkey = ($df !== 'a') ? strtolower($df) : 'days';
             
-            if ($ommit_zero && $interval->$lkey === 0)
+            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))
+            if(!empty($ago_single) && !empty($dfs))
                 break;
             else
-                $dfs = ! empty($dfs) ? $dfs . "%$fparam " : "%$fparam ";
+                $dfs = !empty($dfs) ? $dfs . "%$fparam " : "%$fparam ";
         }
-        if (empty($dfs))
+        if(empty($dfs))
             $ret = $locale['now'];
         else
             $ret = $interval->format($dfs) . $locale['ago'];
@@ -269,10 +269,10 @@ 
      */
     public function openFile($open_mode = "r", $use_include_path = false, $context = null)
     {
-        if (! method_exists(get_parent_class($this), 'openFile'))
+        if(!method_exists(get_parent_class($this), 'openFile'))
             return false;
         
-        return ! $this->isDir() ? (! empty($context) ? parent::openFile($open_mode, $use_include_path, 
+        return !$this->isDir() ? (!empty($context) ? parent::openFile($open_mode, $use_include_path, 
             $context) : parent::openFile($open_mode, $use_include_path)) : false;
     }
 
@@ -283,10 +283,10 @@ 
      */
     public function setFileClass($class_name = "\HOWI3\libhowi\Filesystem\php5\Objects\FileObject")
     {
-        if (! method_exists(get_parent_class($this), 'setFileClass'))
+        if(!method_exists(get_parent_class($this), 'setFileClass'))
             return false;
         
-        if (is_subclass_of($class_name, 'SplFileObject') || $class_name === 'SplFileObject') {
+        if(is_subclass_of($class_name, 'SplFileObject') || $class_name === 'SplFileObject') {
             parent::setFileClass($class_name);
             return true;
         }
@@ -300,10 +300,10 @@ 
      */
     public function setInfoClass($class_name = "\HOWI3\libhowi\Filesystem\php5\Objects\InfoObject")
     {
-        if (! method_exists(get_parent_class($this), 'setInfoClass'))
+        if(!method_exists(get_parent_class($this), 'setInfoClass'))
             return false;
         
-        if (is_subclass_of($class_name, 'SplFileInfo') || $class_name === 'SplFileInfo') {
+        if(is_subclass_of($class_name, 'SplFileInfo') || $class_name === 'SplFileInfo') {
             parent::setInfoClass($class_name);
             return true;
         }
@@ -317,9 +317,9 @@ 
      */
     public function getOwnerName($filename = false)
     {
-        $userID = empty($filename) && method_exists(get_parent_class($this), 'getOwner') ? parent::getOwner() : (! empty(
+        $userID = empty($filename) && method_exists(get_parent_class($this), 'getOwner') ? parent::getOwner() : (!empty(
             $filename) ? fileowner($this->makeAbsolute($filename)) : false);
-        $user = ! empty($userID) ? posix_getpwuid($userID) : false;
+        $user = !empty($userID) ? posix_getpwuid($userID) : false;
         return is_array($user) && array_key_exists('name', $user) ? $user['name'] : false;
     }
 
@@ -332,8 +332,8 @@ 
     {
         $groupID = empty($filename) ? ((method_exists(get_parent_class($this), 'getGroup')) ? parent::getGroup() : false) : filegroup(
             $this->makeAbsolute($filename));
-        $group = ! empty($groupID) ? posix_getgrgid($groupID) : false;
-        return ! empty($group) && array_key_exists('name', $group) ? $group['name'] : false;
+        $group = !empty($groupID) ? posix_getgrgid($groupID) : false;
+        return !empty($group) && array_key_exists('name', $group) ? $group['name'] : false;
     }
 
     /**
@@ -343,7 +343,7 @@ 
      */
     public function getRealpath($filename = false)
     {
-        return ! empty($filename) ? realpath($this->makeAbsolute($filename)) : ((method_exists(
+        return !empty($filename) ? realpath($this->makeAbsolute($filename)) : ((method_exists(
             get_parent_class($this), 'getRealpath')) ? parent::getRealpath() : false);
     }
 
@@ -355,7 +355,7 @@ 
     public function getPathInfo($filename = false, $flags = false, 
         $class_name = '\HOWI3\libhowi\Filesystem\php5\Objects\InfoObject')
     {
-        return ! empty($filename) ? empty($flags) ? pathinfo($this->makeAbsolute($filename)) : pathinfo(
+        return !empty($filename) ? empty($flags) ? pathinfo($this->makeAbsolute($filename)) : pathinfo(
             $this->makeAbsolute($filename), $flags) : (method_exists(get_parent_class($this), 'getPathInfo') ? parent::getPathInfo(
             $class_name) : false);
     }
@@ -421,9 +421,9 @@ 
      */
     public function getBasename($suffix = false, $pathname = false)
     {
-        $pathname = ! empty($pathname) ? $pathname : ($this->isDot() ? $this->getPath() : false);
-        $suffix = ! empty($suffix) ? $suffix : '';
-        return ! empty($pathname) || ! method_exists(get_parent_class($this), 'getBasename') ? basename(
+        $pathname = !empty($pathname) ? $pathname : ($this->isDot() ? $this->getPath() : false);
+        $suffix = !empty($suffix) ? $suffix : '';
+        return !empty($pathname) || !method_exists(get_parent_class($this), 'getBasename') ? basename(
             $pathname, $suffix) : parent::getBasename($suffix);
     }
 
@@ -436,7 +436,7 @@ 
     {
         $perms = empty($filename) ? ((method_exists(get_parent_class($this), 'getPerms')) ? parent::getPerms() : false) : fileperms(
             $this->makeAbsolute($filename));
-        return ! empty($perms) ? (int) ltrim(substr(sprintf('%o', $perms), - 4), '0') : false;
+        return !empty($perms) ? (int) ltrim(substr(sprintf('%o', $perms), - 4), '0') : false;
     }
 
     /**
@@ -446,7 +446,7 @@ 
      */
     public function getType($filename = false)
     {
-        return ! empty($filename) ? filetype($this->makeAbsolute($filename)) : ((method_exists(
+        return !empty($filename) ? filetype($this->makeAbsolute($filename)) : ((method_exists(
             get_parent_class($this), 'getType')) ? parent::getType() : false);
     }
 
@@ -523,7 +523,7 @@ 
      */
     public function isExecutable($filename = false)
     {
-        return ! empty($filename) ? is_executable($this->makeAbsolute($filename)) : ((method_exists(
+        return !empty($filename) ? is_executable($this->makeAbsolute($filename)) : ((method_exists(
             get_parent_class($this), 'isExecutable')) ? parent::isExecutable() : false);
     }
 
@@ -534,7 +534,7 @@ 
      */
     public function isFile($filename = false)
     {
-        return ! empty($filename) ? is_file($this->makeAbsolute($filename)) : ((method_exists(
+        return !empty($filename) ? is_file($this->makeAbsolute($filename)) : ((method_exists(
             get_parent_class($this), 'isFile')) ? parent::isFile() : false);
     }
 
@@ -545,7 +545,7 @@ 
      */
     public function isLink($filename = false)
     {
-        return ! empty($filename) ? is_link($this->makeAbsolute($filename)) : ((method_exists(
+        return !empty($filename) ? is_link($this->makeAbsolute($filename)) : ((method_exists(
             get_parent_class($this), 'isLink')) ? parent::isLink() : false);
     }
 
@@ -556,13 +556,13 @@ 
      */
     public function makeAbsolute($path = false)
     {
-        if (! empty($path) && $this->isAbsolute($path))
+        if(!empty($path) && $this->isAbsolute($path))
             $absolute_path = $path;
-        elseif (! empty($path) && $this->isRelative($path)) {
+        elseif(!empty($path) && $this->isRelative($path)) {
             
-            if (preg_match('/^(~\/)/', $path) === 1) {
+            if(preg_match('/^(~\/)/', $path) === 1) {
                 $absolute_path = getenv("HOME") . substr($path, 1);
-            } elseif (preg_match('/^(.\/|..\/)/', $path) === 1) {
+            } elseif(preg_match('/^(.\/|..\/)/', $path) === 1) {
                 $absolute_path = realpath($path);
             } else
                 $absolute_path = $this->getCwd() . ($path !== '.' ? DIRECTORY_SEPARATOR . $path : '');
@@ -579,12 +579,12 @@ 
      */
     public function exists($pathname = false)
     {
-        if (empty($pathname))
+        if(empty($pathname))
             return false;
         
         $pathname = $this->makeAbsolute($pathname);
         
-        return ! empty($pathname) ? file_exists($pathname) : false;
+        return !empty($pathname) ? file_exists($pathname) : false;
     }
 
     /**
@@ -594,7 +594,7 @@ 
      */
     public function getFilename($filename = false)
     {
-        return ! empty($filename) ? basename($this->makeAbsolute($filename)) : ((method_exists(
+        return !empty($filename) ? basename($this->makeAbsolute($filename)) : ((method_exists(
             get_parent_class($this), 'getFilename')) ? parent::getFilename() : false);
     }
 
@@ -605,7 +605,7 @@ 
      */
     public function getExtension($filename = false)
     {
-        return ! empty($filename) ? pathinfo($this->makeAbsolute($filename), PATHINFO_EXTENSION) : ((method_exists(
+        return !empty($filename) ? pathinfo($this->makeAbsolute($filename), PATHINFO_EXTENSION) : ((method_exists(
             get_parent_class($this), 'getExtension')) ? parent::getExtension() : false);
     }
 }

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

Spacing +19 added lines, -19 removed lines

@@ -51,7 +51,7 @@ 
     {
         $this->debug(801);
         $this->setStatus(true);
-        if (! $this->setCwd($setCwd)) {
+        if(!$this->setCwd($setCwd)) {
             $append = error_get_last();
             $this->warning(500, $append['message']);
         }
@@ -67,17 +67,17 @@ 
     public function dir($directory = false, $dirname = false, $recursive = true, $mode = false, $context = false)
     {
         $response = null;
-        if (empty($directory)) {
+        if(empty($directory)) {
             return false;
         }
         // ///////////
         $this->debug(807);
-        if (array_key_exists($directory, $this->dirkeys) &&
+        if(array_key_exists($directory, $this->dirkeys) &&
              array_key_exists($this->dirkeys[$directory], $this->dirs) &&
              is_object($this->dirs[$this->dirkeys[$directory]])) {
             $response = $this->dirs[$this->dirkeys[$directory]];
             $this->response = $this->dirs[$this->dirkeys[$directory]]->response();
-        } elseif (! empty($directory) && ! empty($dirname)) {
+        } elseif(!empty($directory) && !empty($dirname)) {
             
             $dir = $this->makeAbsolute($dirname . DIRECTORY_SEPARATOR . $directory);
             $HID = md5($dir);
@@ -86,12 +86,12 @@ 
                 DirectoryTreeObject::SKIP_DOTS) : new DirectoryPlaceholderObject($dir, $recursive, $mode, 
                 $context, $this->getLogFile(), $this->getLogLevel(), $this->getUID(), $this->getUsername());
             
-            if ($this->dirs[$HID] instanceof DirectoryPlaceholderObject) {
+            if($this->dirs[$HID] instanceof DirectoryPlaceholderObject) {
                 $this->setStatus($this->dirs[$HID]->getStatus());
                 $this->setCode($this->dirs[$HID]->getCode());
             }
             
-            if ($this->dirs[$HID] instanceof DirectoryTreeObject) {
+            if($this->dirs[$HID] instanceof DirectoryTreeObject) {
                 $this->dirs[$HID]->setFileClass('\HOWI3\libhowi\Filesystem\php5\Objects\FileObject');
                 $this->dirs[$HID]->setInfoClass('\HOWI3\libhowi\Filesystem\php5\Objects\InfoObject');
                 $this->dirs[$HID]->setLogFile($this->getLogFile());
@@ -103,7 +103,7 @@ 
             } else {
                 
                 /* We don't need DirectoryPlaceholderObject anymore for this directory */
-                if ($this->isDir($dir)) {
+                if($this->isDir($dir)) {
                     
                     $this->dirs[$HID] = new DirectoryTreeObject($dir, DirectoryTreeObject::SKIP_DOTS);
                     $this->dirs[$HID]->setFileClass('\HOWI3\libhowi\Filesystem\php5\Objects\FileObject');
@@ -128,12 +128,12 @@ 
      */
     public function file($filename = false, $dirname = false, $data = '', $flags = FILE_APPEND, $context = null)
     {
-        if (! empty($filename) && array_key_exists($filename, $this->files) &&
+        if(!empty($filename) && array_key_exists($filename, $this->files) &&
              is_object($this->files[$filename]))
             return $this->files[$filename];
         
         $this->debug(808);
-        if (empty($filename)) {
+        if(empty($filename)) {
             $this->notice(601);
             return false;
         }
@@ -142,16 +142,16 @@ 
         $real = $dirname . DIRECTORY_SEPARATOR . $filename;
         $real = str_replace(DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR, $real);
         
-        if (! $this->exists($real) && ! $this->isWritable(dirname($real))) {
+        if(!$this->exists($real) && !$this->isWritable(dirname($real))) {
             $this->warning(503, $real);
             return false;
-        } elseif (! $this->exists($real) && $this->isWritable(dirname($real))) {
-            $result = empty($context) || ! is_resource($context) ? file_put_contents($real, $data, $flags) : file_put_contents(
+        } elseif(!$this->exists($real) && $this->isWritable(dirname($real))) {
+            $result = empty($context) || !is_resource($context) ? file_put_contents($real, $data, $flags) : file_put_contents(
                 $real, $data, $flags, $context);
             $result = $result !== false ? $this->info(703, $real) : $this->warning(504, $real);
         }
         
-        if ($this->exists($real)) {
+        if($this->exists($real)) {
             $this->files[$filename] = new FileObject($real, 'r+');
             $this->files[$filename]->setFileClass('\HOWI3\libhowi\Filesystem\php5\Objects\FileObject');
             $this->files[$filename]->setInfoClass("\HOWI3\libhowi\Filesystem\php5\Objects\InfoObject");
@@ -168,12 +168,12 @@ 
      */
     public function infoObject($basename = false, $directory = false)
     {
-        if (! empty($basename) && array_key_exists($basename, $this->infos) && is_object(
+        if(!empty($basename) && array_key_exists($basename, $this->infos) && is_object(
             $this->infos[$basename]))
             return $this->infos[$basename];
         
         $this->debug(809);
-        if (empty($basename)) {
+        if(empty($basename)) {
             $this->notice(602);
             return false;
         }
@@ -183,10 +183,10 @@ 
         $real = str_replace(DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR, $real);
         
         
-        if (! $this->exists($real) && ! $this->isReadable($real)) {
+        if(!$this->exists($real) && !$this->isReadable($real)) {
             $this->warning(504, $real);
             $result = false;
-        } elseif ($this->exists($real)) {
+        } elseif($this->exists($real)) {
             $this->infos[$basename] = new InfoObject($real);
             $this->infos[$basename]->setFileClass('\HOWI3\libhowi\Filesystem\php5\Objects\FileObject');
             $this->infos[$basename]->setInfoClass("\HOWI3\libhowi\Filesystem\php5\Objects\InfoObject");
@@ -202,7 +202,7 @@ 
      */
     public function tmp($keyword = 'tmp')
     {
-        if (array_key_exists($keyword, $this->tmp) && is_object($this->tmp[$keyword]) &&
+        if(array_key_exists($keyword, $this->tmp) && is_object($this->tmp[$keyword]) &&
              $this->tmp[$keyword] instanceof \HOWI3\libhowi\Filesystem\Commons\ObjectInterfaces\TmpInterface) {
             return $this->tmp[$keyword];
         } else {
@@ -218,7 +218,7 @@ 
      */
     public function link($keyword = 'link')
     {
-        if (array_key_exists($keyword, $this->link) && is_object($this->link[$keyword]) &&
+        if(array_key_exists($keyword, $this->link) && is_object($this->link[$keyword]) &&
              $this->link[$keyword] instanceof \HOWI3\libhowi\Filesystem\Commons\ObjectInterfaces\LinkInterface) {
             return $this->link[$keyword];
         } else {

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

Spacing +41 added lines, -41 removed lines

@@ -49,17 +49,17 @@ 
     {
         $pathname = $this->makeAbsolute($pathname);
         $response = false;
-        if (is_dir($pathname)) {
+        if(is_dir($pathname)) {
             
             $files = array_diff(scandir($pathname), 
                 array(
                     '.',
                     '..'
                 ));
-            foreach ($files as $file) {
+            foreach($files as $file) {
                 
-                (is_dir("$pathname/$file") ? $this->rm("$pathname/$file", $shred) : (! empty($shred) &&
-                     ! $this->isLink($pathname . DIRECTORY_SEPARATOR . $file) ? exec(
+                (is_dir("$pathname/$file") ? $this->rm("$pathname/$file", $shred) : (!empty($shred) &&
+                     !$this->isLink($pathname . DIRECTORY_SEPARATOR . $file) ? exec(
                         "shred -fzu $pathname" . DIRECTORY_SEPARATOR . "$file") : $this->rm(
                         $pathname . DIRECTORY_SEPARATOR . $file, $shred)));
             }
@@ -70,7 +70,7 @@ 
         } else {
             $this->info(702, $pathname);
             $this->response()->setStatus($response);
-            (! empty($shred) && ! $this->isLink($pathname) ? exec("shred -fzu $pathname") : unlink($pathname));
+            (!empty($shred) && !$this->isLink($pathname) ? exec("shred -fzu $pathname") : unlink($pathname));
         }
         return $response;
     }
@@ -82,7 +82,7 @@ 
      */
     public function scandir($path = false)
     {
-        return ! empty($path) && is_dir($this->makeAbsolute($path)) ? scandir($this->makeAbsolute($path)) : false;
+        return !empty($path) && is_dir($this->makeAbsolute($path)) ? scandir($this->makeAbsolute($path)) : false;
     }
 
     /**
@@ -92,7 +92,7 @@ 
      */
     public function stat($filename = false)
     {
-        return ! empty($filename) && file_exists($this->makeAbsolute($filename)) ? stat(
+        return !empty($filename) && file_exists($this->makeAbsolute($filename)) ? stat(
             $this->makeAbsolute($filename)) : false;
     }
 
@@ -103,10 +103,10 @@ 
      */
     public function getDiskTotalSpace($partition_location = false, $convert = false)
     {
-        if (empty($partition_location))
+        if(empty($partition_location))
             $partition_location = $this->getCwd();
         
-        if (empty($convert))
+        if(empty($convert))
             return disk_total_space($partition_location);
         
         $bytestotal = 0;
@@ -137,10 +137,10 @@ 
      */
     public function getDiskFreeSpace($partition_location = false, $convert = false)
     {
-        if (empty($partition_location))
+        if(empty($partition_location))
             $partition_location = $this->getCwd();
         
-        if (empty($convert))
+        if(empty($convert))
             return disk_free_space($partition_location);
         
         $result = [
@@ -163,7 +163,7 @@ 
         
         $base = log($bytestotal, 1024);
         
-        if ($bytestotal > 0) {
+        if($bytestotal > 0) {
             $result = array(
                 round(pow(1024, $base - floor($base)), 2),
                 $suffixes[floor($base)]
@@ -179,7 +179,7 @@ 
      */
     public function chgrp($filename = false, $group = false)
     {
-        return ! empty($filename) && $this->exists($this->makeAbsolute($filename)) ? chgrp(
+        return !empty($filename) && $this->exists($this->makeAbsolute($filename)) ? chgrp(
             $this->makeAbsolute($filename), $group) : false;
     }
 
@@ -191,7 +191,7 @@ 
     public function chmod($filename = false, $mode = false)
     {
         $filename = $this->makeAbsolute($filename);
-        if (file_exists($filename) && ! empty($mode) && is_int($mode))
+        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,7 +205,7 @@ 
     public function chown($filename = false, $user = false)
     {
         $filename = $this->makeAbsolute($filename);
-        if (file_exists($filename) && ! empty($user))
+        if(file_exists($filename) && !empty($user))
             return chown($filename, $user);
         else
             return false;
@@ -218,7 +218,7 @@ 
      */
     public function clearstatcache($clear_realpath_cache = false, $filename = false)
     {
-        if (! empty($filename) && ! empty($clear_realpath_cache))
+        if(!empty($filename) && !empty($clear_realpath_cache))
             clearstatcache($clear_realpath_cache, $this->makeAbsolute($filename));
         else
             clearstatcache();
@@ -234,13 +234,13 @@ 
         $source = $this->makeAbsolute($source);
         $dest = $this->makeAbsolute($dest);
         
-        if (! empty($source) && ! empty($dest) && ! is_dir($source)) {
+        if(!empty($source) && !empty($dest) && !is_dir($source)) {
             
-            if (empty($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)) {
+        } elseif((!empty($source) && !empty($dest)) && is_dir($source) && !file_exists($dest)) {
             
             $tmp_key = basename($source);
             $tmp_key2 = basename($dest);
@@ -250,11 +250,11 @@ 
             $this->close($tmp_key);
             $this->close($tmp_key2);
             
-            foreach ($iterator = new RecursiveIteratorIterator(
-                new \RecursiveDirectoryIterator($source, \RecursiveDirectoryIterator::SKIP_DOTS),  // DirectoryTreeObject::CURRENT_AS_FILEINFO
+            foreach($iterator = new RecursiveIteratorIterator(
+                new \RecursiveDirectoryIterator($source, \RecursiveDirectoryIterator::SKIP_DOTS), // DirectoryTreeObject::CURRENT_AS_FILEINFO
                 \RecursiveIteratorIterator::SELF_FIRST) as $item) {
-                if ($item->isDir()) {
-                    if (empty($context)) {
+                if($item->isDir()) {
+                    if(empty($context)) {
                         mkdir($dest . DIRECTORY_SEPARATOR . $iterator->getSubPathName(), 
                             octdec(str_pad($iterator->getPerms(), 4, 0, STR_PAD_LEFT)));
                     } 
@@ -263,7 +263,7 @@ 
                         mkdir($dest . DIRECTORY_SEPARATOR . $iterator->getSubPathName(), 
                             octdec(str_pad($iterator->getPerms(), 4, 0, STR_PAD_LEFT)), false, $context);
                 } else {
-                    if (empty($context))
+                    if(empty($context))
                         $this->copy($item, $dest . DIRECTORY_SEPARATOR . $iterator->getSubPathName());
                     else
                         $this->copy($item, $dest . DIRECTORY_SEPARATOR . $iterator->getSubPathName(), 
@@ -283,13 +283,13 @@ 
      */
     public function mv($oldname = false, $newname = false, $context = false)
     {
-        if (empty($oldname) || empty($newname))
+        if(empty($oldname) || empty($newname))
             return false;
         
         $oldname = $this->makeAbsolute($oldname);
         $newname = $this->makeAbsolute($newname);
         
-        if (! empty($context))
+        if(!empty($context))
             return rename($oldname, $newname, $context);
         
         return rename($oldname, $newname);
@@ -302,10 +302,10 @@ 
      */
     public function namePatternMatch($pattern = false, $string = false, $flags = false)
     {
-        if (empty($pattern))
+        if(empty($pattern))
             return false;
         
-        if (! empty($flags))
+        if(!empty($flags))
             return fnmatch($pattern, $string, $flags);
         else
             return fnmatch($pattern, $string);
@@ -359,12 +359,12 @@ 
      */
     public function close($keyword = false)
     {
-        if (!empty($keyword) && array_key_exists($keyword, $this->dirkeys) &&
+        if(!empty($keyword) && array_key_exists($keyword, $this->dirkeys) &&
              array_key_exists($this->dirkeys[$keyword], $this->dirs)) {
             unset($this->dirs[$this->dirkeys[$keyword]]);
             unset($this->dirkeys[$keyword]);
             return true;
-        } elseif(!empty($keyword) && array_key_exists($keyword,$this->files)) {
+        } elseif(!empty($keyword) && array_key_exists($keyword, $this->files)) {
             $this->files[$keyword] = null;
             unset($this->files[$keyword]);
             return true;
@@ -380,13 +380,13 @@ 
      */
     public function touch($filename = false, $time = false, $atime = false)
     {
-        if (empty($filename))
+        if(empty($filename))
             return false;
         
         $filename = $this->makeAbsolute($filename);
         
-        $time = ! empty($time) ? $time : time();
-        $atime = ! empty($atime) ? $atime : time();
+        $time = !empty($time) ? $time : time();
+        $atime = !empty($atime) ? $atime : time();
         
         return touch($filename, $time, $atime);
     }
@@ -419,22 +419,22 @@ 
     public function createStructure($rootpath, $data_array, $skip_debug = false)
     {
         $absolute_path = $this->makeAbsolute($rootpath);
-        if (empty($skip_debug))
+        if(empty($skip_debug))
             $this->debug(810);
-        if (empty($rootpath) || ! is_array($data_array) ||
-             (! $this->isWritable($absolute_path) && ! $this->isWritable(dirname($absolute_path))))
+        if(empty($rootpath) || !is_array($data_array) ||
+             (!$this->isWritable($absolute_path) && !$this->isWritable(dirname($absolute_path))))
             return $this->warning(506) && false;
         
-        if (! $this->isDir($absolute_path))
+        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);
+        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 (empty($skip_debug))
+        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(' ');

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
      */
     public function flock($operation, &$wouldblock = NULL)
     {
-        return ! $wouldblock ? parent::flock($operation) : parent::flock($operation, $wouldblock);
+        return !$wouldblock ? parent::flock($operation) : parent::flock($operation, $wouldblock);
     }
 
     /**
@@ -89,7 +89,7 @@ 
     {
         if(!is_int($size) || $this->getSize() > $size) return false;
         
-        $this->fseek($size ,SEEK_SET);
+        $this->fseek($size, SEEK_SET);
         $this->fwrite(' ');
         return true;
     }

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

Spacing +18 added lines, -18 removed lines

@@ -47,9 +47,9 @@ 
      */
     public function c($basename = false)
     {
-        if (! empty($basename) && array_key_exists($basename, $this->dirkeys))
+        if(!empty($basename) && array_key_exists($basename, $this->dirkeys))
             $c = $this->dirkeys[$basename];
-        elseif (! empty($basename) && is_dir($this->getPath() . DIRECTORY_SEPARATOR . $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');
@@ -92,27 +92,27 @@ 
         ];
         $display = [];
         
-        while ($this->valid()) {
-            if (! $this->isDot()) {
-                if ($this->isDir() && ! $this->isLink() && ! empty($sort))
+        while($this->valid()) {
+            if(!$this->isDot()) {
+                if($this->isDir() && !$this->isLink() && !empty($sort))
                     $ls['dir'][$this->getFilename()] = $this->getType();
                 
-                elseif ($this->isLink() && ! empty($sort))
+                elseif($this->isLink() && !empty($sort))
                     $ls['link'][$this->getFilename()] = $this->getType();
                 
-                elseif ($this->isFile() && ! empty($sort))
+                elseif($this->isFile() && !empty($sort))
                     $ls['file'][$this->getFilename()] = $this->getType();
                 else
                     $display[$this->getFilename()] = $this->getType();
                 
-                if ($this->isDir() || $this->isLink()) {
+                if($this->isDir() || $this->isLink()) {
                     $this->dirkeys[$this->getFilename()] = $this->getChildren();
                 }
             }
             
             $this->next();
         }
-        if (! empty($sort)) {
+        if(!empty($sort)) {
             
             ksort($ls['dir']);
             ksort($ls['link']);
@@ -140,9 +140,9 @@ 
         $display = [];
         $lsinfo = [];
         
-        while ($this->valid()) {
+        while($this->valid()) {
             
-            if (! $this->isDot()) {
+            if(!$this->isDot()) {
                 $cname = $this->getFilename();
                 $lsinfo[$cname] = new \stdClass();
                 $lsinfo[$cname]->name = $this->getFilename();
@@ -153,27 +153,27 @@ 
                 $lsinfo[$cname]->tchange = $this->getCTime($timeformat);
                 $lsinfo[$cname]->tmodify = $this->getMTime($timeformat);
                 
-                if ($this->isDir() && ! $this->isLink() && ! empty($sort))
+                if($this->isDir() && !$this->isLink() && !empty($sort))
                     $ls['dir'][$cname] = $lsinfo[$cname]->type;
                 
-                elseif ($this->isLink() && ! empty($sort))
+                elseif($this->isLink() && !empty($sort))
                     $ls['link'][$cname] = $lsinfo[$cname]->type;
                 
-                elseif ($this->isFile() && ! empty($sort))
+                elseif($this->isFile() && !empty($sort))
                     $ls['file'][$cname] = $lsinfo[$cname]->type;
                 else
                     $display[$cname] = $lsinfo[$cname]->type;
             }
             $this->next();
         }
-        if (! empty($sort)) {
+        if(!empty($sort)) {
             ksort($ls['dir']);
             ksort($ls['link']);
             ksort($ls['file']);
             
             $display = array_merge($ls['dir'], $ls['link'], $ls['file']);
         }
-        foreach ($display as $row => $type) {
+        foreach($display as $row => $type) {
             $display[$row] = $lsinfo[$row];
         }
         return $display;
@@ -192,14 +192,14 @@ 
         
         $ritit = new RecursiveIteratorIterator($DirectoryTreeObject, RecursiveIteratorIterator::CHILD_FIRST);
         $tree = array();
-        foreach ($ritit as $splFileInfo) {
+        foreach($ritit as $splFileInfo) {
             $path = $splFileInfo->isDir() ? array(
                 $splFileInfo->getFilename() => array()
             ) : array(
                 $splFileInfo->getFilename()
             );
             
-            for ($depth = $ritit->getDepth() - 1; $depth >= 0; $depth --) {
+            for($depth = $ritit->getDepth() - 1; $depth >= 0; $depth--) {
                 $path = array(
                     $ritit->getSubIterator($depth)
                         ->current()

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

Spacing +4 added lines, -4 removed lines

@@ -42,12 +42,12 @@ 
      */
     public function setTmp($path = false)
     {
-        if (! empty($path)) {
+        if(!empty($path)) {
             $tmp = $this->makeAbsolute($path);
             $isWritable = $this->isWritable($tmp);
             $this->tmp_path = $isWritable ? $tmp : $this->tmp_path;
             
-            ! empty($isWritable) ? $this->debug(803) : $this->warning(501, $tmp);
+            !empty($isWritable) ? $this->debug(803) : $this->warning(501, $tmp);
             $this->response()->setStatus($isWritable);
         } else {
             $this->tmp_path = sys_get_temp_dir();
@@ -66,7 +66,7 @@ 
      */
     public function getTmp()
     {
-        if (empty($this->tmp_path))
+        if(empty($this->tmp_path))
             $this->tmp_path = $this->setTmp();
         
         $this->debug(805, $this->tmp_path);
@@ -100,7 +100,7 @@ 
     {
         $this->debug(807);
         $tmpfie = tmpfile();
-        $this->response()->setStatus(! empty($tmpfie) ? true : false);
+        $this->response()->setStatus(!empty($tmpfie) ? true : false);
         return $tmpfie;
     }
 }

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

Spacing +13 added lines, -13 removed lines

@@ -53,23 +53,23 @@ 
     public function __construct($pathname = false, $recursive = true, $mode = false, $context = false, $logfile = false, 
         $loglevel = false, $UID = false, $username = false)
     {
-        if (! empty($logfile) && file_exists($logfile) && ! empty($loglevel)) {
+        if(!empty($logfile) && file_exists($logfile) && !empty($loglevel)) {
             $this->setLogfile($logfile);
             $this->setLoglevel($loglevel);
             $this->setUID($UID);
             $this->setUsername($username);
         }
         
-        $pathname = (! empty($pathname) ? $this->makeAbsolute($pathname) : $this->path);
+        $pathname = (!empty($pathname) ? $this->makeAbsolute($pathname) : $this->path);
         
         $HID = md5($pathname);
         
         $this->dirsetPath($pathname, $HID);
-        $this->dirsetMode(! empty($mode) ? $mode : $this->mode, $HID);
+        $this->dirsetMode(!empty($mode) ? $mode : $this->mode, $HID);
         
-        $this->dirsetRecursive(! empty($recursive) ? true : false, $HID);
+        $this->dirsetRecursive(!empty($recursive) ? true : false, $HID);
         
-        $context = ! empty($context) ? $this->dirsetContext($context, $HID) : false;
+        $context = !empty($context) ? $this->dirsetContext($context, $HID) : false;
         
         $this->info(701, $pathname);
         $this->response()->setStatus($this->dirCreate($HID));
@@ -82,7 +82,7 @@ 
      */
     public function dirsetPath($pathname = false, $HID = false)
     {
-        if (! empty($pathname) && is_string($pathname) && ! empty($HID)) {
+        if(!empty($pathname) && is_string($pathname) && !empty($HID)) {
             
             $this->path = $this->makeAbsolute($pathname);
             
@@ -100,7 +100,7 @@ 
      */
     public function dirsetMode($mode = false, $HID = false)
     {
-        if (! empty($HID) && ! empty($mode) && is_int($mode)) {
+        if(!empty($HID) && !empty($mode) && is_int($mode)) {
             $this->mode = $mode;
             return true;
         } else {
@@ -117,7 +117,7 @@ 
      */
     public function dirsetRecursive($recursive = false, $HID = false)
     {
-        if (! empty($HID) && is_bool($recursive)) {
+        if(!empty($HID) && is_bool($recursive)) {
             $this->recursive = $recursive;
             return true;
         } else {
@@ -134,7 +134,7 @@ 
      */
     public function dirsetContext($context = false, $HID = false)
     {
-        if (! empty($HID) && is_resource($context)) {
+        if(!empty($HID) && is_resource($context)) {
             $this->context = $context;
             return true;
         } 
@@ -152,16 +152,16 @@ 
      */
     public function dirCreate($HID = false)
     {
-        if ((! is_dir(dirname($this->path)) && $this->recursive === false) ||
-             is_dir(dirname($this->path)) && ! $this->isWritable(dirname($this->path))) {
+        if((!is_dir(dirname($this->path)) && $this->recursive === false) ||
+             is_dir(dirname($this->path)) && !$this->isWritable(dirname($this->path))) {
             $this->warning(502, $this->path);
             $result = false;
         } else {
-            if (! empty($HID) && ! $this->exists($this->path) && ! empty($this->context)) {
+            if(!empty($HID) && !$this->exists($this->path) && !empty($this->context)) {
                 $result = mkdir($this->path, octdec(str_pad($this->mode, 4, 0, STR_PAD_LEFT)), 
                     $this->recursive, $this->context);
             }
-            if (! empty($HID) && ! $this->exists($this->path) && empty($this->context)) {
+            if(!empty($HID) && !$this->exists($this->path) && empty($this->context)) {
                 
                 $result = mkdir($this->path, octdec(str_pad($this->mode, 4, 0, STR_PAD_LEFT)), true);
             }