Merge branch 'hotfix/237' into develop

Forward port #237 Conflicts: src/Service/HttpDefaultRenderingStrategyFactory.php
zendframework · May 1, 2017 · 00bdd8c · 00bdd8c
2 parents b8129ff + 7e5c560
commit 00bdd8c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
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)