minor symfony#10692 Fixed wrong typehint in documentation for XmlEncoder (csarrazi)

fabpot · fabpot · commit a0f10d3bbfcb · 2014-04-11T13:38:57.000+02:00
This PR was merged into the 2.5-dev branch. Discussion ---------- Fixed wrong typehint in documentation for XmlEncoder | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Method documentation correction. See symfony#10668 (comment) Commits ------- f1a7361 Fixed wrong typehint in documentation for XmlEncoder
diff --git a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
@@ -231,11 +231,11 @@ final protected function isElementNameValid($name)
     }
 
     /**
-     * Parse the input DOMNode into an array.
+     * Parse the input DOMNode into an array or a string.
      *
      * @param \DOMNode $node xml to parse
      *
-     * @return array
+     * @return array|string
      */
     private function parseXml(\DOMNode $node)
     {

Original file line number	Diff line number	Diff line change
`@@ -231,11 +231,11 @@ final protected function isElementNameValid($name)`
`231`	`231`	`}`
`232`	`232`
`233`	`233`	`/**`
`234`		`- * Parse the input DOMNode into an array.`
	`234`	`+ * Parse the input DOMNode into an array or a string.`
`235`	`235`	`*`
`236`	`236`	`* @param \DOMNode $node xml to parse`
`237`	`237`	`*`
`238`		`- * @return array`
	`238`	`+ * @return array\|string`
`239`	`239`	`*/`
`240`	`240`	`private function parseXml(\DOMNode $node)`
`241`	`241`	`{`