From 06d2c5c884eee0b5b663730f4d379a7ceae3a8e4 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sat, 1 Aug 2026 05:26:16 +0900 Subject: feat(php-shim): implement Phar/PharData and the zlib/bzip2 functions Adopt the tar, flate2, and bzip2 crates to fill in the phar.rs and compress.rs todos: PharData tar/zip reading, building, and whole-archive compression, plus a native .phar reader that follows the php.net file-format manual and verifies hash-based signatures. Callers now propagate the constructor/extract errors PHP throws, and fwrite accepts byte strings so gzread no longer needs lossy UTF-8. The native .phar writing API stays todo!() (no call sites; Composer's Compiler is not ported) and OPENSSL phar signatures are accepted unverified (TODO(phase-c)). This unblocks Tar::getComposerJson and the tar/phar/gzip downloaders; tar_test (7), artifact_repository_test (2), and phar_archiver_test zip (1) are un-ignored. The archive command itself still panics because ArchiveManager::archive always generates glob excludes whose look-ahead regexes the regex crate cannot compile; converting those patterns to regex-compatible ones is a separate, still-undecided work item. Co-Authored-By: Claude Fable 5 --- crates/shirabe/src/downloader/gzip_downloader.rs | 5 +++-- crates/shirabe/src/downloader/phar_downloader.rs | 4 ++-- crates/shirabe/src/downloader/tar_downloader.rs | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'crates/shirabe/src/downloader') diff --git a/crates/shirabe/src/downloader/gzip_downloader.rs b/crates/shirabe/src/downloader/gzip_downloader.rs index 4ea8f3b9..6b5f3872 100644 --- a/crates/shirabe/src/downloader/gzip_downloader.rs +++ b/crates/shirabe/src/downloader/gzip_downloader.rs @@ -50,14 +50,15 @@ impl GzipDownloader { } fn extract_using_ext(&self, file: &str, target_filepath: &str) { - let archive_file = gzopen(file, "rb"); + // PHP does not check the gzopen result either; gzread(false, ...) is a fatal TypeError. + let archive_file = gzopen(file, "rb").unwrap(); let target_file = fopen(target_filepath, "wb").unwrap(); loop { let string = gzread(archive_file.clone(), 4096); if string.is_empty() { break; } - fwrite(&target_file, &string, Some(Platform::strlen(&string))); + fwrite(&target_file, &string, Some(string.len() as i64)); } gzclose(archive_file); fclose(&target_file); diff --git a/crates/shirabe/src/downloader/phar_downloader.rs b/crates/shirabe/src/downloader/phar_downloader.rs index cbbb8252..b33fa74a 100644 --- a/crates/shirabe/src/downloader/phar_downloader.rs +++ b/crates/shirabe/src/downloader/phar_downloader.rs @@ -62,8 +62,8 @@ impl ArchiveDownloader for PharDownloader { path: &str, ) -> anyhow::Result> { // Can throw an UnexpectedValueException - let archive = Phar::new(file.to_string()); - archive.extract_to(path, None, true); + let archive = Phar::new(file.to_string())?; + archive.extract_to(path, None, true)?; // TODO: handle openssl signed phars // https://github.com/composer/composer/pull/33#issuecomment-2250768 // https://github.com/koto/phar-util diff --git a/crates/shirabe/src/downloader/tar_downloader.rs b/crates/shirabe/src/downloader/tar_downloader.rs index dfb825e4..ae600971 100644 --- a/crates/shirabe/src/downloader/tar_downloader.rs +++ b/crates/shirabe/src/downloader/tar_downloader.rs @@ -61,8 +61,8 @@ impl ArchiveDownloader for TarDownloader { file: &str, path: &str, ) -> anyhow::Result> { - let archive = PharData::new(file.to_string()); - archive.extract_to(path, None, true); + let archive = PharData::new(file.to_string())?; + archive.extract_to(path, None, true)?; Ok(None) } -- cgit v1.3.1