update icewind/smb to 3.2.6

Signed-off-by: Robin Appelman <robin@icewind.nl>

diff --git a/apps/files_external/3rdparty/composer.json b/apps/files_external/3rdparty/composer.json
index 3d6e65fdfed8507c8a3f9133b70d077efa9c6767..e6cd5a9eeb9fecadbf36fdc5981f955ead21f793 100644 (file)
--- 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.5"
+               "icewind/smb": "3.2.6"
        }
 }

diff --git a/apps/files_external/3rdparty/composer.lock b/apps/files_external/3rdparty/composer.lock
index e689bc391ed32cbade39f0f81b728a80e2d83f18..1ece93dccfce5f9fcf592cddb6046f2da41bdc58 100644 (file)
--- 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": "71341c5501f2d0c68ca2bfa4e92f4eec",
+    "content-hash": "3b3638566fc1597d1a48c43e2a0da72a",
     "packages": [
         {
             "name": "icewind/smb",
-            "version": "v3.2.5",
+            "version": "v3.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/icewind1991/SMB.git",
-                "reference": "80921d69f5e47157c825f0bdac6c838fe0b901b2"
+                "reference": "507b186800ac6c3b287604a4ff9b138cf430da79"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/icewind1991/SMB/zipball/80921d69f5e47157c825f0bdac6c838fe0b901b2",
-                "reference": "80921d69f5e47157c825f0bdac6c838fe0b901b2",
+                "url": "https://api.github.com/repos/icewind1991/SMB/zipball/507b186800ac6c3b287604a4ff9b138cf430da79",
+                "reference": "507b186800ac6c3b287604a4ff9b138cf430da79",
                 "shasum": ""
             },
             "require": {
@@ -31,8 +31,7 @@
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Icewind\\SMB\\": "src/",
-                    "Icewind\\SMB\\Test\\": "tests/"
+                    "Icewind\\SMB\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -46,7 +45,7 @@
                 }
             ],
             "description": "php wrapper for smbclient and libsmbclient-php",
-            "time": "2020-05-27T13:56:04+00:00"
+            "time": "2020-07-20T14:12:51+00:00"
         },
         {
             "name": "icewind/streams",

diff --git a/apps/files_external/3rdparty/composer/autoload_psr4.php b/apps/files_external/3rdparty/composer/autoload_psr4.php
index 7cfe0f1c46dc0fa3c935121d88467271f23dd054..82614b5016c6082436b6fb3852caa5c54bba82e9 100644 (file)
--- a/apps/files_external/3rdparty/composer/autoload_psr4.php
+++ b/apps/files_external/3rdparty/composer/autoload_psr4.php
@@ -8,6 +8,5 @@ $baseDir = $vendorDir;
 return array(
     'Icewind\\Streams\\Tests\\' => array($vendorDir . '/icewind/streams/tests'),
     'Icewind\\Streams\\' => array($vendorDir . '/icewind/streams/src'),
-    'Icewind\\SMB\\Test\\' => array($vendorDir . '/icewind/smb/tests'),
     'Icewind\\SMB\\' => array($vendorDir . '/icewind/smb/src'),
 );

diff --git a/apps/files_external/3rdparty/composer/autoload_static.php b/apps/files_external/3rdparty/composer/autoload_static.php
index fc6e68f8be4a872204c4ca16e3723739ba0a15ce..7ae9c4fff7a3431ee44d1cf99b887c59ff7cc971 100644 (file)
--- a/apps/files_external/3rdparty/composer/autoload_static.php
+++ b/apps/files_external/3rdparty/composer/autoload_static.php
@@ -11,7 +11,6 @@ class ComposerStaticInit98fe9b281934250b3a93f69a5ce843b3
         array (
             'Icewind\\Streams\\Tests\\' => 22,
             'Icewind\\Streams\\' => 16,
-            'Icewind\\SMB\\Test\\' => 17,
             'Icewind\\SMB\\' => 12,
         ),
     );
@@ -25,10 +24,6 @@ class ComposerStaticInit98fe9b281934250b3a93f69a5ce843b3
         array (
             0 => __DIR__ . '/..' . '/icewind/streams/src',
         ),
-        'Icewind\\SMB\\Test\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/icewind/smb/tests',
-        ),
         'Icewind\\SMB\\' => 
         array (
             0 => __DIR__ . '/..' . '/icewind/smb/src',

diff --git a/apps/files_external/3rdparty/composer/installed.json b/apps/files_external/3rdparty/composer/installed.json
index 35023ec730cdf50e6fadfdd23c31fb350e5f75ff..b96750e1635ee316bcfa86e62ed7a7ec395e75f6 100644 (file)
--- 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.5",
-        "version_normalized": "3.2.5.0",
+        "version": "v3.2.6",
+        "version_normalized": "3.2.6.0",
         "source": {
             "type": "git",
             "url": "https://github.com/icewind1991/SMB.git",
-            "reference": "80921d69f5e47157c825f0bdac6c838fe0b901b2"
+            "reference": "507b186800ac6c3b287604a4ff9b138cf430da79"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/icewind1991/SMB/zipball/80921d69f5e47157c825f0bdac6c838fe0b901b2",
-            "reference": "80921d69f5e47157c825f0bdac6c838fe0b901b2",
+            "url": "https://api.github.com/repos/icewind1991/SMB/zipball/507b186800ac6c3b287604a4ff9b138cf430da79",
+            "reference": "507b186800ac6c3b287604a4ff9b138cf430da79",
             "shasum": ""
         },
         "require": {
@@ -22,13 +22,12 @@
             "friendsofphp/php-cs-fixer": "^2.13",
             "phpunit/phpunit": "^7.0"
         },
-        "time": "2020-05-27T13:56:04+00:00",
+        "time": "2020-07-20T14:12:51+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
             "psr-4": {
-                "Icewind\\SMB\\": "src/",
-                "Icewind\\SMB\\Test\\": "tests/"
+                "Icewind\\SMB\\": "src/"
             }
         },
         "notification-url": "https://packagist.org/downloads/",

diff --git a/apps/files_external/3rdparty/icewind/smb/composer.json b/apps/files_external/3rdparty/icewind/smb/composer.json
index 8ec551c7340f4a871f9292f098158a2f3eb80d68..02cd629565e415df5a587bf4c5fbffd550e3c7c3 100644 (file)
--- a/apps/files_external/3rdparty/icewind/smb/composer.json
+++ b/apps/files_external/3rdparty/icewind/smb/composer.json
@@ -18,7 +18,11 @@
        },
        "autoload"         : {
                "psr-4": {
-                       "Icewind\\SMB\\": "src/",
+                       "Icewind\\SMB\\": "src/"
+               }
+       },
+  "autoload-dev"     : {
+               "psr-4": {
                        "Icewind\\SMB\\Test\\": "tests/"
                }
        }

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 5b987253ada8b7a60f74054b0048a78d86d46332..6a0270ef8f4788ece4b2a5bcd02cb84d38f6abc8 100644 (file)
--- a/apps/files_external/3rdparty/icewind/smb/src/Native/NativeFileInfo.php
+++ b/apps/files_external/3rdparty/icewind/smb/src/Native/NativeFileInfo.php
@@ -108,6 +108,11 @@ class NativeFileInfo implements IFileInfo {
         * @return int
         */
        protected function getMode() {
+               $mode = $this->stat()['mode'];
+
+               // Let us ignore the ATTR_NOT_CONTENT_INDEXED for now
+               $mode &= ~0x00002000;
+               
                return $this->stat()['mode'];
        }
 
@@ -116,8 +121,8 @@ class NativeFileInfo implements IFileInfo {
         */
        public function isDirectory() {
                $mode = $this->getMode();
-               if ($mode > 0x80) {
-                       return (bool)($mode & 0x4000); // 0x80: unix directory flag
+               if ($mode > 0x1000) {
+                       return (bool)($mode & 0x4000); // 0x4000: unix directory flag
                } else {
                        return (bool)($mode & IFileInfo::MODE_DIRECTORY);
                }
@@ -128,7 +133,7 @@ class NativeFileInfo implements IFileInfo {
         */
        public function isReadOnly() {
                $mode = $this->getMode();
-               if ($mode > 0x80) {
+               if ($mode > 0x1000) {
                        return !(bool)($mode & 0x80); // 0x80: owner write permissions
                } else {
                        return (bool)($mode & IFileInfo::MODE_READONLY);
@@ -140,7 +145,7 @@ class NativeFileInfo implements IFileInfo {
         */
        public function isHidden() {
                $mode = $this->getMode();
-               if ($mode > 0x80) {
+               if ($mode > 0x1000) {
                        return strlen($this->name) > 0 && $this->name[0] === '.';
                } else {
                        return (bool)($mode & IFileInfo::MODE_HIDDEN);
@@ -152,7 +157,7 @@ class NativeFileInfo implements IFileInfo {
         */
        public function isSystem() {
                $mode = $this->getMode();
-               if ($mode > 0x80) {
+               if ($mode > 0x1000) {
                        return false;
                } else {
                        return (bool)($mode & IFileInfo::MODE_SYSTEM);
@@ -164,7 +169,7 @@ class NativeFileInfo implements IFileInfo {
         */
        public function isArchived() {
                $mode = $this->getMode();
-               if ($mode > 0x80) {
+               if ($mode > 0x1000) {
                        return false;
                } else {
                        return (bool)($mode & IFileInfo::MODE_ARCHIVE);