Make ZipArchiveWriter::usingPassword() accept util.Secret instances

Author: thekid

src/main/php/io/archive/zip/ZipArchiveWriter.class.php

@@ -2,7 +2,7 @@
 
 use io\streams\OutputStream;
 use lang\{Closeable, IllegalArgumentException};
-use util\Date;
+use util\{Date, Secret};
 
 /**
  * Writes to a ZIP archive
@@ -52,15 +52,19 @@ public function usingUnicodeNames($unicode= true) {
  /**
  * Set password to use when adding entries 
  *
- * @param string password
+ * @param string|util.Secret $password
  * @return io.archive.zip.ZipArchiveWriter this
  */
  public function usingPassword($password) {
  if (null === $password) {
  $this->password= null;
  } else {
  $this->password= new ZipCipher();
- $this->password->initialize(iconv(\xp::ENCODING, 'cp437', $password));
+ $this->password->initialize(iconv(
+ \xp::ENCODING,
+ 'cp437',
+ $password instanceof Secret ? $password->reveal() : $password)
+ );
  }
  return $this;
  }

src/test/php/io/archive/zip/unittest/ZipArchiveWriterTest.class.php

@@ -3,7 +3,8 @@
 use io\archive\zip\{ZipArchiveWriter, ZipDirEntry, ZipFile, ZipFileEntry};
 use io\streams\{MemoryInputStream, MemoryOutputStream, StreamTransfer};
 use lang\IllegalArgumentException;
-use test\{Assert, Expect, Test};
+use test\{Assert, Expect, Test, Values};
+use util\Secret;
 
 class ZipArchiveWriterTest extends AbstractZipFileTest {
 
@@ -83,11 +84,11 @@ public function adding_files_and_dir() {
  );
  }
 
- #[Test]
- public function using_password_protection() {
+ #[Test, Values(['secret', new Secret('secret')])]
+ public function using_password_protection($password) {
  $out= new MemoryOutputStream();
 
- $fixture= ZipFile::create($out)->usingPassword('secret');
+ $fixture= ZipFile::create($out)->usingPassword($password);
  $fixture->addFile(new ZipFileEntry('test.txt'))->out()->write('File contents');
  $fixture->close();