Merge branch 'hotfix/237'

weierophinney · weierophinney · commit 3a2eb598b23d · 2017-05-01T10:37:30.000-05:00
Close #237
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,7 +21,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
@@ -41,7 +41,7 @@ public function __invoke(ContainerInterface $container, $name, array $options =
      * For use with zend-servicemanager v2; proxies to __invoke().
      *
      * @param ServiceLocatorInterface $container
-     * @return DefaultRendererStrategy
+     * @return DefaultRenderingStrategy
      */
     public function createService(ServiceLocatorInterface $container)
     {
@@ -53,7 +53,7 @@ public function createService(ServiceLocatorInterface $container)
      *
      * 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
`@@ -41,7 +41,7 @@ public function __invoke(ContainerInterface $container, $name, array $options =`
`41`	`41`	`* For use with zend-servicemanager v2; proxies to __invoke().`
`42`	`42`	`*`
`43`	`43`	`* @param ServiceLocatorInterface $container`
`44`		`- * @return DefaultRendererStrategy`
	`44`	`+ * @return DefaultRenderingStrategy`
`45`	`45`	`*/`
`46`	`46`	`public function createService(ServiceLocatorInterface $container)`
`47`	`47`	`{`
`@@ -53,7 +53,7 @@ public function createService(ServiceLocatorInterface $container)`
`53`	`53`	`*`
`54`	`54`	`* Uses layout template from configuration; if none available, defaults to "layout/layout".`
`55`	`55`	`*`
`56`		`- * @param DefaultRendererStrategy $strategy`
	`56`	`+ * @param DefaultRenderingStrategy $strategy`
`57`	`57`	`* @param array $config`
`58`	`58`	`*/`
`59`	`59`	`private function injectLayoutTemplate(DefaultRenderingStrategy $strategy, array $config)`