Merge branch 'hotfix/237' into develop

weierophinney · weierophinney · commit 00bdd8c2f117 · 2017-05-01T10:38:54.000-05:00
Forward port #237 Conflicts: src/Service/HttpDefaultRenderingStrategyFactory.php
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -41,7 +41,10 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#237](https://github.com/zendframework/zend-mvc/pull/237) fixes the return
+  annotations for `HttpDefaultRenderingStrategyFactory::createService` and
+  `injectLayoutTemplate()` to be `HttpDefaultRenderingStrategy` and not
+  `HttpDefaultRendererStrategy`.
 
 ## 3.0.4 - 2016-12-20
 
diff --git a/src/Service/HttpDefaultRenderingStrategyFactory.php b/src/Service/HttpDefaultRenderingStrategyFactory.php
@@ -39,7 +39,7 @@ public function __invoke(ContainerInterface $container, $name, array $options =
      *
      * Uses layout template from configuration; if none available, defaults to "layout/layout".
      *
-     * @param DefaultRendererStrategy $strategy
+     * @param DefaultRenderingStrategy $strategy
      * @param array $config
      */
     private function injectLayoutTemplate(DefaultRenderingStrategy $strategy, array $config)

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function __invoke(ContainerInterface $container, $name, array $options =`
`39`	`39`	`*`
`40`	`40`	`* Uses layout template from configuration; if none available, defaults to "layout/layout".`
`41`	`41`	`*`
`42`		`- * @param DefaultRendererStrategy $strategy`
	`42`	`+ * @param DefaultRenderingStrategy $strategy`
`43`	`43`	`* @param array $config`
`44`	`44`	`*/`
`45`	`45`	`private function injectLayoutTemplate(DefaultRenderingStrategy $strategy, array $config)`