Skip to content
This repository was archived by the owner on Nov 25, 2020. It is now read-only.

Commit 079f906

Browse files
committed
Inherited methods signatures
1 parent ce968e8 commit 079f906

File tree

5 files changed

+26
-24
lines changed

5 files changed

+26
-24
lines changed

core/src/plugins/access.dropbox/src/Driver.php

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,7 @@ class Driver extends FsAccessDriver
4848
const RESOURCES_FILE = "dropbox.json";
4949

5050
public $driverType = "dropbox";
51-
52-
/**
53-
* Driver Initialization
54-
* @param $repository
55-
* @param array $options
56-
*/
57-
public function init($repository, $options = array())
58-
{
59-
parent::init($repository, $options);
60-
}
61-
51+
6252
/**
6353
* Repository Initialization
6454
* @param ContextInterface $context

core/src/plugins/access.imap/ImapAccessDriver.php

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,16 +175,32 @@ protected function parseSpecificContributions(ContextInterface $ctx, \DOMNode &$
175175
$this->disableArchiveBrowsingContributions($contribNode);
176176
}
177177

178+
/**
179+
* @param ContextInterface $contextInterface
180+
* @param $nodePath
181+
* @param $nodeName
182+
* @param $isLeaf
183+
* @param $lsOptions
184+
* @return bool
185+
*/
178186
public function filterNodeName(ContextInterface $contextInterface, $nodePath, $nodeName, &$isLeaf, $lsOptions)
179187
{
180188
return true;
181189
}
182190

183-
public function countChildren($dirName, $foldersOnly = false, $nonEmptyCheckOnly = false, $dirHandle = null)
191+
/**
192+
* @param AJXP_Node $dirNode
193+
* @param bool $foldersOnly
194+
* @param bool $nonEmptyCheckOnly
195+
* @param null $dirHANDLE
196+
* @return int
197+
* @throws \Exception
198+
*/
199+
public function countChildren(AJXP_Node $dirNode, $foldersOnly = false, $nonEmptyCheckOnly = false, $dirHANDLE = null)
184200
{
185201
if($foldersOnly) return 0;
186202
$count = 0;
187-
if($tmpHandle = opendir($dirName)){
203+
if($tmpHandle = opendir($dirNode->getUrl())){
188204
// WILL USE IMAP FUNCTIONS TO COUNT;
189205
$this->logDebug("COUNT : ".ImapAccessWrapper::getCurrentDirCount());
190206
$count = ImapAccessWrapper::getCurrentDirCount();

core/src/plugins/access.smb/SMBAccessDriver.php

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,11 @@
2222
namespace Pydio\Access\Driver\StreamProvider\SMB;
2323

2424
use DOMNode;
25-
26-
25+
use Pydio\Access\Core\Model\AJXP_Node;
2726
use Pydio\Access\Core\RecycleBinManager;
2827
use Pydio\Access\Core\Model\Repository;
2928
use Pydio\Access\Driver\StreamProvider\FS\FsAccessDriver;
30-
3129
use Pydio\Core\Model\ContextInterface;
32-
3330
use Pydio\Core\Exception\PydioException;
3431

3532

@@ -113,12 +110,12 @@ protected function parseSpecificContributions(ContextInterface $ctx, \DOMNode &$
113110
}
114111

115112
/**
116-
* @param \Pydio\Access\Core\Model\AJXP_Node $dir
117-
* @param string $type
113+
* @param AJXP_Node $node
118114
* @return bool
119115
*/
120-
public function isWriteable($dir, $type="dir")
116+
public function isWriteable(AJXP_Node $node)
121117
{
118+
$dir = $node->getPath();
122119
if(substr_count($dir, '/') <= 3) $rc = true;
123120
else $rc = is_writable($dir);
124121
return $rc;

core/src/plugins/access.swift/SwiftAccessDriver.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,10 @@ protected function parseSpecificContributions(ContextInterface $ctx, \DOMNode &$
103103
}
104104

105105
/**
106-
* @param AJXP_Node $dir
107-
* @param string $type
106+
* @param AJXP_Node $node
108107
* @return bool
109108
*/
110-
public function isWriteable($dir, $type="dir")
109+
public function isWriteable(AJXP_Node $node)
111110
{
112111
return true;
113112
}

core/src/plugins/auth.custom_db/CustomDbAuthDriver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public function listUsersPaginated($baseGroup, $regexp, $offset, $limit, $recurs
144144
* @param int $offset
145145
* @return int
146146
*/
147-
public function findUserPage($baseGroup, $userLogin, $usersPerPage, $offset)
147+
public function findUserPage($baseGroup, $userLogin, $usersPerPage, $offset = 0)
148148
{
149149
$this->connect();
150150
$res = dibi::query("SELECT COUNT(*) FROM [" . $this->customTableName . "] WHERE [" . $this->customTableUid . "] <= %s", $userLogin);

0 commit comments

Comments
 (0)