mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

forward query exception when fallback construction fails 

Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2021-02-08 19:14:27 +01:00
parent 3401be216d
commit ec875227ec
No known key found for this signature in database
GPG Key ID: 42B69D8A64526EFB
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/AppFramework/Utility/SimpleContainer.php
View File

@ -97,7 +97,7 @@ class SimpleContainer implements ArrayAccess, ContainerInterface, IContainer {
return $this->query($resolveName); return $this->query($resolveName);
} catch (QueryException $e2) { } catch (QueryException $e2) {
// don't lose the error we got while trying to query by type // don't lose the error we got while trying to query by type
throw new QueryException($e2->getMessage(), $e2->getCode(), $e); throw new QueryException($e2->getMessage(), (int) $e2->getCode(), $e);
} }
} }

6
lib/private/Console/Application.php
View File

@ -221,7 +221,11 @@ class Application {
$c = \OC::$server->query($command); $c = \OC::$server->query($command);
} catch (QueryException $e) { } catch (QueryException $e) {
if (class_exists($command)) { if (class_exists($command)) {
$c = new $command(); try {
$c = new $command();
} catch (\ArgumentCountError $e2) {
throw new \Exception("Failed to construct console command '$command': " . $e->getMessage(), 0, $e);
}
} else { } else {
throw new \Exception("Console command '$command' is unknown and could not be loaded"); throw new \Exception("Console command '$command' is unknown and could not be loaded");
} }