Better debugging for "Your test case is not allowed to access the database."

Signed-off-by: Joas Schilling <coding@schilljs.com>

1 files changed, 6 insertions, 0 deletions

diff --git a/lib/private/AppFramework/Utility/SimpleContainer.php b/lib/private/AppFramework/Utility/SimpleContainer.php
index b86d3339264..97cb772e3bb 100644
--- a/lib/private/AppFramework/Utility/SimpleContainer.php
+++ b/lib/private/AppFramework/Utility/SimpleContainer.php
@@ -66,6 +66,12 @@ class SimpleContainer extends Container implements IContainer {
 				try {
 					$parameters[] = $this->query($resolveName);
 				} catch (\Exception $e) {
+					if (class_exists("PHPUnit_Framework_AssertionFailedError") &&
+						$e instanceof \PHPUnit_Framework_AssertionFailedError) {
+						// Easier debugging of "Your test case is not allowed to access the database."
+						throw $e;
+					}
+
 					// Service not found, use the default value when available
 					if ($parameter->isDefaultValueAvailable()) {
 						$parameters[] = $parameter->getDefaultValue();