Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit e1bd68bddd91 · 2017-11-07T12:56:23.000+01:00
* 2.7:
  Docblock fixes
diff --git a/Loader/XmlFileLoader.php b/Loader/XmlFileLoader.php
@@ -570,7 +570,7 @@ private function loadFromExtensions(\DOMDocument $xml)
     }
 
     /**
-     * Converts a \DomElement object to a PHP array.
+     * Converts a \DOMElement object to a PHP array.
      *
      * The following rules applies during the conversion:
      *
@@ -584,7 +584,7 @@ private function loadFromExtensions(\DOMDocument $xml)
      *
      *  * The nested-tags are converted to keys (<foo><foo>bar</foo></foo>)
      *
-     * @param \DomElement $element A \DomElement instance
+     * @param \DOMElement $element A \DOMElement instance
      *
      * @return array A PHP array
      */

Original file line number	Diff line number	Diff line change
`@@ -570,7 +570,7 @@ private function loadFromExtensions(\DOMDocument $xml)`
`570`	`570`	`}`
`571`	`571`
`572`	`572`	`/**`
`573`		`- * Converts a \DomElement object to a PHP array.`
	`573`	`+ * Converts a \DOMElement object to a PHP array.`
`574`	`574`	`*`
`575`	`575`	`* The following rules applies during the conversion:`
`576`	`576`	`*`
`@@ -584,7 +584,7 @@ private function loadFromExtensions(\DOMDocument $xml)`
`584`	`584`	`*`
`585`	`585`	`* * The nested-tags are converted to keys (<foo><foo>bar</foo></foo>)`
`586`	`586`	`*`
`587`		`- * @param \DomElement $element A \DomElement instance`
	`587`	`+ * @param \DOMElement $element A \DOMElement instance`
`588`	`588`	`*`
`589`	`589`	`* @return array A PHP array`
`590`	`590`	`*/`