Merge branch 'hotfix/50' into develop

weierophinney · weierophinney · commit 25d82e0979a4 · 2018-12-11T11:26:16.000-06:00
Forward port #50
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -46,6 +46,10 @@ Versions prior to 0.4.0 were released as the package "weierophinney/hal".
 
 ### Fixed
 
+- [#50](https://github.com/zendframework/zend-expressive-hal/pull/50) fixes the `Halresource` constructor documentation of the `$embedded`
+  argument to correctly be an array of `HalResource` arrays (and not just an
+  array of `HalResource` instances).
+
 - [#41](https://github.com/zendframework/zend-expressive-hal/pull/41) fixes how `null` values in resources are handled when rendering as XML.
   Previously, these would lead to an `InvalidResourceValueException`; now they
   are rendered as content-less tags.
diff --git a/src/HalResource.php b/src/HalResource.php
@@ -54,7 +54,7 @@ class HalResource implements EvolvableLinkProviderInterface, JsonSerializable
     /**
      * @param array $data
      * @param LinkInterface[] $links
-     * @param HalResource[] $embedded
+     * @param HalResource[][] $embedded
      */
     public function __construct(array $data = [], array $links = [], array $embedded = [])
     {

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ class HalResource implements EvolvableLinkProviderInterface, JsonSerializable`
`54`	`54`	`/**`
`55`	`55`	`* @param array $data`
`56`	`56`	`* @param LinkInterface[] $links`
`57`		`- * @param HalResource[] $embedded`
	`57`	`+ * @param HalResource[][] $embedded`
`58`	`58`	`*/`
`59`	`59`	`public function __construct(array $data = [], array $links = [], array $embedded = [])`
`60`	`60`	`{`