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