From 40e971d016509b5c9265a03104e7e6db91749c84 Mon Sep 17 00:00:00 2001 From: Jefersson Nathan Date: Tue, 23 Jan 2018 19:58:17 +0100 Subject: [PATCH 1/2] Fix phpdoc types Signed-off-by: Jefersson Nathan Conflicts: src/ServiceManager.php --- src/AbstractFactory/ReflectionBasedAbstractFactory.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/AbstractFactory/ReflectionBasedAbstractFactory.php b/src/AbstractFactory/ReflectionBasedAbstractFactory.php index 40709ec9..ba8cf9d6 100644 --- a/src/AbstractFactory/ReflectionBasedAbstractFactory.php +++ b/src/AbstractFactory/ReflectionBasedAbstractFactory.php @@ -150,7 +150,7 @@ public function canCreate(ContainerInterface $container, $requestedName) private function resolveParameterWithoutConfigService(ContainerInterface $container, $requestedName) { /** - * @param ReflectionClass $parameter + * @param ReflectionParameter $parameter * @return mixed * @throws ServiceNotFoundException If type-hinted parameter cannot be * resolved to a service in the container. @@ -173,7 +173,7 @@ private function resolveParameterWithoutConfigService(ContainerInterface $contai private function resolveParameterWithConfigService(ContainerInterface $container, $requestedName) { /** - * @param ReflectionClass $parameter + * @param ReflectionParameter $parameter * @return mixed * @throws ServiceNotFoundException If type-hinted parameter cannot be * resolved to a service in the container. @@ -189,7 +189,7 @@ private function resolveParameterWithConfigService(ContainerInterface $container /** * Logic common to all parameter resolution. * - * @param ReflectionClass $parameter + * @param ReflectionParameter $parameter * @param ContainerInterface $container * @param string $requestedName * @return mixed From 331ce27ea0732d03d69aaa6d79826f26b3fac220 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Mon, 29 Jan 2018 10:45:13 -0600 Subject: [PATCH 2/2] Adds CHANGELOG entry for #233 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea0a8059..a819b972 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,9 @@ All notable changes to this project will be documented in this file, in reverse with default values to their default values if no matching type is found in the container. +- [#233](https://github.com/zendframework/zend-servicemanager/pull/233) fixes a + number of parameter annotations to reflect the actual types used. + ## 3.3.1 - 2017-11-27 ### Added