ext/zip: add ZipArchive::openString method #21205
Open
+202
−80
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ZIP_RDONLY was introduced in libzip 1.0.0 which is required since a979e9f
Signed-off-by: Soner Sayakci <s.sayakci@shopware.com>
Fixes to php#14078: * Rename ZipArchive::openBuffer() to ::openString(). * For consistency with ::open(), return int|bool, don't throw an exception on error. Provide error information via existing properties and accessors. * Fix memory leak when ::openString() is called but ::close() is not called. Add test. * Fix memory leak when a call to ::open() is followed by a call to ::openString(). Add test. * Let libzip own the source, don't call zip_source_keep(). * Share buffer handling with ZipArchive::addFromString(). Elsewhere: * If there is an error from zip_close() during a call to ZipArchive::open(), emit a warning but proceed to open the archive, don't return early. Add test. * When buffers are saved by ZipArchive::addFromString(), release them in ZipArchive::close() and ::open(), don't accumulate buffers until the free_obj handler is called. * Factor out buffer handling and reuse it in ZipArchive::openString()
ext/zip/php_zip.stub.php
Outdated
| /** @tentative-return-type */ | ||
| public function open(string $filename, int $flags = 0): bool|int {} | ||
|
|
||
| public function openString(string $data): bool|int {} |
Member
There was a problem hiding this comment.
it looks like the return is actually true|int and it is impossible to return false
| php_zipobj_close(ze_obj); | ||
|
|
||
| /* open for write without option to empty the archive */ | ||
| #ifdef ZIP_RDONLY |
Member
There was a problem hiding this comment.
the ZIP_RDONLY changes appear unrelated - if you restore #21195 I'm happy to review that, but ideally the addition here of openString() should not include other refactoring/changes that are unneeded
Contributor
Author
There was a problem hiding this comment.
OK, restored. It's not unrelated, it's needed because @shyim's patch was unconditionally using ZIP_RDONLY, which would have been an error if the guards were still needed. I would have submitted it separately anyway, except that it's a merge conflict, since both change the hash of php_zip.stub.php.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Co-authored-by: @shyim
Forked from #14078