Browse Source
Fix type errors detected by Psalm
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
pull/23377/head
Christoph Wurst
6 years ago
No known key found for this signature in database
GPG Key ID: CC42AC2A7F0E56D8
4 changed files with
11 additions and
5 deletions
-
apps/workflowengine/lib/Manager.php
-
lib/base.php
-
lib/private/AppFramework/App.php
-
lib/private/Collaboration/Collaborators/Search.php
|
|
|
@ -695,7 +695,7 @@ class Manager implements IManager { |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @return IEntity[] |
|
|
|
* @return ICheck[] |
|
|
|
*/ |
|
|
|
protected function getBuildInChecks(): array { |
|
|
|
try { |
|
|
|
|
|
|
|
@ -859,6 +859,7 @@ class OC { |
|
|
|
} |
|
|
|
|
|
|
|
private static function registerAppRestrictionsHooks() { |
|
|
|
/** @var \OC\Group\Manager $groupManager */ |
|
|
|
$groupManager = self::$server->query(\OCP\IGroupManager::class); |
|
|
|
$groupManager->listen('\OC\Group', 'postDelete', function (\OCP\IGroup $group) { |
|
|
|
$appManager = self::$server->getAppManager(); |
|
|
|
|
|
|
|
@ -34,6 +34,7 @@ namespace OC\AppFramework; |
|
|
|
|
|
|
|
use OC\AppFramework\DependencyInjection\DIContainer; |
|
|
|
use OC\AppFramework\Http\Dispatcher; |
|
|
|
use OC\AppFramework\Http\Request; |
|
|
|
use OC\HintException; |
|
|
|
use OCP\AppFramework\Http; |
|
|
|
use OCP\AppFramework\Http\ICallbackResponse; |
|
|
|
@ -114,9 +115,13 @@ class App { |
|
|
|
*/ |
|
|
|
public static function main(string $controllerName, string $methodName, DIContainer $container, array $urlParams = null) { |
|
|
|
if (!is_null($urlParams)) { |
|
|
|
$container->query(IRequest::class)->setUrlParameters($urlParams); |
|
|
|
/** @var Request $request */ |
|
|
|
$request = $container->query(IRequest::class); |
|
|
|
$request->setUrlParameters($urlParams); |
|
|
|
} elseif (isset($container['urlParams']) && !is_null($container['urlParams'])) { |
|
|
|
$container->query(IRequest::class)->setUrlParameters($container['urlParams']); |
|
|
|
/** @var Request $request */ |
|
|
|
$request = $container->query(IRequest::class); |
|
|
|
$request->setUrlParameters($container['urlParams']); |
|
|
|
} |
|
|
|
$appName = $container['AppName']; |
|
|
|
|
|
|
|
|
|
|
|
@ -68,14 +68,14 @@ class Search implements ISearch { |
|
|
|
foreach ($this->pluginList[$type] as $plugin) { |
|
|
|
/** @var ISearchPlugin $searchPlugin */ |
|
|
|
$searchPlugin = $this->c->resolve($plugin); |
|
|
|
$hasMoreResults |= $searchPlugin->search($search, $limit, $offset, $searchResult); |
|
|
|
$hasMoreResults = $searchPlugin->search($search, $limit, $offset, $searchResult) || $hasMoreResults; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
// Get from lookup server, not a separate share type
|
|
|
|
if ($lookup) { |
|
|
|
$searchPlugin = $this->c->resolve(LookupPlugin::class); |
|
|
|
$hasMoreResults |= $searchPlugin->search($search, $limit, $offset, $searchResult); |
|
|
|
$hasMoreResults = $searchPlugin->search($search, $limit, $offset, $searchResult) || $hasMoreResults; |
|
|
|
} |
|
|
|
|
|
|
|
// sanitizing, could go into the plugins as well
|
|
|
|
|