Merge branch 'hotfix/207' into develop

weierophinney · weierophinney · commit 55078bd0403d · 2018-12-11T16:03:38.000-06:00
Forward port #207
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -44,7 +44,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#207](https://github.com/zendframework/zend-form/pull/207) fixes the return value annotation for the `Fieldset::get()` method to
+  indicate it can also return a `FieldsetInterface` instance.
 
 ## 2.12.0 - 2018-05-16
 
diff --git a/src/Fieldset.php b/src/Fieldset.php
@@ -211,7 +211,7 @@ public function has($elementOrFieldset)
      * Retrieve a named element or fieldset
      *
      * @param  string $elementOrFieldset
-     * @return ElementInterface
+     * @return ElementInterface|FieldsetInterface
      */
     public function get($elementOrFieldset)
     {

Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ public function has($elementOrFieldset)`
`211`	`211`	`* Retrieve a named element or fieldset`
`212`	`212`	`*`
`213`	`213`	`* @param string $elementOrFieldset`
`214`		`- * @return ElementInterface`
	`214`	`+ * @return ElementInterface\|FieldsetInterface`
`215`	`215`	`*/`
`216`	`216`	`public function get($elementOrFieldset)`
`217`	`217`	`{`