wapmorgan / UnifiedArchive

src/TarArchive2.php

Spacing +2 added lines, -2 removed lines

@@ -449,7 +449,7 @@ 
                     $compression = 'lzma2';
                     break;
                 case 'z':
-                    $tar_aname = 'compress.lzw://' . $archiveName;
+                    $tar_aname = 'compress.lzw://'.$archiveName;
                     break;
             }
 
@@ -634,7 +634,7 @@ 
                 if (!self::$enabledPharData) {
                     throw new Exception('Archive_Tar not available');
                 }
-                $this->tar = new Archive_Tar('compress.lzw://' . $this->path);
+                $this->tar = new Archive_Tar('compress.lzw://'.$this->path);
                 break;
 
             default:

Braces +66 added lines, -44 removed lines

@@ -57,8 +57,9 @@ 
     {
         self::checkRequirements();
 
-        if (!file_exists($fileName) || !is_readable($fileName))
-            throw new Exception('Count not open file: '.$fileName);
+        if (!file_exists($fileName) || !is_readable($fileName)) {
+                    throw new Exception('Count not open file: '.$fileName);
+        }
 
         $type = self::detectArchiveType($fileName);
         if (!self::canOpenType($type)) {
@@ -168,8 +169,9 @@ 
 
         $this->path = realpath($fileName);
 
-        if (!self::$enabledPharData && !self::$enabledPearTar)
-            throw new Exception('Archive_Tar nor PharData not available');
+        if (!self::$enabledPharData && !self::$enabledPearTar) {
+                    throw new Exception('Archive_Tar nor PharData not available');
+        }
 
         $this->openArchive($type);
         $this->scanArchive();
@@ -199,8 +201,9 @@ 
      */
     public function getFileData($fileName)
     {
-        if (!in_array($fileName, $this->files, true))
-            return false;
+        if (!in_array($fileName, $this->files, true)) {
+                    return false;
+        }
 
         if ($this->tar instanceof Archive_Tar) {
             $index = array_search($fileName, $this->files, true);
@@ -226,12 +229,14 @@ 
      */
     public function getFileContent($fileName)
     {
-        if (!in_array($fileName, $this->files, true))
-            return false;
-        if ($this->tar instanceof Archive_Tar)
-            return $this->tar->extractInString($fileName);
-        else
-            return $this->tar[$fileName]->getContent();
+        if (!in_array($fileName, $this->files, true)) {
+                    return false;
+        }
+        if ($this->tar instanceof Archive_Tar) {
+                    return $this->tar->extractInString($fileName);
+        } else {
+                    return $this->tar[$fileName]->getContent();
+        }
     }
 
     /**
@@ -241,8 +246,9 @@ 
     {
         $tree = array(DIRECTORY_SEPARATOR);
         foreach ($this->files as $filename) {
-            if (in_array(substr($filename, -1), array('/', '\\')))
-                $tree[] = DIRECTORY_SEPARATOR.$filename;
+            if (in_array(substr($filename, -1), array('/', '\\'))) {
+                            $tree[] = DIRECTORY_SEPARATOR.$filename;
+            }
         }
 
         return $tree;
@@ -257,8 +263,9 @@ 
      */
     public function extractFiles($outputFolder, $files = null, $expandFilesList = false)
     {
-        if ($expandFilesList && $files !== null)
-            $files = self::expandFileList($this->files, $files);
+        if ($expandFilesList && $files !== null) {
+                    $files = self::expandFileList($this->files, $files);
+        }
 
         $list = array();
         if ($files === null) {
@@ -292,21 +299,25 @@ 
      */
     public function deleteFiles($fileOrFiles, $expandFilesList = false)
     {
-        if ($this->tar instanceof Archive_Tar)
-            return false;
+        if ($this->tar instanceof Archive_Tar) {
+                    return false;
+        }
 
-        if ($expandFilesList && $fileOrFiles !== null)
-            $fileOrFiles = self::expandFileList($this->files, $fileOrFiles);
+        if ($expandFilesList && $fileOrFiles !== null) {
+                    $fileOrFiles = self::expandFileList($this->files, $fileOrFiles);
+        }
 
         $files = is_string($fileOrFiles) ? array($fileOrFiles) : $fileOrFiles;
         $deleted = 0;
 
         foreach ($files as $i => $file) {
-            if (!in_array($file, $this->files, true))
-                continue;
+            if (!in_array($file, $this->files, true)) {
+                            continue;
+            }
 
-            if ($this->tar->delete($file))
-                $deleted++;
+            if ($this->tar->delete($file)) {
+                            $deleted++;
+            }
         }
 
         $this->tar = null;
@@ -333,11 +344,13 @@ 
                 $remove_dir = dirname($filename);
                 $add_dir = dirname($localname);
                 if (is_null($filename)) {
-                    if ($this->tar->addString($localname, "") === false)
-                        return false;
+                    if ($this->tar->addString($localname, "") === false) {
+                                            return false;
+                    }
                 } else {
-                    if ($this->tar->addModify($filename, $add_dir, $remove_dir) === false)
-                        return false;
+                    if ($this->tar->addModify($filename, $add_dir, $remove_dir) === false) {
+                                            return false;
+                    }
                     $added_files++;
                 }
             }
@@ -416,15 +429,18 @@ 
     {
         self::checkRequirements();
 
-        if (file_exists($archiveName))
-            throw new Exception('Archive '.$archiveName.' already exists!');
+        if (file_exists($archiveName)) {
+                    throw new Exception('Archive '.$archiveName.' already exists!');
+        }
 
         $fileOrFiles = self::createFilesList($fileOrFiles);
 
         // fake creation: return archive data
         if ($emulate) {
             $totalSize = 0;
-            foreach ($fileOrFiles as $fn) $totalSize += filesize($fn);
+            foreach ($fileOrFiles as $fn) {
+             $totalSize += filesize($fn);
+            }
 
             return array(
                 'totalSize' => $totalSize,
@@ -453,21 +469,25 @@ 
                     break;
             }
 
-            if (isset($tar_aname))
-                $tar = new Archive_Tar($tar_aname, $compression);
-            else
-                $tar = new Archive_Tar($archiveName, $compression);
+            if (isset($tar_aname)) {
+                            $tar = new Archive_Tar($tar_aname, $compression);
+            } else {
+                            $tar = new Archive_Tar($archiveName, $compression);
+            }
 
             foreach ($fileOrFiles as $localname => $filename) {
                 $remove_dir = dirname($filename);
                 $add_dir = dirname($localname);
 
                 if (is_null($filename)) {
-                    if ($tar->addString($localname, "") === false)
-                        return false;
+                    if ($tar->addString($localname, "") === false) {
+                                            return false;
+                    }
                 } else {
                     if ($tar->addModify($filename, $add_dir, $remove_dir)
-                        === false) return false;
+                        === false) {
+                     return false;
+                    }
                 }
             }
             $tar = null;
@@ -578,14 +598,16 @@ 
      */
     public function getFileResource($fileName)
     {
-        if (!in_array($fileName, $this->files, true))
-            return false;
+        if (!in_array($fileName, $this->files, true)) {
+                    return false;
+        }
 
         $resource = fopen('php://temp', 'r+');
-        if ($this->tar instanceof Archive_Tar)
-            fwrite($resource, $this->tar->extractInString($fileName));
-        else
-            fwrite($resource, $this->tar[$fileName]->getContent());
+        if ($this->tar instanceof Archive_Tar) {
+                    fwrite($resource, $this->tar->extractInString($fileName));
+        } else {
+                    fwrite($resource, $this->tar[$fileName]->getContent());
+        }
 
         rewind($resource);
         return $resource;