Merge branch 'hotfix/3156' into develop

Forward port zendframework/zendframework#3156
zendframework · Dec 11, 2012 · f3a6db8 · f3a6db8
2 parents 75dbcbc + aac048a
commit f3a6db8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Renderer/ConsoleRenderer.php b/src/Renderer/ConsoleRenderer.php
@@ -35,7 +35,7 @@ class ConsoleRenderer implements RendererInterface, TreeRendererInterface
      * Constructor.
      *
      *
-     * @todo handle passing helper broker, options
+     * @todo handle passing helper manager, options
      * @todo handle passing filter chain, options
      * @todo handle passing variables object, options
      * @todo handle passing resolver object, options

diff --git a/src/Variables.php b/src/Variables.php
@@ -15,7 +15,7 @@
 /**
  * Abstract class for Zend_View to help enforce private constructs.
  *
- * @todo       Allow specifying string names for broker, filter chain, variables
+ * @todo       Allow specifying string names for manager, filter chain, variables
  * @todo       Move escaping into variables object
  * @todo       Move strict variables into variables object
  * @category   Zend