public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge branch '1.9' 

* 1.9:
  Move test file parsing into try/catch block to avoid phpunit swallowing errors
pull/8401/head
Nils Adermann 2019-10-29 23:09:53 +01:00
parent 82d939d7f7 6a335a459c
commit 0873c4099b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Composer/Test/InstallerTest.php
View File

@ -283,6 +283,7 @@ class InstallerTest extends TestCase
continue; continue;
} }
try {
$testData = $this->readTestFile($file, $fixturesDir); $testData = $this->readTestFile($file, $fixturesDir);
$installed = array(); $installed = array();
@ -291,7 +292,6 @@ class InstallerTest extends TestCase
$expectLock = array(); $expectLock = array();
$expectResult = 0; $expectResult = 0;
try {
$message = $testData['TEST']; $message = $testData['TEST'];
$condition = !empty($testData['CONDITION']) ? $testData['CONDITION'] : null; $condition = !empty($testData['CONDITION']) ? $testData['CONDITION'] : null;
$composer = JsonFile::parseJson($testData['COMPOSER']); $composer = JsonFile::parseJson($testData['COMPOSER']);