aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Duncan <pabs@pablotron.org>2018-09-03 06:50:31 -0400
committerPaul Duncan <pabs@pablotron.org>2018-09-03 09:54:52 -0400
commit5dda6b1011472e558e3fd9c744c2fd537528b115 (patch)
treec8dd03943dbcda0a790196414e5f1c9d3cec5111 /src
parenta9a5749e6ecbd25ce220daa5a02aec4ba222ccd5 (diff)
downloadzipstream-php-5dda6b1011472e558e3fd9c744c2fd537528b115.tar.bz2
zipstream-php-5dda6b1011472e558e3fd9c744c2fd537528b115.zip
add CommentError, Methods::check(), and several additional tests
Diffstat (limited to 'src')
-rw-r--r--src/ZipStream.php69
1 files changed, 53 insertions, 16 deletions
diff --git a/src/ZipStream.php b/src/ZipStream.php
index aa7e7e4..437ff1d 100644
--- a/src/ZipStream.php
+++ b/src/ZipStream.php
@@ -27,20 +27,14 @@ const VERSION = '0.3.0';
const VERSION_NEEDED = 45;
/**
- * Valid compression methods.
+ * Base class for all exceptions raised by ZipStream.
*/
-final class Methods {
- /** Store file without compression. */
- const STORE = 0;
-
- /** Store file using DEFLATE compression. */
- const DEFLATE = 8;
-};
+class Error extends \Exception { };
/**
- * Base class for all exceptions raised by ZipStream.
+ * Comment length error.
*/
-class Error extends \Exception { };
+final class CommentError extends Error { };
/**
* Deflate context error.
@@ -104,6 +98,34 @@ final class PathError extends Error {
};
/**
+ * Valid compression methods.
+ */
+final class Methods {
+ /** Store file without compression. */
+ const STORE = 0;
+
+ /** Store file using DEFLATE compression. */
+ const DEFLATE = 8;
+
+ /**
+ * Check for supported compression method.
+ *
+ * @internal
+ *
+ * @param int $method Compression method.
+ *
+ * @return void
+ *
+ * @throw UnsupportedMethodError if compression method is unsupported.
+ */
+ static public function check(int $method) : void {
+ if ($method != Methods::DEFLATE && $method != Methods::STORE) {
+ throw new UnknownMethodError($method);
+ }
+ }
+};
+
+/**
* Abstract interface for stream output.
*
* @api
@@ -826,7 +848,7 @@ final class Entry {
# check comment length
if (strlen($comment) >= 0xFFFF) {
$this->state = self::ENTRY_STATE_ERROR;
- throw new Error('comment too long');
+ throw new CommentError('entry comment too long');
}
$this->uncompressed_size = 0;
@@ -862,7 +884,7 @@ final class Entry {
*
* @return int Number of bytes written to output.
*/
- public function write(string &$data) : int {
+ public function write(string $data) : int {
try {
# check entry state
if ($this->state != self::ENTRY_STATE_DATA) {
@@ -1237,8 +1259,20 @@ final class ZipStream {
'time' => time(),
], $args);
+ # check archive method
+ Methods::check($this->args['method']);
+
+ # check archive comment length
+ if (strlen($this->args['comment']) >= 0xFFFF) {
+ throw new CommentError('archive comment too long');
+ }
+
# initialize output
if (isset($args['output']) && $args['output']) {
+ if (!is_subclass_of($args['output'], Writer::class)) {
+ throw new Error('output must implement Writer interface');
+ }
+
# use specified output writer
$this->output = $args['output'];
} else {
@@ -1596,7 +1630,7 @@ final class ZipStream {
# get comment, check length
$comment = $this->args['comment'];
if (strlen($comment) >= 0xFFFF) {
- throw new Error('comment too long');
+ throw new CommentError('archive comment too long');
}
return pack('VvvvvVVv',
@@ -1624,10 +1658,13 @@ final class ZipStream {
*/
private function get_entry_time(array &$args) : int {
if (isset($args['time'])) {
+ # use entry time
return $args['time'];
} else if (isset($this->args['time'])) {
+ # use archive time
return $this->args['time'];
} else {
+ # fall back to current time
return time();
}
}
@@ -1649,10 +1686,10 @@ final class ZipStream {
$r = Methods::DEFLATE;
}
- if ($r != Methods::DEFLATE && $r != Methods::STORE) {
- throw new UnknownMethodError($r);
- }
+ # check method
+ Methods::check($r);
+ # return method
return $r;
}
};