Merge pull request zendframework/zendframework#6042 in develop

Maks3w · Maks3w · commit 2725baac8e87 · 2014-03-26T10:15:06.000+01:00
diff --git a/src/Util/ModuleLoader.php b/src/Util/ModuleLoader.php
@@ -52,7 +52,7 @@ public function __construct(array $configuration)
     /**
      * Get the application
      *
-     * @return Zend\Mvc\Application
+     * @return \Zend\Mvc\Application
      */
     public function getApplication()
     {
@@ -62,16 +62,17 @@ public function getApplication()
     /**
      * Get the module manager
      *
-     * @return Zend\ModuleManager\ModuleManager
+     * @return \Zend\ModuleManager\ModuleManager
      */
     public function getModuleManager()
     {
         return $this->getServiceManager()->get('ModuleManager');
     }
 
     /**
-     * Get module
+     * Get module by name
      *
+     * @param $moduleName
      * @return mixed
      */
     public function getModule($moduleName)
@@ -82,7 +83,7 @@ public function getModule($moduleName)
     /**
      * Get the service manager
      *
-     * @var ServiceManager
+     * @return ServiceManager
      */
     public function getServiceManager()
     {

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public function __construct(array $configuration)`
`52`	`52`	`/**`
`53`	`53`	`* Get the application`
`54`	`54`	`*`
`55`		`- * @return Zend\Mvc\Application`
	`55`	`+ * @return \Zend\Mvc\Application`
`56`	`56`	`*/`
`57`	`57`	`public function getApplication()`
`58`	`58`	`{`
`@@ -62,16 +62,17 @@ public function getApplication()`
`62`	`62`	`/**`
`63`	`63`	`* Get the module manager`
`64`	`64`	`*`
`65`		`- * @return Zend\ModuleManager\ModuleManager`
	`65`	`+ * @return \Zend\ModuleManager\ModuleManager`
`66`	`66`	`*/`
`67`	`67`	`public function getModuleManager()`
`68`	`68`	`{`
`69`	`69`	`return $this->getServiceManager()->get('ModuleManager');`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`/**`
`73`		`- * Get module`
	`73`	`+ * Get module by name`
`74`	`74`	`*`
	`75`	`+ * @param $moduleName`
`75`	`76`	`* @return mixed`
`76`	`77`	`*/`
`77`	`78`	`public function getModule($moduleName)`
`@@ -82,7 +83,7 @@ public function getModule($moduleName)`
`82`	`83`	`/**`
`83`	`84`	`* Get the service manager`
`84`	`85`	`*`
`85`		`- * @var ServiceManager`
	`86`	`+ * @return ServiceManager`
`86`	`87`	`*/`
`87`	`88`	`public function getServiceManager()`
`88`	`89`	`{`