Merge branch 'hotfix/2663' into develop

Forward port zendframework/zendframework#2663
zendframework · Oct 3, 2012 · 961798f · 961798f
commit 961798f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/Listener/ConfigListener.php b/src/Listener/ConfigListener.php
@@ -325,8 +325,12 @@ protected function addConfigPath($path, $type)
         return $this;
     }
 
-
-
+    /**
+     * @param string $key
+     * @param array|Traversable $config
+     * @throws Exception\InvalidArgumentException
+     * @return ConfigListener
+     */
     protected function addConfig($key, $config)
     {
         if ($config instanceof Traversable) {

diff --git a/src/ModuleManager.php b/src/ModuleManager.php
@@ -70,6 +70,11 @@ public function __construct($modules, EventManagerInterface $eventManager = null
         }
     }
 
+    /**
+     * Handle the loadModules event
+     *
+     * @return void
+     */
     public function onLoadModules()
     {
         if (true === $this->modulesAreLoaded) {
@@ -86,7 +91,7 @@ public function onLoadModules()
     /**
      * Load the provided modules.
      *
-     * @triggers loadModules.pre
+     * @triggers loadModules
      * @triggers loadModules.post
      * @return   ModuleManager
      */