upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-10 17:23:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 57

Merge pull request #11316 from nextcloud/container-queryexception-only

Browse source 
only catch QueryException when trying to build class
This commit is contained in:
Roeland Jago Douma 2018-09-25 16:21:55 +02:00 committed by GitHub
commit b8418b502d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/private/AppFramework/Utility/SimpleContainer.php
View file

@ -66,13 +66,7 @@ class SimpleContainer extends Container implements IContainer {
try {
$parameters[] = $this->query($resolveName);
} catch (\Exception $e) {
if (class_exists('PHPUnit_Framework_AssertionFailedError', false) &&
$e instanceof \PHPUnit_Framework_AssertionFailedError) {
// Easier debugging of "Your test case is not allowed to access the database."
throw $e;
}
} catch (QueryException $e) {
// Service not found, use the default value when available
if ($parameter->isDefaultValueAvailable()) {
$parameters[] = $parameter->getDefaultValue();