Browse Source

Merge pull request #21343 from nextcloud/backport/21252/stable18

[stable18] update icewind/smb to 3.2.5
Morris Jobke 3 years ago
parent
commit
2d1fbabfc5

+ 1 - 1
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"
 	}
 }

+ 6 - 6
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": "ab745d51b0d201a3c3d3f78e5cb865c1",
+    "content-hash": "ceae723174e6d71cdd0c12ee6cb758a4",
     "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",

+ 6 - 6
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": {

+ 7 - 0
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;
 }

+ 1 - 1
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);
 		}

+ 4 - 0
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);
 	}

+ 4 - 0
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);
 	}