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

Bump icewind/streams from 0.7.2 to 0.7.4 #683

Merged
merged 1 commit into from
Jun 10, 2021
Merged

Bump icewind/streams from 0.7.2 to 0.7.4 #683

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
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.4",
"league/flysystem": "^1.0",
"microsoft/azure-storage-blob": "^1.5",
"nextcloud/lognormalizer": "^1.0",
Expand Down
23 changes: 12 additions & 11 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.

10 changes: 5 additions & 5 deletions composer/InstalledVersions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class InstalledVersions
'aliases' =>
array (
),
'reference' => '47ef0d3d299f471883102b7bd1712727b9a62d8b',
'reference' => '1d1f743b8adb5123016837f5d0adcd9414d28bef',
'name' => 'nextcloud/3rdparty',
),
'versions' =>
Expand Down Expand Up @@ -228,12 +228,12 @@ class InstalledVersions
),
'icewind/streams' =>
array (
'pretty_version' => 'v0.7.2',
'version' => '0.7.2.0',
'pretty_version' => 'v0.7.4',
'version' => '0.7.4.0',
'aliases' =>
array (
),
'reference' => '77d750ccc654c0eda4a41fedb2dbd71053755790',
'reference' => '93bce472202d36d9808c30eaa52a1dc72b39e04c',
),
'justinrainbow/json-schema' =>
array (
Expand Down Expand Up @@ -314,7 +314,7 @@ class InstalledVersions
'aliases' =>
array (
),
'reference' => '47ef0d3d299f471883102b7bd1712727b9a62d8b',
'reference' => '1d1f743b8adb5123016837f5d0adcd9414d28bef',
),
'nextcloud/lognormalizer' =>
array (
Expand Down
21 changes: 11 additions & 10 deletions composer/installed.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1515,27 +1515,28 @@
},
{
"name": "icewind/streams",
"version": "v0.7.2",
"version_normalized": "0.7.2.0",
"version": "v0.7.4",
"version_normalized": "0.7.4.0",
"source": {
"type": "git",
"url": "https://github.com/icewind1991/Streams.git",
"reference": "77d750ccc654c0eda4a41fedb2dbd71053755790"
"reference": "93bce472202d36d9808c30eaa52a1dc72b39e04c"
},
"dist": {
"type": "zip",
"url": "https://github.com/gitapi/repos/icewind1991/Streams/zipball/77d750ccc654c0eda4a41fedb2dbd71053755790",
"reference": "77d750ccc654c0eda4a41fedb2dbd71053755790",
"url": "https://github.com/gitapi/repos/icewind1991/Streams/zipball/93bce472202d36d9808c30eaa52a1dc72b39e04c",
"reference": "93bce472202d36d9808c30eaa52a1dc72b39e04c",
"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-03-12T15:48:22+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
Expand All @@ -1556,7 +1557,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.4"
},
"install-path": "../icewind/streams"
},
Expand Down
10 changes: 5 additions & 5 deletions composer/installed.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
'aliases' =>
array (
),
'reference' => '47ef0d3d299f471883102b7bd1712727b9a62d8b',
'reference' => '1d1f743b8adb5123016837f5d0adcd9414d28bef',
'name' => 'nextcloud/3rdparty',
),
'versions' =>
Expand Down Expand Up @@ -202,12 +202,12 @@
),
'icewind/streams' =>
array (
'pretty_version' => 'v0.7.2',
'version' => '0.7.2.0',
'pretty_version' => 'v0.7.4',
'version' => '0.7.4.0',
'aliases' =>
array (
),
'reference' => '77d750ccc654c0eda4a41fedb2dbd71053755790',
'reference' => '93bce472202d36d9808c30eaa52a1dc72b39e04c',
),
'justinrainbow/json-schema' =>
array (
Expand Down Expand Up @@ -288,7 +288,7 @@
'aliases' =>
array (
),
'reference' => '47ef0d3d299f471883102b7bd1712727b9a62d8b',
'reference' => '1d1f743b8adb5123016837f5d0adcd9414d28bef',
),
'nextcloud/lognormalizer' =>
array (
Expand Down
4 changes: 2 additions & 2 deletions composer/package-versions-deprecated/src/PackageVersions/Versions.php
View file
Open in desktop
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.4@93bce472202d36d9808c30eaa52a1dc72b39e04c',
'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 @@ -120,7 +120,7 @@ final class Versions
'web-auth/cose-lib' => 'v3.3.1@eea6fae63ff5c81bf98c115b1be5f38a69682c16',
'web-auth/metadata-service' => 'v3.3.1@8488d3a832a38cc81c670fce05de1e515c6e64b1',
'web-auth/webauthn-lib' => 'v3.3.1@e411527a41c1013512fccdfce61681eb36484c77',
'nextcloud/3rdparty' => 'dev-master@47ef0d3d299f471883102b7bd1712727b9a62d8b',
'nextcloud/3rdparty' => 'dev-master@1d1f743b8adb5123016837f5d0adcd9414d28bef',
);

private function __construct()
Expand Down
1 change: 1 addition & 0 deletions icewind/streams/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ vendor
composer.lock
build
example.php
*.cache
20 changes: 10 additions & 10 deletions icewind/streams/src/CallbackWrapper.php
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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