Skip to content

Commit d01fba9

Browse files
Merge branch '4.4' into 5.0
* 4.4: fix merge Require PHPUnit 9.3 on PHP 8 [Cache] fix catching auth errors Fix CS [FrameworkBundle] set default session.handler alias if handler_id is not provided Fix CS Readability update Fix checks for phpunit releases on Composer 2 (resolves #37601) [Serializer] Support multiple levels of discriminator mapping Use hexadecimal numerals instead of hexadecimals in strings to represent error codes. [SCA] Minor fixes on tests [WebProfilerBundle] modified url generation to use absolute urls [Mailer] Fix reply-to functionality in the SendgridApiTransport [Mime] Fix compat with HTTP requests ticket_36879 - Fix mandrill raw http request setting from email/name
2 parents afa480e + 66f1513 commit d01fba9

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Tests/Exception/FlattenExceptionTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,9 @@ public function testPreviousError()
161161

162162
$flattened = FlattenException::createFromThrowable($exception)->getPrevious();
163163

164-
$this->assertEquals($flattened->getMessage(), 'Oh noes!', 'The message is copied from the original exception.');
165-
$this->assertEquals($flattened->getCode(), 42, 'The code is copied from the original exception.');
166-
$this->assertEquals($flattened->getClass(), 'ParseError', 'The class is set to the class of the original exception');
164+
$this->assertEquals('Oh noes!', $flattened->getMessage(), 'The message is copied from the original exception.');
165+
$this->assertEquals(42, $flattened->getCode(), 'The code is copied from the original exception.');
166+
$this->assertEquals('ParseError', $flattened->getClass(), 'The class is set to the class of the original exception');
167167
}
168168

169169
/**
@@ -289,7 +289,7 @@ function () {},
289289
$this->assertSame(['resource', 'stream'], $array[$i++]);
290290

291291
$args = $array[$i++];
292-
$this->assertSame($args[0], 'object');
292+
$this->assertSame('object', $args[0]);
293293
$this->assertTrue('Closure' === $args[1] || is_subclass_of($args[1], '\Closure'), 'Expect object class name to be Closure or a subclass of Closure.');
294294

295295
$this->assertSame(['array', [['integer', 1], ['integer', 2]]], $array[$i++]);
@@ -304,7 +304,7 @@ function () {},
304304
$this->assertSame(['float', INF], $array[$i++]);
305305

306306
// assertEquals() does not like NAN values.
307-
$this->assertEquals($array[$i][0], 'float');
307+
$this->assertEquals('float', $array[$i][0]);
308308
$this->assertNan($array[$i][1]);
309309
}
310310

@@ -344,7 +344,7 @@ public function testTooBigArray()
344344
$flattened = FlattenException::createFromThrowable($exception);
345345
$trace = $flattened->getTrace();
346346

347-
$this->assertSame($trace[1]['args'][0], ['array', ['array', '*SKIPPED over 10000 entries*']]);
347+
$this->assertSame(['array', ['array', '*SKIPPED over 10000 entries*']], $trace[1]['args'][0]);
348348

349349
$serializeTrace = serialize($trace);
350350

0 commit comments

Comments
 (0)