robin/streams
1
0
Fork 0
mirror of https://codeberg.org/icewind/streams.git synced 2026-06-03 16:44:07 +02:00
Code Issues Projects Releases Packages Wiki Activity

static::class is only since 5.5 :(

Browse source
This commit is contained in:
Robin Appelman 2015-10-16 15:49:20 +02:00
commit 2e2fe951e9
3 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/DirectoryFilter.php
View file

@ -55,6 +55,6 @@ class DirectoryFilter extends DirectoryWrapper {
'filter' => $filter
)
);
return self::wrapWithOptions($options);
return self::wrapWithOptions($options, '\Icewind\Streams\DirectoryFilter');
}
}

5
src/DirectoryWrapper.php
View file

@ -75,11 +75,12 @@ class DirectoryWrapper implements Directory {
/**
* @param string $options the options for the context to wrap the stream with
* @param string $class
* @return resource
*/
protected static function wrapWithOptions($options) {
protected static function wrapWithOptions($options, $class) {
$context = stream_context_create($options);
stream_wrapper_register('dirwrapper', static::class);
stream_wrapper_register('dirwrapper', $class);
$wrapped = opendir('dirwrapper://', $context);
stream_wrapper_unregister('dirwrapper');
return $wrapped;

14
tests/DirectoryWrapper.php
View file

@ -7,13 +7,23 @@
namespace Icewind\Streams\Tests;
class DirectoryWrapperNull extends \Icewind\Streams\DirectoryWrapper {
public static function wrap($source) {
$options = array(
'dir' => array(
'source' => $source)
);
return self::wrapWithOptions($options, '\Icewind\Streams\Tests\DirectoryWrapperNull');
}
}
class DirectoryWrapperDummy extends \Icewind\Streams\DirectoryWrapper {
public static function wrap($source) {
$options = array(
'dir' => array(
'source' => $source)
);
return self::wrapWithOptions($options);
return self::wrapWithOptions($options, '\Icewind\Streams\Tests\DirectoryWrapperDummy');
}
public function dir_readdir() {
@ -33,7 +43,7 @@ class DirectoryWrapper extends IteratorDirectory {
*/
protected function wrapSource($source) {
$dir = \Icewind\Streams\IteratorDirectory::wrap($source);
return \Icewind\Streams\DirectoryWrapper::wrap($dir);
return DirectoryWrapperNull::wrap($dir);
}
public function testManipulateContent() {