summaryrefslogtreecommitdiffstats
path: root/apps/files_external/3rdparty/icewind/smb
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2016-03-17 13:54:26 +0100
committerRobin Appelman <icewind@owncloud.com>2016-03-21 14:24:00 +0100
commitdfbd85d7231d3440b2831c61a83ba8cb1512523e (patch)
treefbece739c4879b823e911f3d7a125c28bf791b0b /apps/files_external/3rdparty/icewind/smb
parent90fb744e89572f5f9a41a82e9619bd3b2bcfa0a6 (diff)
downloadnextcloud-server-dfbd85d7231d3440b2831c61a83ba8cb1512523e.tar.gz
nextcloud-server-dfbd85d7231d3440b2831c61a83ba8cb1512523e.zip
update icewind/streams to 0.4.0 and icewind/smb to 1.0.7 in files_external
Diffstat (limited to 'apps/files_external/3rdparty/icewind/smb')
-rw-r--r--apps/files_external/3rdparty/icewind/smb/README.md2
-rw-r--r--apps/files_external/3rdparty/icewind/smb/composer.json2
-rw-r--r--apps/files_external/3rdparty/icewind/smb/src/NativeStream.php7
3 files changed, 8 insertions, 3 deletions
diff --git a/apps/files_external/3rdparty/icewind/smb/README.md b/apps/files_external/3rdparty/icewind/smb/README.md
index a0864717b09..32f3c650f87 100644
--- a/apps/files_external/3rdparty/icewind/smb/README.md
+++ b/apps/files_external/3rdparty/icewind/smb/README.md
@@ -75,7 +75,7 @@ $share = $server->getShare('test');
$content = $share->dir('test');
foreach ($content as $info) {
- echo $name->getName() . "\n";
+ echo $info->getName() . "\n";
echo "\tsize :" . $info->getSize() . "\n";
}
```
diff --git a/apps/files_external/3rdparty/icewind/smb/composer.json b/apps/files_external/3rdparty/icewind/smb/composer.json
index 2e1fd35f7a6..4ac8b27e725 100644
--- a/apps/files_external/3rdparty/icewind/smb/composer.json
+++ b/apps/files_external/3rdparty/icewind/smb/composer.json
@@ -10,7 +10,7 @@
],
"require" : {
"php": ">=5.3",
- "icewind/streams": "0.2.*"
+ "icewind/streams": ">=0.2.0"
},
"require-dev": {
"satooshi/php-coveralls" : "v1.0.0",
diff --git a/apps/files_external/3rdparty/icewind/smb/src/NativeStream.php b/apps/files_external/3rdparty/icewind/smb/src/NativeStream.php
index 07bd2f1e797..8ffa8836924 100644
--- a/apps/files_external/3rdparty/icewind/smb/src/NativeStream.php
+++ b/apps/files_external/3rdparty/icewind/smb/src/NativeStream.php
@@ -7,6 +7,7 @@
namespace Icewind\SMB;
+use Icewind\SMB\Exception\Exception;
use Icewind\SMB\Exception\InvalidRequestException;
use Icewind\Streams\File;
@@ -89,7 +90,11 @@ class NativeStream implements File {
}
public function stream_stat() {
- return $this->state->fstat($this->handle);
+ try {
+ return $this->state->fstat($this->handle);
+ } catch (Exception $e) {
+ return false;
+ }
}
public function stream_tell() {