Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 7b41b71bf79d · 2017-10-24T15:48:52.000+02:00
* 2.7:
  [DI] minor docblock fixes
diff --git a/Form.php b/Form.php
@@ -278,8 +278,6 @@ public function get($name)
 
     /**
      * Sets a named field.
-     *
-     * @param FormField $field The field
      */
     public function set(FormField $field)
     {
@@ -366,8 +364,6 @@ public function disableValidation()
      *
      * Expects a 'submit' button \DOMElement and finds the corresponding form element, or the form element itself.
      *
-     * @param \DOMElement $node A \DOMElement instance
-     *
      * @throws \LogicException If given node is not a button or input or does not have a form ancestor
      */
     protected function setNode(\DOMElement $node)
diff --git a/FormFieldRegistry.php b/FormFieldRegistry.php
@@ -26,8 +26,6 @@ class FormFieldRegistry
 
     /**
      * Adds a field to the registry.
-     *
-     * @param FormField $field The field
      */
     public function add(FormField $field)
     {

Original file line number	Diff line number	Diff line change
`@@ -278,8 +278,6 @@ public function get($name)`
`278`	`278`
`279`	`279`	`/**`
`280`	`280`	`* Sets a named field.`
`281`		`- *`
`282`		`- * @param FormField $field The field`
`283`	`281`	`*/`
`284`	`282`	`public function set(FormField $field)`
`285`	`283`	`{`
`@@ -366,8 +364,6 @@ public function disableValidation()`
`366`	`364`	`*`
`367`	`365`	`* Expects a 'submit' button \DOMElement and finds the corresponding form element, or the form element itself.`
`368`	`366`	`*`
`369`		`- * @param \DOMElement $node A \DOMElement instance`
`370`		`- *`
`371`	`367`	`* @throws \LogicException If given node is not a button or input or does not have a form ancestor`
`372`	`368`	`*/`
`373`	`369`	`protected function setNode(\DOMElement $node)`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,6 @@ class FormFieldRegistry`
`26`	`26`
`27`	`27`	`/**`
`28`	`28`	`* Adds a field to the registry.`
`29`		`- *`
`30`		`- * @param FormField $field The field`
`31`	`29`	`*/`
`32`	`30`	`public function add(FormField $field)`
`33`	`31`	`{`