Skip to content

Commit 8ed1b80

Browse files
Merge branch '4.4'
* 4.4: [Bridge/PhpUnit] cleanup fix [PhpUnitBridge] Add polyfill for methods assertNan, assertFinite and assertInfinite [Mailer] fixed wrong error message when connection closes unexpectedly [Mailer] added debug info to TransportExceptionInterface [Mailer] fixed error that is masked by another error [Mailer] fixed the order of authenticators
2 parents 60a698c + 5483eef commit 8ed1b80

File tree

2 files changed

+66
-2
lines changed

2 files changed

+66
-2
lines changed

Legacy/ForwardCompatTestTraitForV5.php

Lines changed: 51 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ private function doTearDown()
8787
}
8888

8989
/**
90-
* @param string $originalClassName
90+
* @param string|string[] $originalClassName
9191
*
9292
* @return MockObject
9393
*/
@@ -106,7 +106,8 @@ protected function createMock($originalClassName)
106106
}
107107

108108
/**
109-
* @param string $originalClassName
109+
* @param string|string[] $originalClassName
110+
* @param string[] $methods
110111
*
111112
* @return MockObject
112113
*/
@@ -235,6 +236,54 @@ public static function assertIsIterable($actual, $message = '')
235236
static::assertInternalType('iterable', $actual, $message);
236237
}
237238

239+
/**
240+
* @param string $message
241+
*
242+
* @return void
243+
*/
244+
public static function assertFinite($actual, $message = '')
245+
{
246+
if (\is_callable('parent::assertFinite')) {
247+
parent::assertFinite($actual, $message);
248+
249+
return;
250+
}
251+
static::assertInternalType('float', $actual, $message);
252+
static::assertTrue(is_finite($actual), $message ? $message : "Failed asserting that $actual is finite.");
253+
}
254+
255+
/**
256+
* @param string $message
257+
*
258+
* @return void
259+
*/
260+
public static function assertInfinite($actual, $message = '')
261+
{
262+
if (\is_callable('parent::assertInfinite')) {
263+
parent::assertInfinite($actual, $message);
264+
265+
return;
266+
}
267+
static::assertInternalType('float', $actual, $message);
268+
static::assertTrue(is_infinite($actual), $message ? $message : "Failed asserting that $actual is infinite.");
269+
}
270+
271+
/**
272+
* @param string $message
273+
*
274+
* @return void
275+
*/
276+
public static function assertNan($actual, $message = '')
277+
{
278+
if (\is_callable('parent::assertNan')) {
279+
parent::assertNan($actual, $message);
280+
281+
return;
282+
}
283+
static::assertInternalType('float', $actual, $message);
284+
static::assertTrue(is_nan($actual), $message ? $message : "Failed asserting that $actual is nan.");
285+
}
286+
238287
/**
239288
* @param string $exception
240289
*

Legacy/ForwardCompatTestTraitForV7.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,19 @@ protected function createMock($originalClassName): MockObject
3232
->disallowMockingUnknownTypes()
3333
->getMock();
3434
}
35+
36+
/**
37+
* @param string|string[] $originalClassName
38+
* @param string[] $methods
39+
*/
40+
protected function createPartialMock($originalClassName, array $methods): MockObject
41+
{
42+
return $this->getMockBuilder($originalClassName)
43+
->disableOriginalConstructor()
44+
->disableOriginalClone()
45+
->disableArgumentCloning()
46+
->disallowMockingUnknownTypes()
47+
->setMethods(empty($methods) ? null : $methods)
48+
->getMock();
49+
}
3550
}

0 commit comments

Comments
 (0)