Dumper::dumpException() added option to change output file name via AssertException::$outputName

Author: dg

src/Framework/Assert.php

@@ -481,23 +481,29 @@ public static function matchFile(string $file, $actual, string $description = nu
 			throw new \Exception("Unable to read file '$file'.");
 
 		} elseif (!is_scalar($actual)) {
-			self::fail(self::describe('%1 should match %2', $description), $actual, $pattern);
+			self::fail(self::describe('%1 should match %2', $description), $actual, $pattern, null, basename($file));
 
 		} elseif (!self::isMatching($pattern, $actual)) {
 			if (self::$expandPatterns) {
 				[$pattern, $actual] = self::expandMatchingPatterns($pattern, $actual);
 			}
-			self::fail(self::describe('%1 should match %2', $description), $actual, $pattern);
+			self::fail(self::describe('%1 should match %2', $description), $actual, $pattern, null, basename($file));
 		}
 	}
 
 
 	/**
 	 * Assertion that fails.
 	 */
-	public static function fail(string $message, $actual = null, $expected = null, \Throwable $previous = null): void
-	{
+	public static function fail(
+		string $message,
+		$actual = null,
+		$expected = null,
+		\Throwable $previous = null,
+		string $outputName = null
+	): void {
 		$e = new AssertException($message, $expected, $actual, $previous);
+		$e->outputName = $outputName;
 		if (self::$onFailure) {
 			(self::$onFailure)($e);
 		} else {

src/Framework/AssertException.php

@@ -21,6 +21,8 @@ class AssertException extends \Exception
 
 	public $expected;
 
+	public $outputName;
+
 
 	public function __construct(string $message, $expected, $actual, \Throwable $previous = null)
 	{

src/Framework/Dumper.php

@@ -305,6 +305,9 @@ public static function dumpException(\Throwable $e): string
 		if ($e instanceof AssertException) {
 			$expected = $e->expected;
 			$actual = $e->actual;
+			$testFile = $e->outputName
+				? dirname($testFile) . '/' . $e->outputName . '.foo'
+				: $testFile;
 
 			if (is_object($expected) || is_array($expected) || (is_string($expected) && strlen($expected) > self::$maxLength)
 				|| is_object($actual) || is_array($actual) || (is_string($actual) && (strlen($actual) > self::$maxLength || preg_match('#[\x00-\x1F]#', $actual)))