Skip to content

Commit

Permalink
Update icewind/streams to 0.7.5
Browse files Browse the repository at this point in the history 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
  • Loading branch information
@PVince81
PVince81 committed Oct 8, 2021
1 parent 2fa8874 commit d12a875
Show file tree
Hide file tree
Showing 18 changed files with 87 additions and 88 deletions.
2 changes: 1 addition & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"giggsey/libphonenumber-for-php": "^8.12",
"guzzlehttp/guzzle": "^7.2",
"icewind/searchdav": "^2.0.0",
"icewind/streams": "v0.7.2",
"icewind/streams": "v0.7.5",
"league/flysystem": "^1.0",
"microsoft/azure-storage-blob": "^1.5",
"nextcloud/lognormalizer": "^1.0",
Expand Down
21 changes: 11 additions & 10 deletions composer.lock
View file

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

21 changes: 11 additions & 10 deletions composer/installed.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1519,27 +1519,28 @@
},
{
"name": "icewind/streams",
"version": "v0.7.2",
"version_normalized": "0.7.2.0",
"version": "v0.7.5",
"version_normalized": "0.7.5.0",
"source": {
"type": "git",
"url": "https://github.com/icewind1991/Streams.git",
"reference": "77d750ccc654c0eda4a41fedb2dbd71053755790"
"reference": "0c6aae16ebdadb257f0bd089c1e1e4cf5e20ddc2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/icewind1991/Streams/zipball/77d750ccc654c0eda4a41fedb2dbd71053755790",
"reference": "77d750ccc654c0eda4a41fedb2dbd71053755790",
"url": "https://api.github.com/repos/icewind1991/Streams/zipball/0c6aae16ebdadb257f0bd089c1e1e4cf5e20ddc2",
"reference": "0c6aae16ebdadb257f0bd089c1e1e4cf5e20ddc2",
"shasum": ""
},
"require": {
"php": ">=5.6"
"php": ">=7.1"
},
"require-dev": {
"php-coveralls/php-coveralls": "v2.1.0",
"phpunit/phpunit": "^5.7"
"friendsofphp/php-cs-fixer": "^2",
"phpstan/phpstan": "^0.12",
"phpunit/phpunit": "^9"
},
"time": "2020-04-08T14:59:33+00:00",
"time": "2021-06-14T14:02:48+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
Expand All @@ -1560,7 +1561,7 @@
"description": "A set of generic stream wrappers",
"support": {
"issues": "https://github.com/icewind1991/Streams/issues",
"source": "https://github.com/icewind1991/Streams/tree/master"
"source": "https://github.com/icewind1991/Streams/tree/v0.7.5"
},
"install-path": "../icewind/streams"
},
Expand Down
10 changes: 5 additions & 5 deletions composer/installed.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
'type' => 'library',
'install_path' => __DIR__ . '/../',
'aliases' => array(),
'reference' => 'ef4cdf00dddf9c92618e72e117c144e97112ccc4',
'reference' => '2fa8874509eebddd763d530c85d05a37aadf2e07',
'name' => 'nextcloud/3rdparty',
'dev' => false,
),
Expand Down Expand Up @@ -200,12 +200,12 @@
'dev_requirement' => false,
),
'icewind/streams' => array(
'pretty_version' => 'v0.7.2',
'version' => '0.7.2.0',
'pretty_version' => 'v0.7.5',
'version' => '0.7.5.0',
'type' => 'library',
'install_path' => __DIR__ . '/../icewind/streams',
'aliases' => array(),
'reference' => '77d750ccc654c0eda4a41fedb2dbd71053755790',
'reference' => '0c6aae16ebdadb257f0bd089c1e1e4cf5e20ddc2',
'dev_requirement' => false,
),
'justinrainbow/json-schema' => array(
Expand Down Expand Up @@ -286,7 +286,7 @@
'type' => 'library',
'install_path' => __DIR__ . '/../',
'aliases' => array(),
'reference' => 'ef4cdf00dddf9c92618e72e117c144e97112ccc4',
'reference' => '2fa8874509eebddd763d530c85d05a37aadf2e07',
'dev_requirement' => false,
),
'nextcloud/lognormalizer' => array(
Expand Down
4 changes: 2 additions & 2 deletions composer/package-versions-deprecated/src/PackageVersions/Versions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ final class Versions
'guzzlehttp/psr7' => '1.7.0@53330f47520498c0ae1f61f7e2c90f55690c06a3',
'guzzlehttp/uri-template' => 'v0.2.0@db46525d6d8fee71033b73cc07160f3e5271a8ce',
'icewind/searchdav' => 'v2.0.0@c69806d900c2c9a5954bfabc80178d6eb0d63df4',
'icewind/streams' => 'v0.7.2@77d750ccc654c0eda4a41fedb2dbd71053755790',
'icewind/streams' => 'v0.7.5@0c6aae16ebdadb257f0bd089c1e1e4cf5e20ddc2',
'justinrainbow/json-schema' => '5.2.10@2ba9c8c862ecd5510ed16c6340aa9f6eadb4f31b',
'league/flysystem' => '1.1.3@9be3b16c877d477357c015cec057548cf9b2a14a',
'league/mime-type-detection' => '1.7.0@3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3',
Expand Down Expand Up @@ -119,7 +119,7 @@ final class Versions
'web-auth/cose-lib' => 'v3.3.9@ed172d2dc1a6b87b5c644c07c118cd30c1b3819b',
'web-auth/metadata-service' => 'v3.3.9@8488d3a832a38cc81c670fce05de1e515c6e64b1',
'web-auth/webauthn-lib' => 'v3.3.9@04b98ee3d39cb79dad68a7c15c297c085bf66bfe',
'nextcloud/3rdparty' => 'dev-master@ef4cdf00dddf9c92618e72e117c144e97112ccc4',
'nextcloud/3rdparty' => 'dev-master@2fa8874509eebddd763d530c85d05a37aadf2e07',
);

private function __construct()
Expand Down
1 change: 1 addition & 0 deletions icewind/streams/.gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ vendor
composer.lock
build
example.php
*.cache
13 changes: 0 additions & 13 deletions icewind/streams/.scrutinizer.yml
View file

This file was deleted.

20 changes: 10 additions & 10 deletions icewind/streams/src/CallbackWrapper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,27 +25,27 @@
*/
class CallbackWrapper extends Wrapper {
/**
* @var callable
* @var callable|null
*/
protected $readCallback;

/**
* @var callable
* @var callable|null
*/
protected $writeCallback;

/**
* @var callable
* @var callable|null
*/
protected $closeCallback;

/**
* @var callable
* @var callable|null
*/
protected $readDirCallBack;

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

Expand All @@ -63,11 +63,11 @@ class CallbackWrapper extends Wrapper {
*/
public static function wrap($source, $read = null, $write = null, $close = null, $readDir = null, $preClose = null) {
$context = [
'source' => $source,
'read' => $read,
'write' => $write,
'close' => $close,
'readDir' => $readDir,
'source' => $source,
'read' => $read,
'write' => $write,
'close' => $close,
'readDir' => $readDir,
'preClose' => $preClose,
];
return self::wrapSource($source, $context);
Expand Down
2 changes: 1 addition & 1 deletion icewind/streams/src/CountWrapper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public static function wrap($source, $callback) {
throw new \InvalidArgumentException('Invalid or missing callback');
}
return self::wrapSource($source, [
'source' => $source,
'source' => $source,
'callback' => $callback
]);
}
Expand Down
10 changes: 5 additions & 5 deletions icewind/streams/src/File.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ interface File {
* @param string $path
* @param string $mode
* @param int $options
* @param string &$opened_path
* @param string $opened_path
* @return bool
*/
public function stream_open($path, $mode, $options, &$opened_path);
Expand All @@ -28,19 +28,19 @@ public function stream_open($path, $mode, $options, &$opened_path);
public function stream_seek($offset, $whence = SEEK_SET);

/**
* @return int
* @return int|false
*/
public function stream_tell();

/**
* @param int $count
* @return string
* @return string|false
*/
public function stream_read($count);

/**
* @param string $data
* @return int
* @return int|false
*/
public function stream_write($data);

Expand All @@ -59,7 +59,7 @@ public function stream_set_option($option, $arg1, $arg2);
public function stream_truncate($size);

/**
* @return array
* @return array|false
*/
public function stream_stat();

Expand Down
10 changes: 4 additions & 6 deletions icewind/streams/src/HashWrapper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,15 @@

namespace Icewind\Streams;


abstract class HashWrapper extends Wrapper {

/**
* @var callable
* @var callable|null
*/
private $callback;

/**
* @var resource
* @var resource|\HashContext
*/
private $hashContext;

Expand All @@ -48,7 +47,7 @@ abstract class HashWrapper extends Wrapper {
*/
public static function wrap($source, $hash, $callback) {
$context = [
'hash' => $hash,
'hash' => $hash,
'callback' => $callback,
];
return self::wrapSource($source, $context);
Expand Down Expand Up @@ -76,5 +75,4 @@ public function stream_close() {
}
return parent::stream_close();
}

}
}
4 changes: 2 additions & 2 deletions icewind/streams/src/IteratorDirectory.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ protected function loadContext($name = null) {
$context = parent::loadContext($name);
if (isset($context['iterator'])) {
$this->iterator = $context['iterator'];
} else if (isset($context['array'])) {
} elseif (isset($context['array'])) {
$this->iterator = new \ArrayIterator($context['array']);
} else {
throw new \BadMethodCallException('Invalid context, iterator or array not set');
Expand Down Expand Up @@ -101,7 +101,7 @@ public static function wrap($source) {
$options = [
'iterator' => $source
];
} else if (is_array($source)) {
} elseif (is_array($source)) {
$options = [
'array' => $source
];
Expand Down
2 changes: 1 addition & 1 deletion icewind/streams/src/SeekableWrapper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public function stream_read($count) {
public function stream_seek($offset, $whence = SEEK_SET) {
if ($whence === SEEK_SET) {
$target = $offset;
} else if ($whence === SEEK_CUR) {
} elseif ($whence === SEEK_CUR) {
$current = ftell($this->cache);
$target = $current + $offset;
} else {
Expand Down
6 changes: 3 additions & 3 deletions icewind/streams/src/Url.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public function dir_opendir($path, $options);
* @param string $path
* @param string $mode
* @param int $options
* @param string &$opened_path
* @param string $opened_path
* @return bool
*/
public function stream_open($path, $mode, $options, &$opened_path);
Expand Down Expand Up @@ -50,15 +50,15 @@ public function rename($source, $target);
public function rmdir($path, $options);

/**
* @param string
* @param string $path
* @return bool
*/
public function unlink($path);

/**
* @param string $path
* @param int $flags
* @return array
* @return array|false
*/
public function url_stat($path, $flags);
}
Loading

0 comments on commit d12a875

Please sign in to comment.