adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #11017 from peloncano/2.x

Browse source 
PHPUnit_Util_Diff class not found fix
This commit is contained in:
Mark Story 2017-08-08 21:34:32 -04:00 committed by GitHub
commit dca1289eef
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/Cake/TestSuite/Reporter/CakeHtmlReporter.php
View file

@ -265,7 +265,16 @@ class CakeHtmlReporter extends CakeBaseReporter {
echo "<div class='msg'><pre>" . $this->_htmlEntities($message->toString());
if ((is_string($actualMsg) && is_string($expectedMsg)) || (is_array($actualMsg) && is_array($expectedMsg))) {
echo "<br />" . $this->_htmlEntities(PHPUnit_Util_Diff::diff($expectedMsg, $actualMsg));
$diffs = "";
if (class_exists('PHPUnit_Util_Diff')) {
$diffs = PHPUnit_Util_Diff::diff($expectedMsg, $actualMsg);
} elseif (class_exists('SebastianBergmann\Diff\Differ')) {
$differ = new SebastianBergmann\Diff\Differ();
$diffs = $differ->diff($expectedMsg, $actualMsg);
}
echo "<br />" . $this->_htmlEntities($diffs);
}
echo "</pre></div>\n";