Merge branch '2.5'

* 2.5:
  typo fixed in AbstractProcessTest (getoutput() => getOutput())
  Avoid question mark and asterisk in folder names to prevent windows filesystem issues.
  [Translation] [Config] Clear libxml errors after parsing XML file
  check for the Validator if forms are enabled
  Clear json_last_error
  Fix JsonSerializable namespace
  Catch exceptions to restore the error handler
  [HttpFoundation] Silent only JSON errors

Author: fabpot

Tests/Util/XmlUtilsTest.php

@@ -58,6 +58,16 @@ public function testLoadFile()
         }
 
         $this->assertInstanceOf('DOMDocument', XmlUtils::loadFile($fixtures.'valid.xml', array($mock, 'validate')));
+        $this->assertSame(array(), libxml_get_errors());
+    }
+
+    public function testLoadFileWithInternalErrorsEnabled()
+    {
+        libxml_use_internal_errors(true);
+
+        $this->assertSame(array(), libxml_get_errors());
+        $this->assertInstanceOf('DOMDocument', XmlUtils::loadFile(__DIR__.'/../Fixtures/Util/invalid_schema.xml'));
+        $this->assertSame(array(), libxml_get_errors());
     }
 
     /**

Util/XmlUtils.php

@@ -95,10 +95,11 @@ public static function loadFile($file, $schemaOrCallable = null)
                 }
                 throw new \InvalidArgumentException(implode("\n", $messages), 0, $e);
             }
-
-            libxml_use_internal_errors($internalErrors);
         }
 
+        libxml_clear_errors();
+        libxml_use_internal_errors($internalErrors);
+
         return $dom;
     }