Merge pull request #21949 from nextcloud/smb-3.2.6
update icewind/smb to 3.2.6
This commit is contained in:
commit
b573014e2d
|
@ -9,6 +9,6 @@
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"icewind/streams": "0.7.1",
|
"icewind/streams": "0.7.1",
|
||||||
"icewind/smb": "3.2.5"
|
"icewind/smb": "3.2.6"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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": "71341c5501f2d0c68ca2bfa4e92f4eec",
|
"content-hash": "3b3638566fc1597d1a48c43e2a0da72a",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "icewind/smb",
|
"name": "icewind/smb",
|
||||||
"version": "v3.2.5",
|
"version": "v3.2.6",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/icewind1991/SMB.git",
|
"url": "https://github.com/icewind1991/SMB.git",
|
||||||
"reference": "80921d69f5e47157c825f0bdac6c838fe0b901b2"
|
"reference": "507b186800ac6c3b287604a4ff9b138cf430da79"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/icewind1991/SMB/zipball/80921d69f5e47157c825f0bdac6c838fe0b901b2",
|
"url": "https://api.github.com/repos/icewind1991/SMB/zipball/507b186800ac6c3b287604a4ff9b138cf430da79",
|
||||||
"reference": "80921d69f5e47157c825f0bdac6c838fe0b901b2",
|
"reference": "507b186800ac6c3b287604a4ff9b138cf430da79",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -31,8 +31,7 @@
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-4": {
|
"psr-4": {
|
||||||
"Icewind\\SMB\\": "src/",
|
"Icewind\\SMB\\": "src/"
|
||||||
"Icewind\\SMB\\Test\\": "tests/"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"notification-url": "https://packagist.org/downloads/",
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
@ -46,7 +45,7 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"description": "php wrapper for smbclient and libsmbclient-php",
|
"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",
|
"name": "icewind/streams",
|
||||||
|
|
|
@ -8,6 +8,5 @@ $baseDir = $vendorDir;
|
||||||
return array(
|
return array(
|
||||||
'Icewind\\Streams\\Tests\\' => array($vendorDir . '/icewind/streams/tests'),
|
'Icewind\\Streams\\Tests\\' => array($vendorDir . '/icewind/streams/tests'),
|
||||||
'Icewind\\Streams\\' => array($vendorDir . '/icewind/streams/src'),
|
'Icewind\\Streams\\' => array($vendorDir . '/icewind/streams/src'),
|
||||||
'Icewind\\SMB\\Test\\' => array($vendorDir . '/icewind/smb/tests'),
|
|
||||||
'Icewind\\SMB\\' => array($vendorDir . '/icewind/smb/src'),
|
'Icewind\\SMB\\' => array($vendorDir . '/icewind/smb/src'),
|
||||||
);
|
);
|
||||||
|
|
|
@ -11,7 +11,6 @@ class ComposerStaticInit98fe9b281934250b3a93f69a5ce843b3
|
||||||
array (
|
array (
|
||||||
'Icewind\\Streams\\Tests\\' => 22,
|
'Icewind\\Streams\\Tests\\' => 22,
|
||||||
'Icewind\\Streams\\' => 16,
|
'Icewind\\Streams\\' => 16,
|
||||||
'Icewind\\SMB\\Test\\' => 17,
|
|
||||||
'Icewind\\SMB\\' => 12,
|
'Icewind\\SMB\\' => 12,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
@ -25,10 +24,6 @@ class ComposerStaticInit98fe9b281934250b3a93f69a5ce843b3
|
||||||
array (
|
array (
|
||||||
0 => __DIR__ . '/..' . '/icewind/streams/src',
|
0 => __DIR__ . '/..' . '/icewind/streams/src',
|
||||||
),
|
),
|
||||||
'Icewind\\SMB\\Test\\' =>
|
|
||||||
array (
|
|
||||||
0 => __DIR__ . '/..' . '/icewind/smb/tests',
|
|
||||||
),
|
|
||||||
'Icewind\\SMB\\' =>
|
'Icewind\\SMB\\' =>
|
||||||
array (
|
array (
|
||||||
0 => __DIR__ . '/..' . '/icewind/smb/src',
|
0 => __DIR__ . '/..' . '/icewind/smb/src',
|
||||||
|
|
|
@ -1,17 +1,17 @@
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
"name": "icewind/smb",
|
"name": "icewind/smb",
|
||||||
"version": "v3.2.5",
|
"version": "v3.2.6",
|
||||||
"version_normalized": "3.2.5.0",
|
"version_normalized": "3.2.6.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/icewind1991/SMB.git",
|
"url": "https://github.com/icewind1991/SMB.git",
|
||||||
"reference": "80921d69f5e47157c825f0bdac6c838fe0b901b2"
|
"reference": "507b186800ac6c3b287604a4ff9b138cf430da79"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/icewind1991/SMB/zipball/80921d69f5e47157c825f0bdac6c838fe0b901b2",
|
"url": "https://api.github.com/repos/icewind1991/SMB/zipball/507b186800ac6c3b287604a4ff9b138cf430da79",
|
||||||
"reference": "80921d69f5e47157c825f0bdac6c838fe0b901b2",
|
"reference": "507b186800ac6c3b287604a4ff9b138cf430da79",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -22,13 +22,12 @@
|
||||||
"friendsofphp/php-cs-fixer": "^2.13",
|
"friendsofphp/php-cs-fixer": "^2.13",
|
||||||
"phpunit/phpunit": "^7.0"
|
"phpunit/phpunit": "^7.0"
|
||||||
},
|
},
|
||||||
"time": "2020-05-27T13:56:04+00:00",
|
"time": "2020-07-20T14:12:51+00:00",
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"installation-source": "dist",
|
"installation-source": "dist",
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-4": {
|
"psr-4": {
|
||||||
"Icewind\\SMB\\": "src/",
|
"Icewind\\SMB\\": "src/"
|
||||||
"Icewind\\SMB\\Test\\": "tests/"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"notification-url": "https://packagist.org/downloads/",
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
|
|
@ -18,7 +18,11 @@
|
||||||
},
|
},
|
||||||
"autoload" : {
|
"autoload" : {
|
||||||
"psr-4": {
|
"psr-4": {
|
||||||
"Icewind\\SMB\\": "src/",
|
"Icewind\\SMB\\": "src/"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"autoload-dev" : {
|
||||||
|
"psr-4": {
|
||||||
"Icewind\\SMB\\Test\\": "tests/"
|
"Icewind\\SMB\\Test\\": "tests/"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -108,6 +108,11 @@ class NativeFileInfo implements IFileInfo {
|
||||||
* @return int
|
* @return int
|
||||||
*/
|
*/
|
||||||
protected function getMode() {
|
protected function getMode() {
|
||||||
|
$mode = $this->stat()['mode'];
|
||||||
|
|
||||||
|
// Let us ignore the ATTR_NOT_CONTENT_INDEXED for now
|
||||||
|
$mode &= ~0x00002000;
|
||||||
|
|
||||||
return $this->stat()['mode'];
|
return $this->stat()['mode'];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -116,8 +121,8 @@ class NativeFileInfo implements IFileInfo {
|
||||||
*/
|
*/
|
||||||
public function isDirectory() {
|
public function isDirectory() {
|
||||||
$mode = $this->getMode();
|
$mode = $this->getMode();
|
||||||
if ($mode > 0x80) {
|
if ($mode > 0x1000) {
|
||||||
return (bool)($mode & 0x4000); // 0x80: unix directory flag
|
return (bool)($mode & 0x4000); // 0x4000: unix directory flag
|
||||||
} else {
|
} else {
|
||||||
return (bool)($mode & IFileInfo::MODE_DIRECTORY);
|
return (bool)($mode & IFileInfo::MODE_DIRECTORY);
|
||||||
}
|
}
|
||||||
|
@ -128,7 +133,7 @@ class NativeFileInfo implements IFileInfo {
|
||||||
*/
|
*/
|
||||||
public function isReadOnly() {
|
public function isReadOnly() {
|
||||||
$mode = $this->getMode();
|
$mode = $this->getMode();
|
||||||
if ($mode > 0x80) {
|
if ($mode > 0x1000) {
|
||||||
return !(bool)($mode & 0x80); // 0x80: owner write permissions
|
return !(bool)($mode & 0x80); // 0x80: owner write permissions
|
||||||
} else {
|
} else {
|
||||||
return (bool)($mode & IFileInfo::MODE_READONLY);
|
return (bool)($mode & IFileInfo::MODE_READONLY);
|
||||||
|
@ -140,7 +145,7 @@ class NativeFileInfo implements IFileInfo {
|
||||||
*/
|
*/
|
||||||
public function isHidden() {
|
public function isHidden() {
|
||||||
$mode = $this->getMode();
|
$mode = $this->getMode();
|
||||||
if ($mode > 0x80) {
|
if ($mode > 0x1000) {
|
||||||
return strlen($this->name) > 0 && $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);
|
||||||
|
@ -152,7 +157,7 @@ class NativeFileInfo implements IFileInfo {
|
||||||
*/
|
*/
|
||||||
public function isSystem() {
|
public function isSystem() {
|
||||||
$mode = $this->getMode();
|
$mode = $this->getMode();
|
||||||
if ($mode > 0x80) {
|
if ($mode > 0x1000) {
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
return (bool)($mode & IFileInfo::MODE_SYSTEM);
|
return (bool)($mode & IFileInfo::MODE_SYSTEM);
|
||||||
|
@ -164,7 +169,7 @@ class NativeFileInfo implements IFileInfo {
|
||||||
*/
|
*/
|
||||||
public function isArchived() {
|
public function isArchived() {
|
||||||
$mode = $this->getMode();
|
$mode = $this->getMode();
|
||||||
if ($mode > 0x80) {
|
if ($mode > 0x1000) {
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
return (bool)($mode & IFileInfo::MODE_ARCHIVE);
|
return (bool)($mode & IFileInfo::MODE_ARCHIVE);
|
||||||
|
|
Loading…
Reference in New Issue