Support custom SplFileInfo objects in Phar::buildFromIterator() #14143
There are no files selected for viewing
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| --TEST-- | ||
| buildFromIterator with user overrides - getMTime() | ||
| --EXTENSIONS-- | ||
| phar | ||
| --INI-- | ||
| phar.readonly=0 | ||
| phar.require_hash=0 | ||
| --CREDITS-- | ||
| Arne Blankerts | ||
| N. Dossche | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| class MySplFileInfo extends SplFileInfo { | ||
| public function getMTime(): int|false { | ||
| echo "[MTime]\n"; | ||
| return 123; | ||
| } | ||
|
|
||
| public function getCTime(): int { | ||
| // This should not get called | ||
| echo "[CTime]\n"; | ||
| return 0; | ||
| } | ||
|
|
||
| public function getATime(): int { | ||
| // This should not get called | ||
| echo "[ATime]\n"; | ||
| return 0; | ||
| } | ||
| } | ||
|
|
||
| class MyIterator extends RecursiveDirectoryIterator { | ||
| public function current(): SplFileInfo { | ||
| echo "[ Found: " . parent::current()->getPathname() . " ]\n"; | ||
| return new MySplFileInfo(parent::current()->getPathname()); | ||
| } | ||
| } | ||
|
|
||
| $workdir = __DIR__.'/getMTime'; | ||
| mkdir($workdir . '/content', recursive: true); | ||
| file_put_contents($workdir . '/content/hello.txt', "Hello world."); | ||
|
|
||
| $phar = new \Phar($workdir . '/test.phar'); | ||
| $phar->startBuffering(); | ||
| $phar->buildFromIterator( | ||
| new RecursiveIteratorIterator( | ||
| new MyIterator($workdir . '/content', FilesystemIterator::SKIP_DOTS) | ||
| ), | ||
| $workdir | ||
| ); | ||
| $phar->stopBuffering(); | ||
|
|
||
|
|
||
| $result = new \Phar($workdir . '/test.phar', 0, 'test.phar'); | ||
| var_dump($result['content/hello.txt']); | ||
| var_dump($result['content/hello.txt']->getATime()); | ||
| var_dump($result['content/hello.txt']->getMTime()); | ||
| var_dump($result['content/hello.txt']->getCTime()); | ||
|
|
||
| ?> | ||
| --CLEAN-- | ||
| <?php | ||
| $workdir = __DIR__.'/getMTime'; | ||
| @unlink($workdir . '/test.phar'); | ||
| @unlink($workdir . '/content/hello.txt'); | ||
| @rmdir($workdir . '/content'); | ||
| @rmdir($workdir); | ||
| ?> | ||
| --EXPECTF-- | ||
| [ Found: %shello.txt ] | ||
| [MTime] | ||
| object(PharFileInfo)#%d (2) { | ||
| ["pathName":"SplFileInfo":private]=> | ||
| string(%d) "phar://%shello.txt" | ||
| ["fileName":"SplFileInfo":private]=> | ||
| string(%d) "hello.txt" | ||
| } | ||
| int(123) | ||
| int(123) | ||
| int(123) |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| --TEST-- | ||
| buildFromIterator with user overrides - getMTime() by ref | ||
| --EXTENSIONS-- | ||
| phar | ||
| --INI-- | ||
| phar.readonly=0 | ||
| phar.require_hash=0 | ||
| --CREDITS-- | ||
| Arne Blankerts | ||
| N. Dossche | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| class MySplFileInfo extends SplFileInfo { | ||
| public function &getMTime(): int|false { | ||
| static $data = 123; | ||
| echo "[MTime]\n"; | ||
| return $data; | ||
| } | ||
| } | ||
|
|
||
| class MyIterator extends RecursiveDirectoryIterator { | ||
| public function current(): SplFileInfo { | ||
| echo "[ Found: " . parent::current()->getPathname() . " ]\n"; | ||
| return new MySplFileInfo(parent::current()->getPathname()); | ||
| } | ||
| } | ||
|
|
||
| $workdir = __DIR__.'/getMTime_byRef'; | ||
| mkdir($workdir . '/content', recursive: true); | ||
| file_put_contents($workdir . '/content/hello.txt', "Hello world."); | ||
|
|
||
| $phar = new \Phar($workdir . '/test.phar'); | ||
| $phar->startBuffering(); | ||
| $phar->buildFromIterator( | ||
| new RecursiveIteratorIterator( | ||
| new MyIterator($workdir . '/content', FilesystemIterator::SKIP_DOTS) | ||
| ), | ||
| $workdir | ||
| ); | ||
| $phar->stopBuffering(); | ||
|
|
||
|
|
||
| $result = new \Phar($workdir . '/test.phar', 0, 'test.phar'); | ||
| var_dump($result['content/hello.txt']); | ||
| var_dump($result['content/hello.txt']->getATime()); | ||
| var_dump($result['content/hello.txt']->getMTime()); | ||
| var_dump($result['content/hello.txt']->getCTime()); | ||
|
|
||
| ?> | ||
| --CLEAN-- | ||
| <?php | ||
| $workdir = __DIR__.'/getMTime_byRef'; | ||
| @unlink($workdir . '/test.phar'); | ||
| @unlink($workdir . '/content/hello.txt'); | ||
| @rmdir($workdir . '/content'); | ||
| @rmdir($workdir); | ||
| ?> | ||
| --EXPECTF-- | ||
| [ Found: %shello.txt ] | ||
| [MTime] | ||
| object(PharFileInfo)#%d (2) { | ||
| ["pathName":"SplFileInfo":private]=> | ||
| string(%d) "phar://%shello.txt" | ||
| ["fileName":"SplFileInfo":private]=> | ||
| string(%d) "hello.txt" | ||
| } | ||
| int(123) | ||
| int(123) | ||
| int(123) |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This probably should be a type error, but I think there are other such problems in ext/phar so I'm happy to defer this to a latter PR.