Merge branch 'feature/phpdoc-mismatch' of https://github.com/micheh/zf2…

… into hotfix/phpdoc

src/Feature/BootstrapListenerInterface.php

@@ -24,6 +24,7 @@ interface BootstrapListenerInterface
     /**
      * Listen to the bootstrap event
      *
+     * @param EventInterface $e
      * @return array
      */
     public function onBootstrap(EventInterface $e);

src/Feature/ControllerProviderInterface.php

@@ -18,10 +18,10 @@
 interface ControllerProviderInterface
 {
     /**
-     * Expected to return \Zend\ServiceManager\Configuration object or array to
-     * seed such an object.
+     * Expected to return \Zend\ServiceManager\Config object or array to seed
+     * such an object.
      *
-     * @return array|\Zend\ServiceManager\Configuration
+     * @return array|\Zend\ServiceManager\Config
      */
     public function getControllerConfig();
 }

src/Listener/ConfigListener.php

@@ -264,7 +264,7 @@ public function addConfigStaticPaths($staticPaths)
     /**
      * Add a static path of config files to merge after loading modules
      *
-     * @param  string $globPath
+     * @param  string $staticPath
      * @return ConfigListener
      */
     public function addConfigStaticPath($staticPath)
@@ -276,7 +276,9 @@ public function addConfigStaticPath($staticPath)
     /**
      * Add an array of paths of config files to merge after loading modules
      *
-     * @param  mixed $paths
+     * @param  Traversable|array $paths
+     * @param string $type
+     * @throws Exception\InvalidArgumentException
      * @return ConfigListener
      */
     protected function addConfigPaths($paths, $type)
@@ -304,6 +306,7 @@ protected function addConfigPaths($paths, $type)
      *
      * @param  string $path
      * @param  string $type
+     * @throws Exception\InvalidArgumentException
      * @return ConfigListener
      */
     protected function addConfigPath($path, $type)

src/Listener/ListenerOptions.php

@@ -71,6 +71,7 @@ public function getModulePaths()
      * Set an array of paths where modules reside
      *
      * @param  array|Traversable $modulePaths
+     * @throws Exception\InvalidArgumentException
      * @return ListenerOptions
      */
     public function setModulePaths($modulePaths)
@@ -111,6 +112,7 @@ public function getConfigStaticPaths()
      * Set the glob patterns to use for loading additional config files
      *
      * @param array|Traversable $configGlobPaths
+     * @throws Exception\InvalidArgumentException
      * @return ListenerOptions
      */
     public function setConfigGlobPaths($configGlobPaths)
@@ -131,6 +133,7 @@ public function setConfigGlobPaths($configGlobPaths)
      * Set the static paths to use for loading additional config files
      *
      * @param array|Traversable $configStaticPaths
+     * @throws Exception\InvalidArgumentException
      * @return ListenerOptions
      */
     public function setConfigStaticPaths($configStaticPaths)
@@ -162,6 +165,7 @@ public function getExtraConfig()
      * for unit testing purposes.
      *
      * @param array|Traversable $extraConfig
+     * @throws Exception\InvalidArgumentException
      * @return ListenerOptions
      */
     public function setExtraConfig($extraConfig)

src/Listener/ServiceListener.php

@@ -49,6 +49,7 @@ class ServiceListener implements ServiceListenerInterface
 
     /**
      * @param ServiceManager $serviceManager
+     * @param null|array $configuration
      */
     public function __construct(ServiceManager $serviceManager, $configuration = null)
     {
@@ -75,6 +76,7 @@ public function setDefaultServiceConfig($configuration)
      * @param  string                $key             Configuration key
      * @param  string                $moduleInterface FQCN as string
      * @param  string                $method          Method name
+     * @throws Exception\RuntimeException
      * @return ServiceListener
      */
     public function addServiceManager($serviceManager, $key, $moduleInterface, $method)
@@ -187,6 +189,7 @@ public function onLoadModule(ModuleEvent $e)
      * used to configure the service manager.
      *
      * @param  ModuleEvent $e
+     * @throws Exception\RuntimeException
      * @return void
      */
     public function onLoadModulesPost(ModuleEvent $e)
@@ -235,6 +238,7 @@ public function onLoadModulesPost(ModuleEvent $e)
      * the internal service configuration.
      *
      * @param  ServiceConfig|string $config Instance of ServiceConfig or class name
+     * @throws Exception\RuntimeException
      * @return array
      */
     protected function serviceConfigToArray($config)

src/Listener/ServiceListenerInterface.php

@@ -11,6 +11,7 @@
 namespace Zend\ModuleManager\Listener;
 
 use Zend\EventManager\ListenerAggregateInterface;
+use Zend\ServiceManager\ServiceManager;
 
 /**
  * @category   Zend

src/ModuleEvent.php

@@ -58,6 +58,7 @@ public function getModuleName()
      * Set the name of a given module
      *
      * @param  string $moduleName
+     * @throws Exception\InvalidArgumentException
      * @return ModuleEvent
      */
     public function setModuleName($moduleName)
@@ -88,6 +89,7 @@ public function getModule()
      * Set module object to compose in this event
      *
      * @param  object $module
+     * @throws Exception\InvalidArgumentException
      * @return ModuleEvent
      */
     public function setModule($module)

src/ModuleManager.php

@@ -113,6 +113,7 @@ public function loadModules()
      * Load a specific module by name.
      *
      * @param    string $moduleName
+     * @throws   Exception\RuntimeException
      * @triggers loadModule.resolve
      * @triggers loadModule
      * @return   mixed Module's Module class
@@ -192,6 +193,7 @@ public function getModules()
      * Set an array or Traversable of module names that this module manager should load.
      *
      * @param  mixed $modules array or Traversable of module names
+     * @throws Exception\InvalidArgumentException
      * @return ModuleManager
      */
     public function setModules($modules)