Merge branch 'trunk' into new-e2e

src/WordPress/Zip/ZipCentralDirectoryEntry.php

@@ -4,6 +4,8 @@
 
 class ZipCentralDirectoryEntry {
 
+	const HEADER_SIZE = 46;
+
 	public $isDirectory;
 	public $firstByteAt;
 	public $versionCreated;
@@ -18,7 +20,6 @@ class ZipCentralDirectoryEntry {
 	public $diskNumber;
 	public $internalAttributes;
 	public $externalAttributes;
-	public $lastByteAt;
 	public $path;
 	public $extra;
 	public $fileComment;
@@ -37,15 +38,13 @@ public function __construct(
 		int $internalAttributes,
 		int $externalAttributes,
 		int $firstByteAt,
-		int $lastByteAt,
 		string $path,
 		string $extra,
 		string $fileComment
 	) {
 		$this->fileComment        = $fileComment;
 		$this->extra              = $extra;
 		$this->path               = $path;
-		$this->lastByteAt         = $lastByteAt;
 		$this->externalAttributes = $externalAttributes;
 		$this->internalAttributes = $internalAttributes;
 		$this->diskNumber         = $diskNumber;
@@ -65,4 +64,13 @@ public function __construct(
 	public function isFileEntry() {
 		return false;
 	}
+
+	public function size() {
+		return (
+			self::HEADER_SIZE +
+			strlen($this->path) +
+			strlen($this->extra) +
+			strlen($this->fileComment)
+		);
+	}
 }

src/WordPress/Zip/ZipFileEntry.php

@@ -3,6 +3,14 @@
 namespace WordPress\Zip;
 
 class ZipFileEntry {
+
+	/**
+	 * The size of the ZIP file entry header in bytes.
+	 * 
+	 * @var int
+	 */
+	const HEADER_SIZE = 30;
+
 	/**
 	 * @var bool
 	 */
@@ -58,7 +66,7 @@ public function __construct(
 		int $compressionMethod,
 		int $lastModifiedTime,
 		int $lastModifiedDate,
-		int $crc,
+		$crc,
 		int $compressedSize,
 		int $uncompressedSize,
 		string $path,
@@ -82,4 +90,13 @@ public function __construct(
 	public function isFileEntry() {
 		return true;
 	}
+
+	public function size() {
+		return (
+			self::HEADER_SIZE + 
+			strlen($this->path) + 
+			strlen($this->extra) + 
+			$this->compressedSize
+		);
+	}
 }