Browse files

Merge branch 'hotfix/3473' into develop

Forward port #3473
  • Loading branch information...
2 parents a087928 + 3e805d6 commit 60845bcff18cf5bd9f15e3c6cc834ca9b7d99c74 @weierophinney weierophinney committed Jan 21, 2013
View
4 library/Zend/Mvc/Router/Console/Catchall.php
@@ -72,12 +72,12 @@ class Catchall implements RouteInterface
protected $assembledParams = array();
/**
- * @var \Zend\Validator\ValidatorChain
+ * @var ValidatorChain
*/
protected $validators;
/**
- * @var \Zend\Filter\FilterChain
+ * @var FilterChain
*/
protected $filters;
View
2 library/Zend/Mvc/Service/ControllerLoaderFactory.php
@@ -25,7 +25,7 @@ class ControllerLoaderFactory implements FactoryInterface
/**
* Create the controller loader service
*
- * Creates and returns an instance of Controller\ControllerManager. The
+ * Creates and returns an instance of ControllerManager. The
* only controllers this manager will allow are those defined in the
* application configuration's "controllers" array. If a controller is
* matched, the scoped manager will attempt to load the controller.

0 comments on commit 60845bc

Please sign in to comment.