Merge pull request #7166 from nextcloud/enhancement/crash-report-context

Pass the exception context to the crash reporter

lib/private/Log.php

@@ -352,7 +352,7 @@ class Log implements ILogger {
 		$msg .= ': ' . json_encode($data);
 		$this->log($level, $msg, $context);
 		if (!is_null($this->crashReporters)) {
-			$this->crashReporters->delegateReport($exception);
+			$this->crashReporters->delegateReport($exception, $context);
 		}
 	}
 

lib/private/Support/CrashReport/Registry.php

@@ -45,10 +45,12 @@ class Registry implements IRegistry {
 	 * Delegate crash reporting to all registered reporters
 	 *
 	 * @param Exception|Throwable $exception
+	 * @param array $context
 	 */
-	public function delegateReport($exception) {
+	public function delegateReport($exception, array $context = []) {
+		/** @var IReporter $reporter */
 		foreach ($this->reporters as $reporter) {
-			$reporter->report($exception);
+			$reporter->report($exception, $context);
 		}
 	}
 

lib/public/Support/CrashReport/IRegistry.php

@@ -43,6 +43,7 @@ interface IRegistry {
 	 *
 	 * @since 13.0.0
 	 * @param Exception|Throwable $exception
+	 * @param array $context
 	 */
-	public function delegateReport($exception);
+	public function delegateReport($exception, array $context = []);
 }

lib/public/Support/CrashReport/IReporter.php

@@ -35,6 +35,7 @@ interface IReporter {
 	 *
 	 * @since 13.0.0
 	 * @param Exception|Throwable $exception
+	 * @param array $context
 	 */
-	public function report($exception);
+	public function report($exception, array $context = []);
 }

tests/lib/LoggerTest.php

@@ -90,7 +90,7 @@ class LoggerTest extends TestCase {
 		$e = new \Exception('test');
 		$this->registry->expects($this->once())
 			->method('delegateReport')
-			->with($e);
+			->with($e, []);
 
 		$this->logger->logException($e);
 
@@ -109,7 +109,7 @@ class LoggerTest extends TestCase {
 		$e = new \Exception('test');
 		$this->registry->expects($this->once())
 			->method('delegateReport')
-			->with($e);
+			->with($e, []);
 
 		$this->logger->logException($e);
 
@@ -128,7 +128,7 @@ class LoggerTest extends TestCase {
 		$e = new \Exception('test');
 		$this->registry->expects($this->once())
 			->method('delegateReport')
-			->with($e);
+			->with($e, []);
 
 		$this->logger->logException($e);
 
@@ -147,7 +147,7 @@ class LoggerTest extends TestCase {
 		$e = new \Exception('test');
 		$this->registry->expects($this->once())
 			->method('delegateReport')
-			->with($e);
+			->with($e, []);
 
 		$this->logger->logException($e);