From 9bfda35781bdd76f88410a00ecaf3dc26ff3b44c Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 22 Apr 2021 17:55:02 +0200 Subject: [PATCH] [3rdparty] streams-0.7.4 Signed-off-by: Robin Appelman --- 3rdparty | 2 +- apps/files_external/3rdparty/composer.json | 2 +- apps/files_external/3rdparty/composer.lock | 14 +++++++------- .../3rdparty/composer/InstalledVersions.php | 10 +++++----- .../3rdparty/composer/installed.json | 14 +++++++------- .../files_external/3rdparty/composer/installed.php | 10 +++++----- .../3rdparty/icewind/streams/src/Wrapper.php | 4 +++- 7 files changed, 29 insertions(+), 27 deletions(-) diff --git a/3rdparty b/3rdparty index 3fad2cede2..b4ca02a42f 160000 --- a/3rdparty +++ b/3rdparty @@ -1 +1 @@ -Subproject commit 3fad2cede25f6cce70d4eb4e5f2e4fbceac583f8 +Subproject commit b4ca02a42fd0a0f509f4106dbd92e6576d44d8c5 diff --git a/apps/files_external/3rdparty/composer.json b/apps/files_external/3rdparty/composer.json index 3f237c827e..70627e6db8 100644 --- a/apps/files_external/3rdparty/composer.json +++ b/apps/files_external/3rdparty/composer.json @@ -8,7 +8,7 @@ "classmap-authoritative": true }, "require": { - "icewind/streams": "0.7.3", + "icewind/streams": "0.7.4", "icewind/smb": "3.4.0" } } diff --git a/apps/files_external/3rdparty/composer.lock b/apps/files_external/3rdparty/composer.lock index 7e180c3366..a85be095ef 100644 --- a/apps/files_external/3rdparty/composer.lock +++ b/apps/files_external/3rdparty/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "9905ed45527f669a4165a8b83b6e4141", + "content-hash": "91c13ec7a5c31be70b6a3988b48d93b8", "packages": [ { "name": "icewind/smb", @@ -55,16 +55,16 @@ }, { "name": "icewind/streams", - "version": "v0.7.3", + "version": "v0.7.4", "source": { "type": "git", "url": "https://github.com/icewind1991/Streams.git", - "reference": "22ef9fc5b50d645dbc202206a656cc4dde28f95c" + "reference": "93bce472202d36d9808c30eaa52a1dc72b39e04c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/icewind1991/Streams/zipball/22ef9fc5b50d645dbc202206a656cc4dde28f95c", - "reference": "22ef9fc5b50d645dbc202206a656cc4dde28f95c", + "url": "https://api.github.com/repos/icewind1991/Streams/zipball/93bce472202d36d9808c30eaa52a1dc72b39e04c", + "reference": "93bce472202d36d9808c30eaa52a1dc72b39e04c", "shasum": "" }, "require": { @@ -94,9 +94,9 @@ "description": "A set of generic stream wrappers", "support": { "issues": "https://github.com/icewind1991/Streams/issues", - "source": "https://github.com/icewind1991/Streams/tree/v0.7.3" + "source": "https://github.com/icewind1991/Streams/tree/v0.7.4" }, - "time": "2021-03-02T19:33:35+00:00" + "time": "2021-03-12T15:48:22+00:00" } ], "packages-dev": [], diff --git a/apps/files_external/3rdparty/composer/InstalledVersions.php b/apps/files_external/3rdparty/composer/InstalledVersions.php index 71cd811ef8..1a07db618c 100644 --- a/apps/files_external/3rdparty/composer/InstalledVersions.php +++ b/apps/files_external/3rdparty/composer/InstalledVersions.php @@ -30,7 +30,7 @@ private static $installed = array ( 'aliases' => array ( ), - 'reference' => '62929cc646134fbd409cfb4eacb7039d15763b96', + 'reference' => 'a011b7021ef7153acce6978a1c65db0a8c7ec32d', 'name' => 'files_external/3rdparty', ), 'versions' => @@ -42,7 +42,7 @@ private static $installed = array ( 'aliases' => array ( ), - 'reference' => '62929cc646134fbd409cfb4eacb7039d15763b96', + 'reference' => 'a011b7021ef7153acce6978a1c65db0a8c7ec32d', ), 'icewind/smb' => array ( @@ -55,12 +55,12 @@ private static $installed = array ( ), 'icewind/streams' => array ( - 'pretty_version' => 'v0.7.3', - 'version' => '0.7.3.0', + 'pretty_version' => 'v0.7.4', + 'version' => '0.7.4.0', 'aliases' => array ( ), - 'reference' => '22ef9fc5b50d645dbc202206a656cc4dde28f95c', + 'reference' => '93bce472202d36d9808c30eaa52a1dc72b39e04c', ), ), ); diff --git a/apps/files_external/3rdparty/composer/installed.json b/apps/files_external/3rdparty/composer/installed.json index e6950959c4..c96973b2d0 100644 --- a/apps/files_external/3rdparty/composer/installed.json +++ b/apps/files_external/3rdparty/composer/installed.json @@ -52,17 +52,17 @@ }, { "name": "icewind/streams", - "version": "v0.7.3", - "version_normalized": "0.7.3.0", + "version": "v0.7.4", + "version_normalized": "0.7.4.0", "source": { "type": "git", "url": "https://github.com/icewind1991/Streams.git", - "reference": "22ef9fc5b50d645dbc202206a656cc4dde28f95c" + "reference": "93bce472202d36d9808c30eaa52a1dc72b39e04c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/icewind1991/Streams/zipball/22ef9fc5b50d645dbc202206a656cc4dde28f95c", - "reference": "22ef9fc5b50d645dbc202206a656cc4dde28f95c", + "url": "https://api.github.com/repos/icewind1991/Streams/zipball/93bce472202d36d9808c30eaa52a1dc72b39e04c", + "reference": "93bce472202d36d9808c30eaa52a1dc72b39e04c", "shasum": "" }, "require": { @@ -73,7 +73,7 @@ "phpstan/phpstan": "^0.12", "phpunit/phpunit": "^9" }, - "time": "2021-03-02T19:33:35+00:00", + "time": "2021-03-12T15:48:22+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -94,7 +94,7 @@ "description": "A set of generic stream wrappers", "support": { "issues": "https://github.com/icewind1991/Streams/issues", - "source": "https://github.com/icewind1991/Streams/tree/v0.7.3" + "source": "https://github.com/icewind1991/Streams/tree/v0.7.4" }, "install-path": "../icewind/streams" } diff --git a/apps/files_external/3rdparty/composer/installed.php b/apps/files_external/3rdparty/composer/installed.php index 8d83406926..53c540d2b7 100644 --- a/apps/files_external/3rdparty/composer/installed.php +++ b/apps/files_external/3rdparty/composer/installed.php @@ -6,7 +6,7 @@ 'aliases' => array ( ), - 'reference' => '62929cc646134fbd409cfb4eacb7039d15763b96', + 'reference' => 'a011b7021ef7153acce6978a1c65db0a8c7ec32d', 'name' => 'files_external/3rdparty', ), 'versions' => @@ -18,7 +18,7 @@ 'aliases' => array ( ), - 'reference' => '62929cc646134fbd409cfb4eacb7039d15763b96', + 'reference' => 'a011b7021ef7153acce6978a1c65db0a8c7ec32d', ), 'icewind/smb' => array ( @@ -31,12 +31,12 @@ ), 'icewind/streams' => array ( - 'pretty_version' => 'v0.7.3', - 'version' => '0.7.3.0', + 'pretty_version' => 'v0.7.4', + 'version' => '0.7.4.0', 'aliases' => array ( ), - 'reference' => '22ef9fc5b50d645dbc202206a656cc4dde28f95c', + 'reference' => '93bce472202d36d9808c30eaa52a1dc72b39e04c', ), ), ); diff --git a/apps/files_external/3rdparty/icewind/streams/src/Wrapper.php b/apps/files_external/3rdparty/icewind/streams/src/Wrapper.php index 5dc8b29e77..03d0b20257 100644 --- a/apps/files_external/3rdparty/icewind/streams/src/Wrapper.php +++ b/apps/files_external/3rdparty/icewind/streams/src/Wrapper.php @@ -92,7 +92,9 @@ abstract class Wrapper extends WrapperHandler implements File, Directory { } public function stream_close() { - return fclose($this->source); + if (is_resource($this->source)) { + return fclose($this->source); + } } public function dir_readdir() {