Aktualizace na novější PHPUnit

HttpPHPUnit/Main/Main.php

@@ -47,14 +47,18 @@ class Main extends Object
 
 	/**
 	 * @param string path to PHPUnit
+	 * @param bool $loadPHPUnit
 	 * @throws DirectoryNotFoundException
 	 */
-	public function __construct($phpUnitDir = NULL)
+	public function __construct($phpUnitDir = NULL, $loadPHPUnit = true)
 	{
-		if (!$phpUnitDir) $phpUnitDir = __DIR__ . '/../../PHPUnit';
-		if (!is_dir($phpUnitDir)) throw new DirectoryNotFoundException($phpUnitDir);
-		set_include_path($phpUnitDir);
-		require_once 'PHPUnit/Autoload.php';
+		if ($loadPHPUnit)
+		{
+			if (!$phpUnitDir) $phpUnitDir = __DIR__ . '/../../PHPUnit';
+			if (!is_dir($phpUnitDir)) throw new DirectoryNotFoundException($phpUnitDir);
+			set_include_path($phpUnitDir);
+			require_once 'PHPUnit/Autoload.php';
+		}
 		require_once __DIR__ . '/Command.php';
 		require_once __DIR__ . '/TemplateFactory.php';
 		require_once __DIR__ . '/../ResultPrinter/ResultPrinter.php';
@@ -131,20 +135,21 @@ public function run($dir, $arg = '--no-globals-backup --strict')
 	 * @param string app dir
 	 * @param string report dir
 	 * @throws DirectoryNotFoundException
-	 * @return PHP_CodeCoverage
+	 * @return PHP_CodeCoverage|NULL
 	 */
 	public function coverage($appDir, $coverageDir)
 	{
-		require_once 'PHP/CodeCoverage.php';
-		$coverage = PHP_CodeCoverage::getInstance();
-		if (!$this->run OR $this->testDir OR !extension_loaded('xdebug'))
+		if (!extension_loaded('xdebug'))
+		{
+			$this->onAfter['coverage'] = function () {
+				echo 'Coverage: The Xdebug extension is not loaded.';
+			};
+			return;
+		}
+		$coverage = new PHP_CodeCoverage;
+		$coverage->setProcessUncoveredFilesFromWhitelist(true);
+		if (!$this->run OR $this->testDir)
 		{
-			if (!extension_loaded('xdebug'))
-			{
-				$this->onAfter['coverage'] = function () {
-					echo 'Coverage: The Xdebug extension is not loaded.';
-				};
-			}
 			return $coverage;
 		}
 		@mkdir ($coverageDir);

HttpPHPUnit/Main/TemplateFactory.php

@@ -10,6 +10,12 @@
  */
 class TemplateFactory extends Control
 {
+
+	public function templatePrepareFilters($template)
+	{
+		$template->registerFilter(new \Nette\Latte\Engine);
+	}
+
 	public static function create($file)
 	{
 		$control = new self;

HttpPHPUnit/ResultPrinter/ResultPrinter.php

@@ -117,6 +117,10 @@ protected function renderError(PHPUnit_Framework_Test $test, Exception $e, $stat
 		$this->write('</h3>');
 
 		$message = $e->getMessage();
+		if ($e instanceof \PHPUnit_Framework_ExpectationFailedException && $comparison = $e->getComparisonFailure())
+		{
+			$message .= "\n \n" . $comparison->toString();
+		}
 		if (!$message) $message = '(no message)';
 		if ($state === self::ERROR) $message = get_class($e) . ': ' . $message;
 		if (strlen($message) > 400 OR substr_count($message, "\n") > 4)

HttpPHPUnit/StructureRenderer/StructureRenderer.php

@@ -110,4 +110,9 @@ private function loadMethod($path)
 		return $result;
 	}
 
+	public function templatePrepareFilters($template)
+	{
+		$template->registerFilter(new \Nette\Latte\Engine);
+	}
+
 }