Upgrade framework
This commit is contained in:
@@ -1,42 +1,47 @@
|
||||
<?php
|
||||
<?php declare(strict_types=1);
|
||||
/*
|
||||
* This file is part of the Comparator package.
|
||||
* This file is part of sebastian/comparator.
|
||||
*
|
||||
* (c) Sebastian Bergmann <sebastian@phpunit.de>
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace SebastianBergmann\Comparator;
|
||||
|
||||
use RuntimeException;
|
||||
use SebastianBergmann\Diff\Differ;
|
||||
use SebastianBergmann\Diff\Output\UnifiedDiffOutputBuilder;
|
||||
|
||||
/**
|
||||
* Thrown when an assertion for string equality failed.
|
||||
*/
|
||||
class ComparisonFailure extends \RuntimeException
|
||||
class ComparisonFailure extends RuntimeException
|
||||
{
|
||||
/**
|
||||
* Expected value of the retrieval which does not match $actual.
|
||||
*
|
||||
* @var mixed
|
||||
*/
|
||||
protected $expected;
|
||||
|
||||
/**
|
||||
* Actually retrieved value which does not match $expected.
|
||||
*
|
||||
* @var mixed
|
||||
*/
|
||||
protected $actual;
|
||||
|
||||
/**
|
||||
* The string representation of the expected value
|
||||
* The string representation of the expected value.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $expectedAsString;
|
||||
|
||||
/**
|
||||
* The string representation of the actual value
|
||||
* The string representation of the actual value.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $actualAsString;
|
||||
@@ -49,6 +54,7 @@ class ComparisonFailure extends \RuntimeException
|
||||
/**
|
||||
* Optional message which is placed in front of the first line
|
||||
* returned by toString().
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $message;
|
||||
@@ -56,13 +62,13 @@ class ComparisonFailure extends \RuntimeException
|
||||
/**
|
||||
* Initialises with the expected value and the actual value.
|
||||
*
|
||||
* @param mixed $expected Expected value retrieved.
|
||||
* @param mixed $actual Actual value retrieved.
|
||||
* @param mixed $expected expected value retrieved
|
||||
* @param mixed $actual actual value retrieved
|
||||
* @param string $expectedAsString
|
||||
* @param string $actualAsString
|
||||
* @param bool $identical
|
||||
* @param string $message A string which is prefixed on all returned lines
|
||||
* in the difference output.
|
||||
* @param string $message a string which is prefixed on all returned lines
|
||||
* in the difference output
|
||||
*/
|
||||
public function __construct($expected, $actual, $expectedAsString, $actualAsString, $identical = false, $message = '')
|
||||
{
|
||||
@@ -73,17 +79,11 @@ class ComparisonFailure extends \RuntimeException
|
||||
$this->message = $message;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return mixed
|
||||
*/
|
||||
public function getActual()
|
||||
{
|
||||
return $this->actual;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return mixed
|
||||
*/
|
||||
public function getExpected()
|
||||
{
|
||||
return $this->expected;
|
||||
@@ -114,7 +114,7 @@ class ComparisonFailure extends \RuntimeException
|
||||
return '';
|
||||
}
|
||||
|
||||
$differ = new Differ("\n--- Expected\n+++ Actual\n");
|
||||
$differ = new Differ(new UnifiedDiffOutputBuilder("\n--- Expected\n+++ Actual\n"));
|
||||
|
||||
return $differ->diff($this->expectedAsString, $this->actualAsString);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user