Merge branch 'hotfix/233-parameter-type-hints' into develop

Forward port #233

Also brings in changes specific to develop branch.

Author: weierophinney

CHANGELOG.md

@@ -57,6 +57,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

src/AbstractFactory/ReflectionBasedAbstractFactory.php

@@ -154,7 +154,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.
@@ -177,7 +177,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.
@@ -193,7 +193,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

src/ServiceManager.php

@@ -923,8 +923,7 @@ private function mapAliasesToTargets()
     /**
      * Instantiate abstract factories in order to avoid checks during service construction.
      *
-     * @param string[]|Factory\AbstractFactoryInterface[] $abstractFactories
-     *
+     * @param string|Factory\AbstractFactoryInterface $abstractFactories
      * @return void
      */
     private function resolveAbstractFactoryInstance($abstractFactory)