mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #21252 from nextcloud/smb-3.2.5 

update icewind/smb to 3.2.5
This commit is contained in:
Robin Appelman 2020-06-09 12:27:46 +00:00 committed by GitHub
parent 862e3250ff 41fdfc9966
commit 892589746d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files_external/3rdparty/composer.json vendored
View File

@ -9,6 +9,6 @@
}, },
"require": { "require": {
"icewind/streams": "0.7.1", "icewind/streams": "0.7.1",
"icewind/smb": "3.2.4" "icewind/smb": "3.2.5"
} }
} }

12
apps/files_external/3rdparty/composer.lock generated vendored
View File

@ -4,20 +4,20 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "9454f546b6ab8865140c991e8f197951", "content-hash": "71341c5501f2d0c68ca2bfa4e92f4eec",
"packages": [ "packages": [
{ {
"name": "icewind/smb", "name": "icewind/smb",
"version": "v3.2.4", "version": "v3.2.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/icewind1991/SMB.git", "url": "https://github.com/icewind1991/SMB.git",
"reference": "999d6687ca9d4ac2600185c935b45206e47e604a" "reference": "80921d69f5e47157c825f0bdac6c838fe0b901b2"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/icewind1991/SMB/zipball/999d6687ca9d4ac2600185c935b45206e47e604a", "url": "https://api.github.com/repos/icewind1991/SMB/zipball/80921d69f5e47157c825f0bdac6c838fe0b901b2",
"reference": "999d6687ca9d4ac2600185c935b45206e47e604a", "reference": "80921d69f5e47157c825f0bdac6c838fe0b901b2",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -46,7 +46,7 @@
} }
], ],
"description": "php wrapper for smbclient and libsmbclient-php", "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", "name": "icewind/streams",

12
apps/files_external/3rdparty/composer/installed.json vendored
View File

@ -1,17 +1,17 @@
[ [
{ {
"name": "icewind/smb", "name": "icewind/smb",
"version": "v3.2.4", "version": "v3.2.5",
"version_normalized": "3.2.4.0", "version_normalized": "3.2.5.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/icewind1991/SMB.git", "url": "https://github.com/icewind1991/SMB.git",
"reference": "999d6687ca9d4ac2600185c935b45206e47e604a" "reference": "80921d69f5e47157c825f0bdac6c838fe0b901b2"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/icewind1991/SMB/zipball/999d6687ca9d4ac2600185c935b45206e47e604a", "url": "https://api.github.com/repos/icewind1991/SMB/zipball/80921d69f5e47157c825f0bdac6c838fe0b901b2",
"reference": "999d6687ca9d4ac2600185c935b45206e47e604a", "reference": "80921d69f5e47157c825f0bdac6c838fe0b901b2",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -22,7 +22,7 @@
"friendsofphp/php-cs-fixer": "^2.13", "friendsofphp/php-cs-fixer": "^2.13",
"phpunit/phpunit": "^7.0" "phpunit/phpunit": "^7.0"
}, },
"time": "2020-05-11T14:12:35+00:00", "time": "2020-05-27T13:56:04+00:00",
"type": "library", "type": "library",
"installation-source": "dist", "installation-source": "dist",
"autoload": { "autoload": {

7
apps/files_external/3rdparty/icewind/smb/src/IShare.php vendored
View File

@ -150,4 +150,11 @@ interface IShare {
* @return INotifyHandler * @return INotifyHandler
*/ */
public function notify($path); public function notify($path);
/**
* Get the IServer instance for this share
*
* @return IServer
*/
public function getServer(): IServer;
} }

2
apps/files_external/3rdparty/icewind/smb/src/Native/NativeFileInfo.php vendored
View File

@ -141,7 +141,7 @@ class NativeFileInfo implements IFileInfo {
public function isHidden() { public function isHidden() {
$mode = $this->getMode(); $mode = $this->getMode();
if ($mode > 0x80) { if ($mode > 0x80) {
return $this->name[0] === '.'; return strlen($this->name) > 0 && $this->name[0] === '.';
} else { } else {
return (bool)($mode & IFileInfo::MODE_HIDDEN); return (bool)($mode & IFileInfo::MODE_HIDDEN);
} }

4
apps/files_external/3rdparty/icewind/smb/src/Native/NativeShare.php vendored
View File

@ -350,6 +350,10 @@ class NativeShare extends AbstractShare {
return $share->notify($path); return $share->notify($path);
} }
public function getServer(): IServer {
return $this->server;
}
public function __destruct() { public function __destruct() {
unset($this->state); unset($this->state);
} }

4
apps/files_external/3rdparty/icewind/smb/src/Wrapped/Share.php vendored
View File

@ -552,6 +552,10 @@ class Share extends AbstractShare {
return $acls; return $acls;
} }
public function getServer(): IServer {
return $this->server;
}
public function __destruct() { public function __destruct() {
unset($this->connection); unset($this->connection);
} }