Merge branch '1.9'

* 1.9:
  Move test file parsing into try/catch block to avoid phpunit swallowing errors

tests/Composer/Test/InstallerTest.php

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