comodojo / zip

src/Comodojo/Zip/ZipManager.php

Spacing +16 added lines, -16 removed lines

@@ -72,7 +72,7 @@ 
     public function removeZip(ZipInterface $zip): bool
     {
         $archive_key = array_search($zip, $this->zip_archives, true);
-        if ($archive_key === false) {
+        if ( $archive_key === false ) {
             throw new ZipException("Archive not found");
         }
 
@@ -90,7 +90,7 @@ 
      */
     public function removeZipById(string $id): bool
     {
-        if (isset($this->zip_archives[$id]) === false) {
+        if ( isset($this->zip_archives[$id]) === false ) {
             throw new ZipException("Archive: $id not found");
         }
         unset($this->zip_archives[$id]);
@@ -105,7 +105,7 @@ 
     public function listZips(): array
     {
         return array_column(
-            array_map(function ($key, $archive) {
+            array_map(function($key, $archive) {
                 return ["key" => $key, "file" => $archive->getZipFile()];
             }, array_keys($this->zip_archives), $this->zip_archives),
             "file",
@@ -123,7 +123,7 @@ 
      */
     public function getZip(string $id): ZipInterface
     {
-        if (array_key_exists($id, $this->zip_archives) === false) {
+        if ( array_key_exists($id, $this->zip_archives) === false ) {
             throw new ZipException("Archive id $id not found");
         }
         return $this->zip_archives[$id];
@@ -140,7 +140,7 @@ 
      */
     public function setPath(string $path): ZipManager
     {
-        foreach ($this->zip_archives as $archive) {
+        foreach ( $this->zip_archives as $archive ) {
             $archive->setPath($path);
         }
         return $this;
@@ -154,7 +154,7 @@ 
     public function getPath(): array
     {
         return array_column(
-            array_map(function ($key, $archive) {
+            array_map(function($key, $archive) {
                 return ["key" => $key, "path" => $archive->getPath()];
             }, array_keys($this->zip_archives), $this->zip_archives),
             "path",
@@ -172,7 +172,7 @@ 
      */
     public function setMask(int $mask): ZipManager
     {
-        foreach ($this->zip_archives as $archive) {
+        foreach ( $this->zip_archives as $archive ) {
             $archive->setMask($mask);
         }
         return $this;
@@ -186,7 +186,7 @@ 
     public function getMask(): array
     {
         return array_column(
-            array_map(function ($key, $archive) {
+            array_map(function($key, $archive) {
                 return ["key" => $key, "mask" => $archive->getMask()];
             }, array_keys($this->zip_archives), $this->zip_archives),
             "mask",
@@ -203,7 +203,7 @@ 
     public function listFiles(): array
     {
         return array_column(
-            array_map(function ($key, $archive) {
+            array_map(function($key, $archive) {
                 return ["key" => $key, "files" => $archive->listFiles()];
             }, array_keys($this->zip_archives), $this->zip_archives),
             "files",
@@ -227,11 +227,11 @@ 
         $files = null
     ): bool {
 
-        foreach ($this->zip_archives as $archive) {
+        foreach ( $this->zip_archives as $archive ) {
 
-            $local_path = substr($destination, -1) == '/' ? $destination : $destination . '/';
+            $local_path = substr($destination, -1) == '/' ? $destination : $destination.'/';
             $local_file = pathinfo($archive->getZipFile());
-            $local_destination = $separate ? ($local_path . $local_file['filename']) : $destination;
+            $local_destination = $separate ? ($local_path.$local_file['filename']) : $destination;
 
             $archive->extract($local_destination, $files);
         }
@@ -252,7 +252,7 @@ 
     public function merge(string $output_zip_file, bool $separate = true): bool
     {
         $pathinfo = pathinfo($output_zip_file);
-        $temporary_folder = $pathinfo['dirname'] . "/" . ManagerTools::getTemporaryFolder();
+        $temporary_folder = $pathinfo['dirname']."/".ManagerTools::getTemporaryFolder();
 
         $this->extract($temporary_folder, $separate);
         $zip = Zip::create($output_zip_file);
@@ -274,7 +274,7 @@ 
      */
     public function add($file_name_or_array, bool $flatten_root_folder = false): ZipManager
     {
-        foreach ($this->zip_archives as $archive) {
+        foreach ( $this->zip_archives as $archive ) {
             $archive->add($file_name_or_array, $flatten_root_folder);
         }
         return $this;
@@ -291,7 +291,7 @@ 
      */
     public function delete($file_name_or_array): ZipManager
     {
-        foreach ($this->zip_archives as $archive) {
+        foreach ( $this->zip_archives as $archive ) {
             $archive->delete($file_name_or_array);
         }
         return $this;
@@ -305,7 +305,7 @@ 
      */
     public function close(): bool
     {
-        foreach ($this->zip_archives as $archive) {
+        foreach ( $this->zip_archives as $archive ) {
             $archive->close();
         }
         return true;

Braces +1 added lines, -2 removed lines

@@ -27,8 +27,7 @@
  * THE SOFTWARE.
  */
 
-class ZipManager implements Countable
-{
+class ZipManager implements Countable {
 
     /**
      * Array of managed zip files

src/Comodojo/Zip/Zip.php

Spacing +30 added lines, -30 removed lines

@@ -62,7 +62,7 @@ 
      */
     public function __construct(string $zip_file)
     {
-        if (empty($zip_file)) {
+        if ( empty($zip_file) ) {
             throw new ZipException(StatusCodes::get(ZipArchive::ER_NOENT));
         }
 
@@ -100,7 +100,7 @@ 
 
         $zip = new Zip($zip_file);
 
-        if ($overwrite) {
+        if ( $overwrite ) {
             $zip->setArchive(
                 self::openZipFile(
                     $zip_file,
@@ -146,10 +146,10 @@ 
     {
         $list = [];
 
-        for ($i = 0; $i < $this->getArchive()->numFiles; $i++) {
+        for ( $i = 0; $i < $this->getArchive()->numFiles; $i++ ) {
 
             $name = $this->getArchive()->getNameIndex($i);
-            if ($name === false) {
+            if ( $name === false ) {
                 throw new ZipException(StatusCodes::get($this->getArchive()->status));
             }
             $list[] = $name;
@@ -163,31 +163,31 @@ 
      */
     public function extract(string $destination, $files = null): bool
     {
-        if (empty($destination)) {
+        if ( empty($destination) ) {
             throw new ZipException("Invalid destination path: $destination");
         }
 
-        if (!file_exists($destination)) {
+        if ( !file_exists($destination) ) {
             $omask = umask(0);
             $action = mkdir($destination, $this->getMask(), true);
             umask($omask);
 
-            if ($action === false) {
+            if ( $action === false ) {
                 throw new ZipException("Error creating folder: $destination");
             }
         }
 
-        if (!is_writable($destination)) {
+        if ( !is_writable($destination) ) {
             throw new ZipException("Destination path $destination not writable");
         }
 
-        if (is_array($files) && @sizeof($files) != 0) {
+        if ( is_array($files) && @sizeof($files) != 0 ) {
             $file_matrix = $files;
         } else {
             $file_matrix = $this->getArchiveFiles();
         }
 
-        if ($this->getArchive()->extractTo($destination, $file_matrix) === false) {
+        if ( $this->getArchive()->extractTo($destination, $file_matrix) === false ) {
             throw new ZipException(StatusCodes::get($this->getArchive()->status));
         }
 
@@ -204,18 +204,18 @@ 
         int $encryption = self::EM_NONE
     ): ZipInterface {
 
-        if (empty($file_name_or_array)) {
+        if ( empty($file_name_or_array) ) {
             throw new ZipException(StatusCodes::get(ZipArchive::ER_NOENT));
         }
 
-        if ($encryption !== self::EM_NONE && $this->getPassword() === null) {
+        if ( $encryption !== self::EM_NONE && $this->getPassword() === null ) {
             throw new ZipException("Cannot encrypt resource: no password set");
         }
 
         $flatten_root_folder = DataFilter::filterBoolean($flatten_root_folder);
 
-        if (is_array($file_name_or_array)) {
-            foreach ($file_name_or_array as $file_name) {
+        if ( is_array($file_name_or_array) ) {
+            foreach ( $file_name_or_array as $file_name ) {
                 $this->addItem($file_name, $flatten_root_folder, $compression, $encryption);
             }
         } else {
@@ -230,12 +230,12 @@ 
      */
     public function delete($file_name_or_array): ZipInterface
     {
-        if (empty($file_name_or_array)) {
+        if ( empty($file_name_or_array) ) {
             throw new ZipException(StatusCodes::get(ZipArchive::ER_NOENT));
         }
 
-        if (is_array($file_name_or_array)) {
-            foreach ($file_name_or_array as $file_name) {
+        if ( is_array($file_name_or_array) ) {
+            foreach ( $file_name_or_array as $file_name ) {
                 $this->deleteItem($file_name);
             }
         } else {
@@ -250,7 +250,7 @@ 
      */
     public function close(): bool
     {
-        if ($this->getArchive()->close() === false) {
+        if ( $this->getArchive()->close() === false ) {
             throw new ZipException(StatusCodes::get($this->getArchive()->status));
         }
 
@@ -266,10 +266,10 @@ 
     {
         $list = [];
 
-        for ($i = 0; $i < $this->getArchive()->numFiles; $i++) {
+        for ( $i = 0; $i < $this->getArchive()->numFiles; $i++ ) {
 
             $file = $this->getArchive()->statIndex($i);
-            if ($file === false) {
+            if ( $file === false ) {
                 continue;
             }
 
@@ -307,7 +307,7 @@ 
         ?string $base = null
     ): void {
 
-        $file = is_null($this->getPath()) ? $file : $this->getPath() . "/$file";
+        $file = is_null($this->getPath()) ? $file : $this->getPath()."/$file";
         $real_file = str_replace('\\', '/', realpath($file));
         $real_name = basename($real_file);
 
@@ -323,7 +323,7 @@ 
             return;
         }
 
-        if (is_dir($real_file)) {
+        if ( is_dir($real_file) ) {
             $this->addDirectoryItem($real_file, $real_name, $compression, $encryption, $base, $flatroot);
         } else {
             $this->addFileItem($real_file, $real_name, $compression, $encryption, $base);
@@ -338,7 +338,7 @@ 
         ?string $base = null
     ): void {
 
-        $file_target = is_null($base) ? $real_name : $base . $real_name;
+        $file_target = is_null($base) ? $real_name : $base.$real_name;
         if (
             $this->getArchive()->addFile($real_file, $file_target) === false ||
             $this->getArchive()->setCompressionName($file_target, $compression) === false ||
@@ -357,19 +357,19 @@ 
         bool $flatroot = false
     ): void {
 
-        if (!$flatroot) {
-            $folder_target = $base . $real_name;
+        if ( !$flatroot ) {
+            $folder_target = $base.$real_name;
             $new_base = "$folder_target/";
-            if ($this->getArchive()->addEmptyDir($folder_target) === false) {
+            if ( $this->getArchive()->addEmptyDir($folder_target) === false ) {
                 throw new ZipException(StatusCodes::get($this->getArchive()->status));
             }
         } else {
             $new_base = null;
         }
 
-        foreach (new DirectoryIterator($real_file) as $path) {
+        foreach ( new DirectoryIterator($real_file) as $path ) {
             
-            if ($path->isDot()) {
+            if ( $path->isDot() ) {
                 continue;
             }
 
@@ -392,7 +392,7 @@ 
      */
     private function deleteItem(string $file): void
     {
-        if ($this->getArchive()->deleteName($file) === false) {
+        if ( $this->getArchive()->deleteName($file) === false ) {
             throw new ZipException(StatusCodes::get($this->getArchive()->status));
         }
     }
@@ -411,7 +411,7 @@ 
         $zip = new ZipArchive();
 
         $open = $zip->open($zip_file, $flags);
-        if ($open !== true) {
+        if ( $open !== true ) {
             throw new ZipException(StatusCodes::get($open));
         }
 

Braces +1 added lines, -2 removed lines

@@ -60,8 +60,7 @@
      *
      * @throws ZipException
      */
-    public function __construct(string $zip_file)
-    {
+    public function __construct(string $zip_file) {
         if (empty($zip_file)) {
             throw new ZipException(StatusCodes::get(ZipArchive::ER_NOENT));
         }

src/Comodojo/Zip/Traits/PathTrait.php

Spacing +2 added lines, -2 removed lines

@@ -43,9 +43,9 @@
      */
     public function setPath(?string $path = null): ZipInterface
     {
-        if ($path === null) {
+        if ( $path === null ) {
             $this->path = null;
-        } else if (!file_exists($path)) {
+        } else if ( !file_exists($path) ) {
             throw new ZipException("Not existent path: $path");
         } else {
             $this->path = $path;

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
  * THE SOFTWARE.
  */
 
-trait PathTrait
-{
+trait PathTrait {
 
     /**
      * Current base path

src/Comodojo/Zip/Traits/CommentTrait.php

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
  * THE SOFTWARE.
  */
 
-trait CommentTrait
-{
+trait CommentTrait {
 
     abstract public function getArchive(): ?ZipArchive;
 

src/Comodojo/Zip/Traits/ArchiveTrait.php

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
  * THE SOFTWARE.
  */
 
-trait ArchiveTrait
-{
+trait ArchiveTrait {
 
     /**
      * ZipArchive internal pointer

src/Comodojo/Zip/Traits/MaskTrait.php

Braces +1 added lines, -2 removed lines

@@ -22,8 +22,7 @@
  * THE SOFTWARE.
  */
 
-trait MaskTrait
-{
+trait MaskTrait {
 
     /**
      * Mask for the extraction folder (if it should be created)

src/Comodojo/Zip/Traits/SkipTrait.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
     {
         $mode = strtoupper($mode);
 
-        if (!in_array($mode, $this->supported_skip_modes)) {
+        if ( !in_array($mode, $this->supported_skip_modes) ) {
             throw new ZipException("Unsupported skip mode: $mode");
         }
 

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
  * THE SOFTWARE.
  */
 
-trait SkipTrait
-{
+trait SkipTrait {
 
     /**
      * Select files to skip

src/Comodojo/Zip/Traits/PasswordTrait.php

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
  * THE SOFTWARE.
  */
 
-trait PasswordTrait
-{
+trait PasswordTrait {
 
     abstract public function getArchive(): ?ZipArchive;
 

src/Comodojo/Zip/Interfaces/ZipInterface.php

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
  * THE SOFTWARE.
  */
 
-interface ZipInterface
-{
+interface ZipInterface {
 
     public const SKIP_NONE = 'NONE';