diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor #32905 [PhpUnitBridge] cleanup implementation of expectException*() (nicolas-grekas)

Browse Source 
This PR was merged into the 4.4 branch.

Discussion
----------

[PhpUnitBridge] cleanup implementation of expectException*()

| Q             | A
| ------------- | ---
| Branch?       | 4.4
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Commits
-------

d56bc3bc18 [PhpUnitBridge] cleanup implementation of expectException*()
This commit is contained in:
Nicolas Grekas 2019-08-03 16:35:01 +02:00
commit 42a4de07ce
1 changed files with 18 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/Symfony/Bridge/PhpUnit/Legacy/ForwardCompatTestTraitForV5.php
View File

@ -19,9 +19,6 @@ use PHPUnit\Framework\TestCase;
*/
trait ForwardCompatTestTraitForV5
{
private $forwardCompatExpectedExceptionMessage = '';
private $forwardCompatExpectedExceptionCode = null;
/**
* @return void
*/
@ -243,11 +240,12 @@ trait ForwardCompatTestTraitForV5
*/
public static function assertFinite($actual, $message = '')
{
if (\is_callable('parent::assertFinite')) {
if (method_exists(TestCase::class, 'assertFinite')) {
parent::assertFinite($actual, $message);
return;
}
static::assertInternalType('float', $actual, $message);
static::assertTrue(is_finite($actual), $message ? $message : "Failed asserting that $actual is finite.");
}
@ -259,11 +257,12 @@ trait ForwardCompatTestTraitForV5
*/
public static function assertInfinite($actual, $message = '')
{
if (\is_callable('parent::assertInfinite')) {
if (method_exists(TestCase::class, 'assertInfinite')) {
parent::assertInfinite($actual, $message);
return;
}
static::assertInternalType('float', $actual, $message);
static::assertTrue(is_infinite($actual), $message ? $message : "Failed asserting that $actual is infinite.");
}
@ -275,11 +274,12 @@ trait ForwardCompatTestTraitForV5
*/
public static function assertNan($actual, $message = '')
{
if (\is_callable('parent::assertNan')) {
if (method_exists(TestCase::class, 'assertNan')) {
parent::assertNan($actual, $message);
return;
}
static::assertInternalType('float', $actual, $message);
static::assertTrue(is_nan($actual), $message ? $message : "Failed asserting that $actual is nan.");
}
@ -297,7 +297,9 @@ trait ForwardCompatTestTraitForV5
return;
}
parent::setExpectedException($exception, $this->forwardCompatExpectedExceptionMessage, $this->forwardCompatExpectedExceptionCode);
$property = new \ReflectionProperty(class_exists('PHPUnit_Framework_TestCase') ? 'PHPUnit_Framework_TestCase' : TestCase::class, 'expectedException');
$property->setAccessible(true);
$property->setValue($this, $exception);
}
/**
@ -311,8 +313,9 @@ trait ForwardCompatTestTraitForV5
return;
}
$this->forwardCompatExpectedExceptionCode = $code;
parent::setExpectedException(parent::getExpectedException(), $this->forwardCompatExpectedExceptionMessage, $this->forwardCompatExpectedExceptionCode);
$property = new \ReflectionProperty(class_exists('PHPUnit_Framework_TestCase') ? 'PHPUnit_Framework_TestCase' : TestCase::class, 'expectedExceptionCode');
$property->setAccessible(true);
$property->setValue($this, $exception);
}
/**
@ -328,8 +331,9 @@ trait ForwardCompatTestTraitForV5
return;
}
$this->forwardCompatExpectedExceptionMessage = $message;
parent::setExpectedException(parent::getExpectedException(), $this->forwardCompatExpectedExceptionMessage, $this->forwardCompatExpectedExceptionCode);
$property = new \ReflectionProperty(class_exists('PHPUnit_Framework_TestCase') ? 'PHPUnit_Framework_TestCase' : TestCase::class, 'expectedExceptionMessage');
$property->setAccessible(true);
$property->setValue($this, $exception);
}
/**
@ -345,31 +349,8 @@ trait ForwardCompatTestTraitForV5
return;
}
parent::setExpectedExceptionRegExp(parent::getExpectedException(), $messageRegExp, $this->forwardCompatExpectedExceptionCode);
}
/**
* @param string $exceptionMessage
*
* @return void
*/
public function setExpectedException($exceptionName, $exceptionMessage = '', $exceptionCode = null)
{
$this->forwardCompatExpectedExceptionMessage = $exceptionMessage;
$this->forwardCompatExpectedExceptionCode = $exceptionCode;
parent::setExpectedException($exceptionName, $exceptionMessage, $exceptionCode);
}
/**
* @param string $exceptionMessageRegExp
*
* @return void
*/
public function setExpectedExceptionRegExp($exceptionName, $exceptionMessageRegExp = '', $exceptionCode = null)
{
$this->forwardCompatExpectedExceptionCode = $exceptionCode;
parent::setExpectedExceptionRegExp($exceptionName, $exceptionMessageRegExp, $exceptionCode);
$property = new \ReflectionProperty(class_exists('PHPUnit_Framework_TestCase') ? 'PHPUnit_Framework_TestCase' : TestCase::class, 'expectedExceptionMessageRegExp');
$property->setAccessible(true);
$property->setValue($this, $exception);
}
}