public-mirrors/composer
1
0
Fork 0
mirror of https://github.com/composer/composer synced 2025-05-09 00:22:53 +00:00
Code Activity

Remove setExpectedException wrapper

Browse source
This commit is contained in:
Jordi Boggiano 2021-12-09 20:55:26 +01:00
parent 32dcb93f24
commit 6ed3aeb343
No known key found for this signature in database
GPG key ID: 7BBD42C429EC80BC
44 changed files with 98 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tests/Composer/Test/Util/ErrorHandlerTest.php
View file

@ -37,9 +37,11 @@ class ErrorHandlerTest extends TestCase
public function testErrorHandlerCaptureNotice()
{
if (PHP_VERSION_ID >= 80000) {
$this->setExpectedException('\ErrorException', 'Undefined array key "baz"');
self::expectException('\ErrorException');
self::expectExceptionMessage('Undefined array key "baz"');
} else {
$this->setExpectedException('\ErrorException', 'Undefined index: baz');
self::expectException('\ErrorException');
self::expectExceptionMessage('Undefined index: baz');
}
$array = array('foo' => 'bar');
@ -53,9 +55,11 @@ class ErrorHandlerTest extends TestCase
public function testErrorHandlerCaptureWarning()
{
if (PHP_VERSION_ID >= 80000) {
$this->setExpectedException('TypeError', 'array_merge');
self::expectException('TypeError');
self::expectExceptionMessage('array_merge');
} else {
$this->setExpectedException('ErrorException', 'array_merge');
self::expectException('ErrorException');
self::expectExceptionMessage('array_merge');
}
// @phpstan-ignore-next-line