From 61ea03d9818107b922646f52f6631262af43a95d Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 27 May 2020 17:44:54 +0200 Subject: [PATCH] update icewind/smb to 3.2.5 Signed-off-by: Robin Appelman --- apps/files_external/3rdparty/composer.json | 2 +- apps/files_external/3rdparty/composer.lock | 12 ++++++------ apps/files_external/3rdparty/composer/installed.json | 12 ++++++------ .../3rdparty/icewind/smb/src/IShare.php | 7 +++++++ .../icewind/smb/src/Native/NativeFileInfo.php | 2 +- .../3rdparty/icewind/smb/src/Native/NativeShare.php | 4 ++++ .../3rdparty/icewind/smb/src/Wrapped/Share.php | 4 ++++ 7 files changed, 29 insertions(+), 14 deletions(-) diff --git a/apps/files_external/3rdparty/composer.json b/apps/files_external/3rdparty/composer.json index 514108214d..3d6e65fdfe 100644 --- a/apps/files_external/3rdparty/composer.json +++ b/apps/files_external/3rdparty/composer.json @@ -9,6 +9,6 @@ }, "require": { "icewind/streams": "0.7.1", - "icewind/smb": "3.2.4" + "icewind/smb": "3.2.5" } } diff --git a/apps/files_external/3rdparty/composer.lock b/apps/files_external/3rdparty/composer.lock index aae061de55..e689bc391e 100644 --- a/apps/files_external/3rdparty/composer.lock +++ b/apps/files_external/3rdparty/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "9454f546b6ab8865140c991e8f197951", + "content-hash": "71341c5501f2d0c68ca2bfa4e92f4eec", "packages": [ { "name": "icewind/smb", - "version": "v3.2.4", + "version": "v3.2.5", "source": { "type": "git", "url": "https://github.com/icewind1991/SMB.git", - "reference": "999d6687ca9d4ac2600185c935b45206e47e604a" + "reference": "80921d69f5e47157c825f0bdac6c838fe0b901b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/icewind1991/SMB/zipball/999d6687ca9d4ac2600185c935b45206e47e604a", - "reference": "999d6687ca9d4ac2600185c935b45206e47e604a", + "url": "https://api.github.com/repos/icewind1991/SMB/zipball/80921d69f5e47157c825f0bdac6c838fe0b901b2", + "reference": "80921d69f5e47157c825f0bdac6c838fe0b901b2", "shasum": "" }, "require": { @@ -46,7 +46,7 @@ } ], "description": "php wrapper for smbclient and libsmbclient-php", - "time": "2020-05-11T14:12:35+00:00" + "time": "2020-05-27T13:56:04+00:00" }, { "name": "icewind/streams", diff --git a/apps/files_external/3rdparty/composer/installed.json b/apps/files_external/3rdparty/composer/installed.json index 388a48e556..35023ec730 100644 --- a/apps/files_external/3rdparty/composer/installed.json +++ b/apps/files_external/3rdparty/composer/installed.json @@ -1,17 +1,17 @@ [ { "name": "icewind/smb", - "version": "v3.2.4", - "version_normalized": "3.2.4.0", + "version": "v3.2.5", + "version_normalized": "3.2.5.0", "source": { "type": "git", "url": "https://github.com/icewind1991/SMB.git", - "reference": "999d6687ca9d4ac2600185c935b45206e47e604a" + "reference": "80921d69f5e47157c825f0bdac6c838fe0b901b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/icewind1991/SMB/zipball/999d6687ca9d4ac2600185c935b45206e47e604a", - "reference": "999d6687ca9d4ac2600185c935b45206e47e604a", + "url": "https://api.github.com/repos/icewind1991/SMB/zipball/80921d69f5e47157c825f0bdac6c838fe0b901b2", + "reference": "80921d69f5e47157c825f0bdac6c838fe0b901b2", "shasum": "" }, "require": { @@ -22,7 +22,7 @@ "friendsofphp/php-cs-fixer": "^2.13", "phpunit/phpunit": "^7.0" }, - "time": "2020-05-11T14:12:35+00:00", + "time": "2020-05-27T13:56:04+00:00", "type": "library", "installation-source": "dist", "autoload": { diff --git a/apps/files_external/3rdparty/icewind/smb/src/IShare.php b/apps/files_external/3rdparty/icewind/smb/src/IShare.php index 92a12b46f2..d33d10bb3f 100644 --- a/apps/files_external/3rdparty/icewind/smb/src/IShare.php +++ b/apps/files_external/3rdparty/icewind/smb/src/IShare.php @@ -150,4 +150,11 @@ interface IShare { * @return INotifyHandler */ public function notify($path); + + /** + * Get the IServer instance for this share + * + * @return IServer + */ + public function getServer(): IServer; } diff --git a/apps/files_external/3rdparty/icewind/smb/src/Native/NativeFileInfo.php b/apps/files_external/3rdparty/icewind/smb/src/Native/NativeFileInfo.php index 093cbb3b5d..5b987253ad 100644 --- a/apps/files_external/3rdparty/icewind/smb/src/Native/NativeFileInfo.php +++ b/apps/files_external/3rdparty/icewind/smb/src/Native/NativeFileInfo.php @@ -141,7 +141,7 @@ class NativeFileInfo implements IFileInfo { public function isHidden() { $mode = $this->getMode(); if ($mode > 0x80) { - return $this->name[0] === '.'; + return strlen($this->name) > 0 && $this->name[0] === '.'; } else { return (bool)($mode & IFileInfo::MODE_HIDDEN); } diff --git a/apps/files_external/3rdparty/icewind/smb/src/Native/NativeShare.php b/apps/files_external/3rdparty/icewind/smb/src/Native/NativeShare.php index e829be28bf..95ee3f489b 100644 --- a/apps/files_external/3rdparty/icewind/smb/src/Native/NativeShare.php +++ b/apps/files_external/3rdparty/icewind/smb/src/Native/NativeShare.php @@ -350,6 +350,10 @@ class NativeShare extends AbstractShare { return $share->notify($path); } + public function getServer(): IServer { + return $this->server; + } + public function __destruct() { unset($this->state); } diff --git a/apps/files_external/3rdparty/icewind/smb/src/Wrapped/Share.php b/apps/files_external/3rdparty/icewind/smb/src/Wrapped/Share.php index e0df1f6032..ea386a87bf 100644 --- a/apps/files_external/3rdparty/icewind/smb/src/Wrapped/Share.php +++ b/apps/files_external/3rdparty/icewind/smb/src/Wrapped/Share.php @@ -552,6 +552,10 @@ class Share extends AbstractShare { return $acls; } + public function getServer(): IServer { + return $this->server; + } + public function __destruct() { unset($this->connection); }