Merge branch '2.8' into 3.3

* 2.8:
  Update JsonBundleReader.php
  [HttpKernel] Clean test directory on tear down
  Fix testHtml method with regexp

Author: nicolas-grekas

Data/Bundle/Reader/JsonBundleReader.php

@@ -32,27 +32,24 @@ public function read($path, $locale)
 
         if (!file_exists($fileName)) {
             throw new ResourceBundleNotFoundException(sprintf(
-                'The resource bundle "%s/%s.json" does not exist.',
-                $path,
-                $locale
+                'The resource bundle "%s" does not exist.',
+                $fileName
             ));
         }
 
         if (!is_file($fileName)) {
             throw new RuntimeException(sprintf(
-                'The resource bundle "%s/%s.json" is not a file.',
-                $path,
-                $locale
+                'The resource bundle "%s" is not a file.',
+                $fileName
             ));
         }
 
         $data = json_decode(file_get_contents($fileName), true);
 
         if (null === $data) {
             throw new RuntimeException(sprintf(
-                'The resource bundle "%s/%s.json" contains invalid JSON: %s',
-                $path,
-                $locale,
+                'The resource bundle "%s" contains invalid JSON: %s',
+                $fileName,
                 json_last_error_msg()
             ));
         }