From dccbdc8c012a2909fc71e9a23b70fe87e4f97f2b Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 21 Sep 2018 18:32:15 +0200 Subject: only catch QueryException when trying to build class Signed-off-by: Robin Appelman --- lib/private/AppFramework/Utility/SimpleContainer.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'lib/private') diff --git a/lib/private/AppFramework/Utility/SimpleContainer.php b/lib/private/AppFramework/Utility/SimpleContainer.php index e96f24ed284..47a6f95f747 100644 --- a/lib/private/AppFramework/Utility/SimpleContainer.php +++ b/lib/private/AppFramework/Utility/SimpleContainer.php @@ -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(); -- cgit v1.2.3