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

Build tweaks

Browse source
This commit is contained in:
Jordi Boggiano 2020-05-20 14:39:14 +02:00
parent 0a4df6c3b4
commit 4e1f8cf89d
No known key found for this signature in database
GPG key ID: 7BBD42C429EC80BC
7 changed files with 68 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,7 +46,11 @@ class ErrorHandlerTest extends TestCase
*/
public function testErrorHandlerCaptureWarning()
{
$this->setExpectedException('\ErrorException', 'array_merge');
if (PHP_VERSION_ID >= 80000) {
$this->setExpectedException('TypeError', 'array_merge');
} else {
$this->setExpectedException('ErrorException', 'array_merge');
}
array_merge(array(), 'string');
}