Support for compressed phar #7028
Closed
Conversation
This file contains 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
It should fail if `.phar` extension not found regardless of contents.
…phar >= 1.2.0), used in constructor now
* added automatic content-based checks for distinguishing each format type regardless of its extension * phar archive constructor decoupled into separate method, stubs for tar/zip-based phars added * `Phar::isCompressed()` now returns correct result even though tar/zip-based phars are not properly supported yet
…ethods, iterators and have some common properties. Functionality specific to Phar format moved from `Phar` class to new class `__SystemLib\PharArchiveHandler` which extends `__SystemLib\ArchiveHandler`. `__SystemLib\ArchiveHandler` was extended with additional necessary methods in order to fulfill the need to access additional information from `Phar` class. `__SystemLib\TarArchiveHandler`, `__SystemLib\ZipArchiveHandler` and `__SystemLib\PharArchiveHandler` unified to use the same naming for the same stuff. `__SystemLib\PharArchiveHandler` is partially stream-based, but still more work needed to handle big files nicely. Added missing `PharFileInfo::isCRCChecked()` method as defined in PHP docs. Public methods added to `PharFileInfo::getSize()` and `::getTimestamp()` added for internal use by `Phar` class (PHP for whatever reason defines, for instance, `::getCompressedSize()`, but not mentioned useful methods, so I've added them on top anyway).
…tested and unit tests should be added). Fix for iterating Tar archives that contain type flag `5` (test case included file without entries with such flag). `Archive_Tar-1.3.11.tar.gz` has exactly the same contents as `Archive_Tar-1.3.11.tgz `, but with 3 directory entries (created using popular GUI tool `file-roller`).
…s efficiently, others require streams slicing of something similar to actually avoid copying data
…`) using `new Phar()`. Added support for `include 'phar:///path/to.phar'`, `include 'phar:///path/to.phar.gz'`, `include 'phar:///path/to.phar.bz2'` (gz and bz2 variations do not work without `phar://` protocol yet). For `include 'phar:///path/to.phar'` stub will be used.
* .phar.tar * .phar.tar.gz * .phar.tar.bz2 * .phar.zip * .phar which is inside any of above
…thod itself adjusted to pass all the tests
…this and many more cases
…Tar-based archive. More unification of Phar- and Tar-based archives handling.
|
This pull request has been imported into Phabricator, and discussion and review of the diff will take place at https://reviews.facebook.net/D57495 |
ghost
added
the
… ignoring it silently. Alias correctness check moved into its own method. Restored accidentally removed method description.
| if (!ret.isResource()) { | ||
| return nullptr; | ||
| } | ||
| return dyn_cast_or_null<File>(ret.asResRef()); | ||
| } | ||
|
|
||
| virtual int access(const String& path, int mode) { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is a big PR, so it needs extended description.
Features:
.phar.gz.phar.bz2,*.phar.tar,*.phar.tar.gz,*.phar.tar.bz2,*.phar.zipkinds of Phar archives regardless of their extensionPhar::isValidPharFilename()with tests ported from PHP's sourcesPhar::isCompressed()returns real value now instead of hardcodedfalsePhar::setAlias()implemented as proxy method with necessary checks, but not actually used until write support implemented properlyPhar::setStub()implemented as proxy method, but not actually used until write support implemented properlyPhar::isFileFormat()was checking only whether file is plain Phar, now also checks for Tar and ZipPhar::getSupportedCompression()returns supported compression formats instead of empty arrayPhar::getSupportedSignatures()returns supported signatures instead of empty arrayPharFileInfo::isCRCChecked()is just a stub for now5, it happened when creating archives with popularfile-roller, I suspect GNU Tar is used under the hoodinclude 'phar:///path/to.phar',include 'phar:///path/to.phar.gz',include 'phar:///path/to.phar.bz2'(gz and bz2 variations do not work withoutphar://protocol yet)include 'phar:///path/to.phar'stub will be used, even though path to it is not specified.Architecture decisions:
PharDataclass using__SystemLib\TarArchiveHandlerand__SystemLib\ZipArchiveHandlerclasses.Similarly to mentioned classes new class
__SystemLib\PharArchiveHandlerwas added, it provides support for plain Phar format (absorbed Phar-specific functionality fromPharclass), all three classes refactored and unified internally.PharandPharDataclasses are very similar, but had different implementation for similar methods (offset*()methods especially), now they are unified and share much more common code.Zip-based implementation relies on
ZipArchive::getStream()and its efficiency.Tar-based implementation was rewritten to be stream-based, but for maximum efficiency needs some sort of stream slicing mechanism (otherwise there is still some overhead when copying bytes to
php://temp, which is not too bad though and very unlikely to eat all memory).Phar-based implementation was also rewritten for streams usage and similarly to Tar-based needs stream slicing for maximum efficiency, but is good enough already.
Fixes #4263