wapmorgan / UnifiedArchive

src/Commands/ExtractFileCommand.php

Spacing +2 added lines, -2 removed lines

@@ -27,14 +27,14 @@
         list($archive, $file) = $this->getArchiveAndFile($input, $output);
         $destination = $input->getArgument('destination');
         if (is_dir($destination)) {
-            $destination = $destination . '/' . basename($file);
+            $destination = $destination.'/'.basename($file);
         }
 
         $overwrite = $input->getOption('overwrite');
 
         if (file_exists($destination) && !$overwrite) {
             if ($input->getOption('no-interaction')) {
-                throw new \LogicException('File destination ' . $destination . ' exists');
+                throw new \LogicException('File destination '.$destination.' exists');
             }
         }
 

src/ArchiveEntry.php

Braces +3 added lines, -2 removed lines

@@ -46,8 +46,9 @@
         $this->compressedSize = $compressedSize;
         $this->uncompressedSize = $uncompressedSize;
         $this->modificationTime = $modificationTime;
-        if ($isCompressed === null)
-            $isCompressed = $uncompressedSize !== $compressedSize;
+        if ($isCompressed === null) {
+                    $isCompressed = $uncompressedSize !== $compressedSize;
+        }
         $this->isCompressed = $isCompressed;
         $this->comment = $comment;
         $this->crc32 = $crc32;

src/Drivers/SevenZip.php

Spacing +4 added lines, -4 removed lines

@@ -108,7 +108,7 @@ 
     public static function getInstallationInstruction()
     {
         if (!class_exists('\Archive7z\Archive7z'))
-            return 'install library [gemorroj/archive7z]: `composer require gemorroj/archive7z`' . "\n"
+            return 'install library [gemorroj/archive7z]: `composer require gemorroj/archive7z`'."\n"
                 . ' and console program p7zip [7za]: `apt install p7zip-full` - depends on OS';
 
         if (Archive7z::getBinaryVersion() === false)
@@ -150,8 +150,8 @@ 
             $information->files[] = $can_get_unix_path
                 ? $entry->getUnixPath()
                 : str_replace('\\', '/', $entry->getPath());
-            $information->compressedFilesSize += (int)$entry->getPackedSize();
-            $information->uncompressedFilesSize += (int)$entry->getSize();
+            $information->compressedFilesSize += (int) $entry->getPackedSize();
+            $information->uncompressedFilesSize += (int) $entry->getSize();
         }
         return $information;
     }
@@ -209,7 +209,7 @@ 
     {
         $entry = $this->sevenZip->getEntry($fileName);
         if ($entry === null) {
-            throw new NonExistentArchiveFileException('File ' . $fileName . ' does not exist');
+            throw new NonExistentArchiveFileException('File '.$fileName.' does not exist');
         }
         return $entry->getContent();
     }

Braces +21 added lines, -14 removed lines

@@ -36,12 +36,14 @@ 
      */
     public static function getInstallationInstruction()
     {
-        if (!class_exists('\Archive7z\Archive7z'))
-            return 'install library [gemorroj/archive7z]: `composer require gemorroj/archive7z`' . "\n"
+        if (!class_exists('\Archive7z\Archive7z')) {
+                    return 'install library [gemorroj/archive7z]: `composer require gemorroj/archive7z`' . "\n"
                 . ' and console program p7zip [7za]: `apt install p7zip-full` - depends on OS';
+        }
 
-        if (Archive7z::getBinaryVersion() === false)
-            return 'install console program p7zip [7za]: `apt install p7zip-full` - depends on OS';
+        if (Archive7z::getBinaryVersion() === false) {
+                    return 'install console program p7zip [7za]: `apt install p7zip-full` - depends on OS';
+        }
 
         return null;
     }
@@ -145,8 +147,9 @@ 
         try {
             $this->format = $format;
             $this->sevenZip = new Archive7z($archiveFileName, null, null);
-            if ($password !== null)
-                $this->sevenZip->setPassword($password);
+            if ($password !== null) {
+                            $this->sevenZip->setPassword($password);
+            }
         } catch (\Archive7z\Exception $e) {
             throw new Exception('Could not open 7Zip archive: '.$e->getMessage(), $e->getCode(), $e);
         }
@@ -164,8 +167,9 @@ 
                 continue;
             }
 
-            if (!isset($can_get_unix_path))
-                $can_get_unix_path = method_exists($entry, 'getUnixPath');
+            if (!isset($can_get_unix_path)) {
+                            $can_get_unix_path = method_exists($entry, 'getUnixPath');
+            }
 
             $information->files[] = $can_get_unix_path
                 ? $entry->getUnixPath()
@@ -183,8 +187,9 @@ 
     {
         $files = [];
         foreach ($this->sevenZip->getEntries() as $entry) {
-            if ($entry->isDirectory())
-                continue;
+            if ($entry->isDirectory()) {
+                            continue;
+            }
             $files[] = $entry->getPath();
         }
         return $files;
@@ -336,8 +341,9 @@ 
     public function addFileFromString($inArchiveName, $content)
     {
         $tmp_file = tempnam(sys_get_temp_dir(), 'ua');
-        if (!$tmp_file)
-            throw new ArchiveModificationException('Could not create temporarily file');
+        if (!$tmp_file) {
+                    throw new ArchiveModificationException('Could not create temporarily file');
+        }
 
         file_put_contents($tmp_file, $content);
         $this->sevenZip->addEntry($tmp_file, true);
@@ -387,8 +393,9 @@ 
             $total_files = count($files);
 
             $seven_zip = new Archive7z($archiveFileName);
-            if ($password !== null)
-                $seven_zip->setPassword($password);
+            if ($password !== null) {
+                            $seven_zip->setPassword($password);
+            }
             $seven_zip->setCompressionLevel($compressionLevelMap[$compressionLevel]);
             foreach ($files as $archiveName => $localName) {
                 if ($localName !== null) {

src/Drivers/AlchemyZippy.php

Braces +11 added lines, -8 removed lines

@@ -61,10 +61,11 @@ 
 
     protected static function init()
     {
-        if (!class_exists('\Alchemy\Zippy\Zippy'))
-            static::$zippy = false;
-        else if (static::$zippy === null)
-            static::$zippy = Zippy::load();
+        if (!class_exists('\Alchemy\Zippy\Zippy')) {
+                    static::$zippy = false;
+        } else if (static::$zippy === null) {
+                    static::$zippy = Zippy::load();
+        }
     }
 
     /**
@@ -75,8 +76,9 @@ 
     {
         static::init();
 
-        if (static::$zippy === false)
-            return [];
+        if (static::$zippy === false) {
+                    return [];
+        }
 
         switch ($format) {
             case Formats::TAR_BZIP:
@@ -212,8 +214,9 @@ 
         $information = new ArchiveInformation();
 
         foreach ($this->archive->getMembers() as $member) {
-            if ($member->isDir())
-                continue;
+            if ($member->isDir()) {
+                            continue;
+            }
 
             $this->files[] = $information->files[] = str_replace('\\', '/', $member->getLocation());
             $this->members[str_replace('\\', '/', $member->getLocation())] = $member;

Spacing +7 added lines, -7 removed lines

@@ -63,9 +63,9 @@ 
     public static function getInstallationInstruction()
     {
         self::init();
-        return 'install library [alchemy/zippy]: `composer require alchemy/zippy`' . "\n"  . ' and console programs (tar, zip): `apt install tar zip` - depends on OS'
-            . "\n" . 'If you install SevenZip and AlchemyZippy:' . "\n" .
-            '1. You should specify symfony/console version before installation to any **3.x.x version**:' . "\n" . '`composer require symfony/process:~3.4`, because they require different `symfony/process` versions.' . "\n" .
+        return 'install library [alchemy/zippy]: `composer require alchemy/zippy`'."\n".' and console programs (tar, zip): `apt install tar zip` - depends on OS'
+            . "\n".'If you install SevenZip and AlchemyZippy:'."\n".
+            '1. You should specify symfony/console version before installation to any **3.x.x version**:'."\n".'`composer require symfony/process:~3.4`, because they require different `symfony/process` versions.'."\n".
             '2. Install archive7z version 4.0.0: `composer require gemorroj/archive7z:~4.0`';
     }
 
@@ -190,8 +190,8 @@ 
 
             $this->files[] = $information->files[] = str_replace('\\', '/', $member->getLocation());
             $this->members[str_replace('\\', '/', $member->getLocation())] = $member;
-            $information->compressedFilesSize += (int)$member->getSize();
-            $information->uncompressedFilesSize += (int)$member->getSize();
+            $information->compressedFilesSize += (int) $member->getSize();
+            $information->uncompressedFilesSize += (int) $member->getSize();
         }
         return $information;
     }
@@ -240,7 +240,7 @@ 
     public function getFileContent($fileName)
     {
         $member = $this->getMember($fileName);
-        return (string)$member;
+        return (string) $member;
     }
 
     /**
@@ -249,7 +249,7 @@ 
     public function getFileStream($fileName)
     {
         $member = $this->getMember($fileName);
-        return self::wrapStringInStream((string)$member);
+        return self::wrapStringInStream((string) $member);
     }
 
     /**

src/Drivers/Zip.php

Braces +36 added lines, -24 removed lines

@@ -86,8 +86,9 @@ 
     {
         parent::__construct($archiveFileName, $format);
         $this->open($archiveFileName);
-        if ($password !== null)
-            $this->zip->setPassword($password);
+        if ($password !== null) {
+                    $this->zip->setPassword($password);
+        }
     }
 
     /**
@@ -121,8 +122,9 @@ 
         for ($i = 0; $i < $this->zip->numFiles; $i++) {
             $file = $this->zip->statIndex($i);
             // skip directories
-            if (in_array(substr($file['name'], -1), ['/', '\\'], true))
-                continue;
+            if (in_array(substr($file['name'], -1), ['/', '\\'], true)) {
+                            continue;
+            }
             $this->pureFilesNumber++;
             $information->files[$i] = $file['name'];
             $information->compressedFilesSize += $file['comp_size'];
@@ -157,8 +159,9 @@ 
         for ($i = 0; $i < $this->zip->numFiles; $i++) {
             $file_name = $this->zip->getNameIndex($i);
             // skip directories
-            if (in_array(substr($file_name, -1), ['/', '\\'], true))
-                continue;
+            if (in_array(substr($file_name, -1), ['/', '\\'], true)) {
+                            continue;
+            }
             $files[] = $file_name;
         }
         return $files;
@@ -203,8 +206,9 @@ 
     public function getFileContent($fileName)
     {
         $result = $this->zip->getFromName($fileName);
-        if ($result === false)
-            throw new Exception('Could not get file information: '.$result.'. May use password?');
+        if ($result === false) {
+                    throw new Exception('Could not get file information: '.$result.'. May use password?');
+        }
         return $result;
     }
 
@@ -225,8 +229,9 @@ 
      */
     public function extractFiles($outputFolder, array $files)
     {
-        if ($this->zip->extractTo($outputFolder, $files) === false)
-            throw new ArchiveExtractionException($this->zip->getStatusString(), $this->zip->status);
+        if ($this->zip->extractTo($outputFolder, $files) === false) {
+                    throw new ArchiveExtractionException($this->zip->getStatusString(), $this->zip->status);
+        }
 
         return count($files);
     }
@@ -238,8 +243,9 @@ 
      */
     public function extractArchive($outputFolder)
     {
-        if ($this->zip->extractTo($outputFolder) === false)
-            throw new ArchiveExtractionException($this->zip->getStatusString(), $this->zip->status);
+        if ($this->zip->extractTo($outputFolder) === false) {
+                    throw new ArchiveExtractionException($this->zip->getStatusString(), $this->zip->status);
+        }
 
         return $this->pureFilesNumber;
     }
@@ -254,8 +260,9 @@ 
     {
         $count = 0;
         foreach ($files as $file) {
-            if ($this->zip->deleteName($file) === false)
-                throw new ArchiveModificationException($this->zip->getStatusString(), $this->zip->status);
+            if ($this->zip->deleteName($file) === false) {
+                            throw new ArchiveModificationException($this->zip->getStatusString(), $this->zip->status);
+            }
             $count++;
         }
 
@@ -278,11 +285,13 @@ 
         $added_files = 0;
         foreach ($files as $localName => $fileName) {
             if (is_null($fileName)) {
-                if ($this->zip->addEmptyDir($localName) === false)
-                    throw new ArchiveModificationException($this->zip->getStatusString(), $this->zip->status);
+                if ($this->zip->addEmptyDir($localName) === false) {
+                                    throw new ArchiveModificationException($this->zip->getStatusString(), $this->zip->status);
+                }
             } else {
-                if ($this->zip->addFile($fileName, $localName) === false)
-                    throw new ArchiveModificationException($this->zip->getStatusString(), $this->zip->status);
+                if ($this->zip->addFile($fileName, $localName) === false) {
+                                    throw new ArchiveModificationException($this->zip->getStatusString(), $this->zip->status);
+                }
                 $added_files++;
             }
         }
@@ -335,8 +344,9 @@ 
         $zip = new ZipArchive();
         $result = $zip->open($archiveFileName, ZipArchive::CREATE);
 
-        if ($result !== true)
-            throw new ArchiveCreationException('ZipArchive error: '.$result);
+        if ($result !== true) {
+                    throw new ArchiveCreationException('ZipArchive error: '.$result);
+        }
 
         $can_set_compression_level = method_exists($zip, 'setCompressionName');
         $can_encrypt = static::canEncrypt(Formats::ZIP);
@@ -354,11 +364,13 @@ 
 
         foreach ($files as $localName => $fileName) {
             if ($fileName === null) {
-                if ($zip->addEmptyDir($localName) === false)
-                    throw new ArchiveCreationException('Could not archive directory "'.$localName.'": '.$zip->getStatusString(), $zip->status);
+                if ($zip->addEmptyDir($localName) === false) {
+                                    throw new ArchiveCreationException('Could not archive directory "'.$localName.'": '.$zip->getStatusString(), $zip->status);
+                }
             } else {
-                if ($zip->addFile($fileName, $localName) === false)
-                    throw new ArchiveCreationException('Could not archive file "'.$fileName.'": '.$zip->getStatusString(), $zip->status);
+                if ($zip->addFile($fileName, $localName) === false) {
+                                    throw new ArchiveCreationException('Could not archive file "'.$fileName.'": '.$zip->getStatusString(), $zip->status);
+                }
                 if ($can_set_compression_level) {
                     $zip->setCompressionName($localName, $compressionLevelMap[$compressionLevel]);
                 }

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 
     public static function getDescription()
     {
-        return 'adapter for ext-zip'.(extension_loaded('zip') && defined('\ZipArchive::LIBZIP_VERSION') ? ' ('. ZipArchive::LIBZIP_VERSION.')' : null);
+        return 'adapter for ext-zip'.(extension_loaded('zip') && defined('\ZipArchive::LIBZIP_VERSION') ? ' ('.ZipArchive::LIBZIP_VERSION.')' : null);
     }
 
     /**

src/Drivers/TarByPear.php

Spacing +5 added lines, -5 removed lines

@@ -53,7 +53,7 @@ 
      */
     public static function getInstallationInstruction()
     {
-        return 'install library [pear/archive_tar]: `composer require pear/archive_tar`' . "\n"  . ' and optionally php-extensions (zlib, bz2)';
+        return 'install library [pear/archive_tar]: `composer require pear/archive_tar`'."\n".' and optionally php-extensions (zlib, bz2)';
     }
 
     /**
@@ -160,7 +160,7 @@ 
                 $compression = 'lzma2';
                 break;
             case 'z':
-                $tar_aname = 'compress.lzw://' . $archiveFileName;
+                $tar_aname = 'compress.lzw://'.$archiveFileName;
                 break;
         }
 
@@ -217,7 +217,7 @@ 
 
             case Formats::TAR_LZW:
                 LzwStreamWrapper::registerWrapper();
-                $this->tar = new Archive_Tar('compress.lzw://' . $this->fileName);
+                $this->tar = new Archive_Tar('compress.lzw://'.$this->fileName);
                 break;
 
             default:
@@ -335,7 +335,7 @@ 
         $result = $this->tar->extractList($files, $outputFolder);
         if ($result === false) {
             if (isset($this->tar->error_object)) {
-                throw new ArchiveExtractionException('Error when extracting from ' . $this->fileName . ': ' . $this->tar->error_object->getMessage(0));
+                throw new ArchiveExtractionException('Error when extracting from '.$this->fileName.': '.$this->tar->error_object->getMessage(0));
             }
             throw new ArchiveExtractionException('Error when extracting from '.$this->fileName);
         }
@@ -351,7 +351,7 @@ 
         $result = $this->tar->extract($outputFolder);
         if ($result === false) {
             if (isset($this->tar->error_object)) {
-                throw new ArchiveExtractionException('Error when extracting ' . $this->fileName . ': '
+                throw new ArchiveExtractionException('Error when extracting '.$this->fileName.': '
                                                      . $this->tar->error_object->toString()
                 );
             }

Braces +23 added lines, -16 removed lines

@@ -164,10 +164,11 @@ 
                 break;
         }
 
-        if (isset($tar_aname))
-            $tar = new Archive_Tar($tar_aname, $compression);
-        else
-            $tar = new Archive_Tar($archiveFileName, $compression);
+        if (isset($tar_aname)) {
+                    $tar = new Archive_Tar($tar_aname, $compression);
+        } else {
+                    $tar = new Archive_Tar($archiveFileName, $compression);
+        }
 
         $current_file = 0;
         $total_files = count($files);
@@ -179,8 +180,9 @@ 
 //                if ($tar->addString($localName, '') === false)
 //                    throw new ArchiveCreationException('Error when adding directory '.$localName.' to archive');
             } else {
-                if ($tar->addModify($filename, $add_dir, $remove_dir) === false)
-                    throw new ArchiveCreationException('Error when adding file '.$filename.' to archive');
+                if ($tar->addModify($filename, $add_dir, $remove_dir) === false) {
+                                    throw new ArchiveCreationException('Error when adding file '.$filename.' to archive');
+                }
             }
             if ($fileProgressCallable !== null) {
                 call_user_func_array($fileProgressCallable, [$current_file++, $total_files, $filename, $localName]);
@@ -241,8 +243,9 @@ 
                 continue;
             }
             // skip directories
-            if ($file['typeflag'] == '5' || substr($file['filename'], -1) === '/')
-                continue;
+            if ($file['typeflag'] == '5' || substr($file['filename'], -1) === '/') {
+                            continue;
+            }
             $information->files[] = $file['filename'];
             $information->uncompressedFilesSize += $file['size'];
             $this->pearFilesIndex[$file['filename']] = $i;
@@ -288,14 +291,16 @@ 
      */
     public function getFileData($fileName)
     {
-        if (!isset($this->pearFilesIndex[$fileName]))
-            throw new NonExistentArchiveFileException('File '.$fileName.' is not found in archive files list');
+        if (!isset($this->pearFilesIndex[$fileName])) {
+                    throw new NonExistentArchiveFileException('File '.$fileName.' is not found in archive files list');
+        }
 
         $index = $this->pearFilesIndex[$fileName];
 
         $files_list = $this->tar->listContent();
-        if (!isset($files_list[$index]))
-            throw new NonExistentArchiveFileException('File '.$fileName.' is not found in Tar archive');
+        if (!isset($files_list[$index])) {
+                    throw new NonExistentArchiveFileException('File '.$fileName.' is not found in Tar archive');
+        }
 
         $data = $files_list[$index];
         unset($files_list);
@@ -310,8 +315,9 @@ 
      */
     public function getFileContent($fileName)
     {
-        if (!isset($this->pearFilesIndex[$fileName]))
-            throw new NonExistentArchiveFileException('File '.$fileName.' is not found in archive files list');
+        if (!isset($this->pearFilesIndex[$fileName])) {
+                    throw new NonExistentArchiveFileException('File '.$fileName.' is not found in archive files list');
+        }
 
         return $this->tar->extractInString($fileName);
     }
@@ -321,8 +327,9 @@ 
      */
     public function getFileStream($fileName)
     {
-        if (!isset($this->pearFilesIndex[$fileName]))
-            throw new NonExistentArchiveFileException('File '.$fileName.' is not found in archive files list');
+        if (!isset($this->pearFilesIndex[$fileName])) {
+                    throw new NonExistentArchiveFileException('File '.$fileName.' is not found in archive files list');
+        }
 
         return self::wrapStringInStream($this->tar->extractInString($fileName));
     }

src/Drivers/Cab.php

Braces +3 added lines, -2 removed lines

@@ -82,8 +82,9 @@
     public function __construct($archiveFileName, $format, $password = null)
     {
         parent::__construct($archiveFileName, $format);
-        if ($password !== null)
-            throw new UnsupportedOperationException('Cab archive does not support password!');
+        if ($password !== null) {
+                    throw new UnsupportedOperationException('Cab archive does not support password!');
+        }
         $this->open($archiveFileName);
     }
 

src/Commands/DriversCommand.php

Spacing +3 added lines, -3 removed lines

@@ -63,7 +63,7 @@ 
                 if ($typeDriverConfig[1]) {
 //                    $type_messages[] = '<info>' . $typeDriverClass . '</info>: ' . $typeDriverConfig[0];
                     $table->setRow($i++, [
-                        '<info>' . $this->getDriverBaseName($typeDriverClass) . '</info>',
+                        '<info>'.$this->getDriverBaseName($typeDriverClass).'</info>',
                         BasicDriver::$typeLabels[$typeDriverClass::TYPE],
                         $typeDriverConfig[0],
                     ]);
@@ -71,7 +71,7 @@ 
 //                    $type_messages[] = '<error>' . $typeDriverClass . '</error>: ' . $typeDriverConfig[0];
 //                    $type_messages[] = $this->formatInstallation($typeDriverConfig[2], 4);
                     $table->setRow($i++, [
-                        '<comment>' . $this->getDriverBaseName($typeDriverClass) . '</comment>',
+                        '<comment>'.$this->getDriverBaseName($typeDriverClass).'</comment>',
                         BasicDriver::$typeLabels[$typeDriverClass::TYPE],
                         $this->formatInstallation($typeDriverConfig[2], 0),
                     ]);
@@ -94,7 +94,7 @@ 
     protected function formatInstallation($doc, $leftPadding = 4)
     {
         return implode("\n", array_map(
-            function($line) use ($leftPadding) { return str_repeat(' ', $leftPadding) . $line; },
+            function($line) use ($leftPadding) { return str_repeat(' ', $leftPadding).$line; },
             explode(
                 "\n",
                 preg_replace('~`(.+?)`~', '<options=bold,underscore>$1</>', $doc)

src/Drivers/Iso.php

Spacing +3 added lines, -3 removed lines

@@ -136,11 +136,11 @@ 
                     $this->files[$file->Location] = $directory.$file->strd_FileId;
                     $this->filesSize += $file->DataLen;
 
-                    $this->filesData[$directory . $file->strd_FileId] =
+                    $this->filesData[$directory.$file->strd_FileId] =
                         [
                             'size' => $file->DataLen,
                             'mtime' =>
-                                strtotime((string)$file->isoRecDate),
+                                strtotime((string) $file->isoRecDate),
                         ];
                 }
             }
@@ -242,7 +242,7 @@ 
     public function extractFiles($outputFolder, array $files)
     {
         foreach ($files as $file) {
-            $destination_file = rtrim($outputFolder, '/'). '/' . ltrim($file, '/');
+            $destination_file = rtrim($outputFolder, '/').'/'.ltrim($file, '/');
             $destination_dir = dirname($destination_file);
 
             if (!empty($destination_dir)) {

Braces +18 added lines, -11 removed lines

@@ -84,8 +84,9 @@ 
     {
         parent::__construct($archiveFileName, $format);
         $this->open($archiveFileName);
-        if ($password !== null)
-            throw new UnsupportedOperationException('Iso archive does not support password!');
+        if ($password !== null) {
+                    throw new UnsupportedOperationException('Iso archive does not support password!');
+        }
     }
 
     /**
@@ -108,8 +109,9 @@ 
 
         /** @var \CVolumeDescriptor $usedDesc */
         $usedDesc = $this->iso->GetDescriptor(SUPPLEMENTARY_VOLUME_DESC);
-        if (!$usedDesc)
-            $usedDesc = $this->iso->GetDescriptor(PRIMARY_VOLUME_DESC);
+        if (!$usedDesc) {
+                    $usedDesc = $this->iso->GetDescriptor(PRIMARY_VOLUME_DESC);
+        }
         $this->blockSize = $usedDesc->iBlockSize;
         $directories = $usedDesc->LoadMPathTable($this->iso);
         // iterate over all directories
@@ -131,8 +133,9 @@ 
             if ($files) {
                 /** @var \CFileDirDescriptors $file */
                 foreach ($files as $file) {
-                    if (in_array($file->strd_FileId, ['.', '..']) || $file->IsDirectory())
-                        continue;
+                    if (in_array($file->strd_FileId, ['.', '..']) || $file->IsDirectory()) {
+                                            continue;
+                    }
                     $this->files[$file->Location] = $directory.$file->strd_FileId;
                     $this->filesSize += $file->DataLen;
 
@@ -184,8 +187,9 @@ 
      */
     public function getFileData($fileName)
     {
-        if (!isset($this->filesData[$fileName]))
-            return false;
+        if (!isset($this->filesData[$fileName])) {
+                    return false;
+        }
 
         return new ArchiveEntry(
             $fileName,
@@ -225,11 +229,14 @@ 
     protected function prepareForFileExtracting($fileName)
     {
         $Location = array_search($fileName, $this->files, true);
-        if (!isset($this->filesData[$fileName])) return false;
+        if (!isset($this->filesData[$fileName])) {
+         return false;
+        }
         $data = $this->filesData[$fileName];
         $Location_Real = $Location * $this->blockSize;
-        if ($this->iso->Seek($Location_Real, SEEK_SET) === false)
-            return false;
+        if ($this->iso->Seek($Location_Real, SEEK_SET) === false) {
+                    return false;
+        }
         return $data;
     }