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/ZipTest.php
View file

@ -26,7 +26,8 @@ class ZipTest extends TestCase
$this->markTestSkipped('The PHP zip extension is loaded.');
}
$this->setExpectedException('\RuntimeException', 'The Zip Util requires PHP\'s zip extension');
self::expectException('RuntimeException');
self::expectExceptionMessage('The Zip Util requires PHP\'s zip extension');
Zip::getComposerJson('');
}
@ -59,7 +60,8 @@ class ZipTest extends TestCase
$this->markTestSkipped('The PHP zip extension is not loaded.');
}
$this->setExpectedException('\RuntimeException', 'No composer.json found either at the top level or within the topmost directory');
self::expectException('RuntimeException');
self::expectExceptionMessage('No composer.json found either at the top level or within the topmost directory');
Zip::getComposerJson(__DIR__.'/Fixtures/Zip/nojson.zip');
}
@ -70,7 +72,8 @@ class ZipTest extends TestCase
$this->markTestSkipped('The PHP zip extension is not loaded.');
}
$this->setExpectedException('\RuntimeException', 'No composer.json found either at the top level or within the topmost directory');
self::expectException('RuntimeException');
self::expectExceptionMessage('No composer.json found either at the top level or within the topmost directory');
Zip::getComposerJson(__DIR__.'/Fixtures/Zip/subfolders.zip');
}
@ -102,7 +105,8 @@ class ZipTest extends TestCase
$this->markTestSkipped('The PHP zip extension is not loaded.');
}
$this->setExpectedException('\RuntimeException', 'Archive has more than one top level directories, and no composer.json was found on the top level, so it\'s an invalid archive. Top level paths found were: folder1/,folder2/');
self::expectException('RuntimeException');
self::expectExceptionMessage('Archive has more than one top level directories, and no composer.json was found on the top level, so it\'s an invalid archive. Top level paths found were: folder1/,folder2/');
Zip::getComposerJson(__DIR__.'/Fixtures/Zip/multiple.zip');
}