Merge pull request #134 from dg/pull-line

Dumper::dumpException() writes line of source code
nette · Feb 7, 2016 · a887016 · a887016
2 parents f0bd641 + 5b4abde
commit a887016
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/Framework/Dumper.php b/src/Framework/Dumper.php
@@ -321,8 +321,10 @@ public static function dumpException($e)
 					)
 					: '[internal function]'
 				)
-				. $item['class'] . $item['type']
-				. (isset($item['function']) ? $item['function'] . '()' : '')
+				. ($item['class'] === 'Tester\Assert' && ($tmp = file($item['file'])) && strpos($tmp[$item['line'] - 1], "::$item[function](")
+					? trim($tmp[$item['line'] - 1])
+					: $item['class'] . $item['type'] . $item['function'] . ($item['function'] ? '()' : '')
+				)
 				. self::color() . "\n";
 		}
 

diff --git a/tests/RunnerOutput/JUnitPrinter.phpt b/tests/RunnerOutput/JUnitPrinter.phpt
@@ -31,7 +31,7 @@ $expected = <<<XML
 		<testcase classname="RunnerOutput%ds%cases%ds%fail.phptx" name="RunnerOutput%ds%cases%ds%fail.phptx">
 			<failure message="Failed: STOP
 
-in RunnerOutput%ds%cases%ds%fail.phptx(4) Tester\\Assert::fail()"/>
+in RunnerOutput%ds%cases%ds%fail.phptx(4) Tester\\Assert::fail('STOP');"/>
 		</testcase>
 		<testcase classname="RunnerOutput%ds%cases%ds%pass.phptx" name="RunnerOutput%ds%cases%ds%pass.phptx"/>
 		<testcase classname="RunnerOutput%ds%cases%ds%skip.phptx" name="RunnerOutput%ds%cases%ds%skip.phptx">