From 4116803384b8408308b6a93df61df56aa92fc8ee Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sat, 29 Apr 2017 07:48:35 +0700 Subject: [PATCH 1/2] Fixes @return DefaultRenderingStrategy typo at HttpDefaultRenderingStrategyFactory --- src/Service/HttpDefaultRenderingStrategyFactory.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Service/HttpDefaultRenderingStrategyFactory.php b/src/Service/HttpDefaultRenderingStrategyFactory.php index 329cd0407..45c71c8ce 100644 --- 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) From 7e5c5609c057da0a0e95e8ecd9a4d27bba9aa22f Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Mon, 1 May 2017 10:37:25 -0500 Subject: [PATCH 2/2] Added CHANGELOG for #237 --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41ed2ab70..7f2f0d610 100644 --- 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