From 6fcb0756836a3c24a340d88d7f8300bf430d8d3c Mon Sep 17 00:00:00 2001 From: Maxime Steinhausser Date: Tue, 26 Sep 2017 22:01:10 +0200 Subject: [PATCH] Fix changelog and minor tweak for #23485 --- src/Symfony/Component/Config/CHANGELOG.md | 1 + src/Symfony/Component/Config/Util/XmlUtils.php | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Symfony/Component/Config/CHANGELOG.md b/src/Symfony/Component/Config/CHANGELOG.md index ffa347dbf497..f8a2028e558d 100644 --- a/src/Symfony/Component/Config/CHANGELOG.md +++ b/src/Symfony/Component/Config/CHANGELOG.md @@ -5,6 +5,7 @@ CHANGELOG ----- * added `setDeprecated()` method to indicate a deprecated node + * added `XmlUtils::parse()` method to parse an XML string 3.3.0 ----- diff --git a/src/Symfony/Component/Config/Util/XmlUtils.php b/src/Symfony/Component/Config/Util/XmlUtils.php index 130384ea8703..c6e1869f9be5 100644 --- a/src/Symfony/Component/Config/Util/XmlUtils.php +++ b/src/Symfony/Component/Config/Util/XmlUtils.php @@ -40,9 +40,9 @@ private function __construct() * * @return \DOMDocument * - * @throws \Symfony\Component\Config\Util\Exception\XmlParsingException When parsing of XML file returns error - * @throws \Symfony\Component\Config\Util\Exception\InvalidXmlException When parsing of XML with schema or callable produces any errors unrelated to the XML parsing itself - * @throws \RuntimeException When DOM extension is missing + * @throws XmlParsingException When parsing of XML file returns error + * @throws InvalidXmlException When parsing of XML with schema or callable produces any errors unrelated to the XML parsing itself + * @throws \RuntimeException When DOM extension is missing */ public static function parse($content, $schemaOrCallable = null) { @@ -116,9 +116,9 @@ public static function parse($content, $schemaOrCallable = null) * * @return \DOMDocument * - * @throws \InvalidArgumentException When loading of XML file returns error - * @throws \Symfony\Component\Config\Util\Exception\XmlParsingException when XML parsing returns any errors - * @throws \RuntimeException When DOM extension is missing + * @throws \InvalidArgumentException When loading of XML file returns error + * @throws XmlParsingException When XML parsing returns any errors + * @throws \RuntimeException When DOM extension is missing */ public static function loadFile($file, $schemaOrCallable = null) {