phpdoc, strict and type hints
This commit is contained in:
parent
6f47a547d8
commit
8926bca0c7
|
@ -430,6 +430,12 @@ class Filesystem {
|
||||||
\OC_Hook::emit('OC_Filesystem', 'post_initMountPoints', array('user' => $user, 'user_dir' => $root));
|
\OC_Hook::emit('OC_Filesystem', 'post_initMountPoints', array('user' => $user, 'user_dir' => $root));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get mounts from mount providers that are registered after setup
|
||||||
|
*
|
||||||
|
* @param MountProviderCollection $mountConfigManager
|
||||||
|
* @param IUserManager $userManager
|
||||||
|
*/
|
||||||
private static function listenForNewMountProviders(MountProviderCollection $mountConfigManager, IUserManager $userManager) {
|
private static function listenForNewMountProviders(MountProviderCollection $mountConfigManager, IUserManager $userManager) {
|
||||||
if (!self::$listeningForProviders) {
|
if (!self::$listeningForProviders) {
|
||||||
self::$listeningForProviders = true;
|
self::$listeningForProviders = true;
|
||||||
|
|
|
@ -34,12 +34,12 @@ trait EmitterTrait {
|
||||||
* @param string $method
|
* @param string $method
|
||||||
* @param callable $callback
|
* @param callable $callback
|
||||||
*/
|
*/
|
||||||
public function listen($scope, $method, $callback) {
|
public function listen($scope, $method, callable $callback) {
|
||||||
$eventName = $scope . '::' . $method;
|
$eventName = $scope . '::' . $method;
|
||||||
if (!isset($this->listeners[$eventName])) {
|
if (!isset($this->listeners[$eventName])) {
|
||||||
$this->listeners[$eventName] = array();
|
$this->listeners[$eventName] = array();
|
||||||
}
|
}
|
||||||
if (array_search($callback, $this->listeners[$eventName]) === false) {
|
if (array_search($callback, $this->listeners[$eventName], true) === false) {
|
||||||
$this->listeners[$eventName][] = $callback;
|
$this->listeners[$eventName][] = $callback;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -49,7 +49,7 @@ trait EmitterTrait {
|
||||||
* @param string $method optional
|
* @param string $method optional
|
||||||
* @param callable $callback optional
|
* @param callable $callback optional
|
||||||
*/
|
*/
|
||||||
public function removeListener($scope = null, $method = null, $callback = null) {
|
public function removeListener($scope = null, $method = null, callable $callback = null) {
|
||||||
$names = array();
|
$names = array();
|
||||||
$allNames = array_keys($this->listeners);
|
$allNames = array_keys($this->listeners);
|
||||||
if ($scope and $method) {
|
if ($scope and $method) {
|
||||||
|
@ -77,7 +77,7 @@ trait EmitterTrait {
|
||||||
|
|
||||||
foreach ($names as $name) {
|
foreach ($names as $name) {
|
||||||
if ($callback) {
|
if ($callback) {
|
||||||
$index = array_search($callback, $this->listeners[$name]);
|
$index = array_search($callback, $this->listeners[$name], true);
|
||||||
if ($index !== false) {
|
if ($index !== false) {
|
||||||
unset($this->listeners[$name][$index]);
|
unset($this->listeners[$name][$index]);
|
||||||
}
|
}
|
||||||
|
@ -92,7 +92,7 @@ trait EmitterTrait {
|
||||||
* @param string $method
|
* @param string $method
|
||||||
* @param array $arguments optional
|
* @param array $arguments optional
|
||||||
*/
|
*/
|
||||||
protected function emit($scope, $method, $arguments = array()) {
|
protected function emit($scope, $method, array $arguments = array()) {
|
||||||
$eventName = $scope . '::' . $method;
|
$eventName = $scope . '::' . $method;
|
||||||
if (isset($this->listeners[$eventName])) {
|
if (isset($this->listeners[$eventName])) {
|
||||||
foreach ($this->listeners[$eventName] as $callback) {
|
foreach ($this->listeners[$eventName] as $callback) {
|
||||||
|
|
|
@ -39,6 +39,13 @@ class DummyMountProvider implements IMountProvider {
|
||||||
$this->mounts = $mounts;
|
$this->mounts = $mounts;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the pre-registered mount points
|
||||||
|
*
|
||||||
|
* @param IUser $user
|
||||||
|
* @param IStorageFactory $loader
|
||||||
|
* @return \OCP\Files\Mount\IMountPoint[]
|
||||||
|
*/
|
||||||
public function getMountsForUser(IUser $user, IStorageFactory $loader) {
|
public function getMountsForUser(IUser $user, IStorageFactory $loader) {
|
||||||
return isset($this->mounts[$user->getUID()]) ? $this->mounts[$user->getUID()] : [];
|
return isset($this->mounts[$user->getUID()]) ? $this->mounts[$user->getUID()] : [];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue