8000 fix merge · symfony/symfony@8103b30 · GitHub
[go: up one dir, main page]

Skip to content

Commit 8103b30

Browse files
fix merge
1 parent 50505cb commit 8103b30

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/Symfony/Component/ErrorHandler/Tests/Exception/FlattenExceptionTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,9 @@ public function testPreviousError()
175175

176176
$flattened = FlattenException::createFromThrowable($exception)->getPrevious();
177177

178-
$this->assertEquals($flattened->getMessage(), 'Oh noes!', 'The message is copied from the original exception.');
179-
$this->assertEquals($flattened->getCode(), 42, 'The code is copied from the original exception.');
180-
$this->assertEquals($flattened->getClass(), 'ParseError', 'The class is set to the class of the original exception');
178+
$this->assertEquals('Oh noes!', $flattened->getMessage(), 'The message is copied from the original exception.');
179+
$this->assertEquals(42, $flattened->getCode(), 'The code is copied from the original exception.');
180+
$this->assertEquals('ParseError', $flattened->getClass(), 'The class is set to the class of the original exception');
181181
}
182182

183183
/**
@@ -303,7 +303,7 @@ function () {},
303303
$this->assertSame(['resource', 'stream'], $array[$i++]);
304304

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

309309
$this->assertSame(['array', [['integer', 1], ['integer', 2]]], $array[$i++]);
@@ -318,8 +318,8 @@ function () {},
318318
$this->assertSame(['float', INF], $array[$i++]);
319319

320320
// assertEquals() does not like NAN values.
321-
$this->assertEquals($array[$i][0], 'float');
322-
$this->assertNan($array[$i++][1]);
321+
$this->assertEquals('float', $array[$i][0]);
322+
$this->assertNan($array[$i][1]);
323323
}
324324

325325
public function testRecursionInArguments()
@@ -358,7 +358,7 @@ public function testTooBigArray()
358358
$flattened = FlattenException::createFromThrowable($exception);
359359
$trace = $flattened->getTrace();
360360

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

363363
$serializeTrace = serialize($trace);
364364

0 commit comments

Comments
 (0)
0