Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport/stable15/streams 0.7.1 #244

Merged
merged 1 commit into from Feb 19, 2019
Merged

Backport/stable15/streams 0.7.1 #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@
"doctrine/dbal": "dev-2.5-pg10",
"guzzlehttp/guzzle": "6.3.3",
"icewind/searchdav": "1.0.1",
"icewind/Streams": "0.6.1",
"icewind/Streams": "v0.7.1",
"interfasys/lognormalizer": "^v1.0",
"jeremeamia/superclosure": "2.1.0",
"leafo/scssphp": "0.7.7",
Expand Down
12 changes: 6 additions & 6 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions composer/installed.json
View file
Open in desktop
Expand Up @@ -1116,17 +1116,17 @@
},
{
"name": "icewind/streams",
"version": "0.6.1",
"version_normalized": "0.6.1.0",
"version": "v0.7.1",
"version_normalized": "0.7.1.0",
"source": {
"type": "git",
"url": "https://github.com/icewind1991/Streams.git",
"reference": "0a78597117d8a02937ea05206f219294449fb06e"
"reference": "4db3ed6c366e90b958d00e1d4c6360a9b39b2121"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/icewind1991/Streams/zipball/0a78597117d8a02937ea05206f219294449fb06e",
"reference": "0a78597117d8a02937ea05206f219294449fb06e",
"url": "https://api.github.com/repos/icewind1991/Streams/zipball/4db3ed6c366e90b958d00e1d4c6360a9b39b2121",
"reference": "4db3ed6c366e90b958d00e1d4c6360a9b39b2121",
"shasum": ""
},
"require": {
Expand All @@ -1136,7 +1136,7 @@
"phpunit/phpunit": "^4.8",
"satooshi/php-coveralls": "v1.0.0"
},
"time": "2018-04-24T09:07:38+00:00",
"time": "2019-02-15T12:57:29+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
Expand Down
18 changes: 15 additions & 3 deletions icewind/streams/src/CallbackWrapper.php
View file
Open in desktop
Expand Up @@ -44,6 +44,11 @@ class CallbackWrapper extends Wrapper {
*/
protected $readDirCallBack;

/**
* @var callable
*/
protected $preCloseCallback;

/**
* Wraps a stream with the provided callbacks
*
Expand All @@ -56,14 +61,15 @@ class CallbackWrapper extends Wrapper {
*
* @throws \BadMethodCallException
*/
public static function wrap($source, $read = null, $write = null, $close = null, $readDir = null) {
public static function wrap($source, $read = null, $write = null, $close = null, $readDir = null, $preClose = null) {
$context = stream_context_create(array(
'callback' => array(
'source' => $source,
'read' => $read,
'write' => $write,
'close' => $close,
'readDir' => $readDir
'readDir' => $readDir,
'preClose' => $preClose,
)
));
return Wrapper::wrapSource($source, $context, 'callback', '\Icewind\Streams\CallbackWrapper');
Expand All @@ -76,6 +82,7 @@ protected function open() {
$this->writeCallback = $context['write'];
$this->closeCallback = $context['close'];
$this->readDirCallBack = $context['readDir'];
$this->preCloseCallback = $context['preClose'];
return true;
}

Expand All @@ -90,7 +97,7 @@ public function stream_open($path, $mode, $options, &$opened_path) {
public function stream_read($count) {
$result = parent::stream_read($count);
if (is_callable($this->readCallback)) {
call_user_func($this->readCallback, $count);
call_user_func($this->readCallback, strlen($result));
}
return $result;
}
Expand All @@ -104,6 +111,11 @@ public function stream_write($data) {
}

public function stream_close() {
if (is_callable($this->preCloseCallback)) {
call_user_func($this->preCloseCallback, $this->loadContext('callback')['source']);
// prevent further calls by potential PHP 7 GC ghosts
$this->preCloseCallback = null;
}
$result = parent::stream_close();
if (is_callable($this->closeCallback)) {
call_user_func($this->closeCallback);
Expand Down