Zend Beta5 update with rename of the escape plugin and service manage…

…r changes
PowerKiKi · Jul 9, 2012 · e95be8a · e95be8a
1 parent a9a5341
commit e95be8a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/config/module.config.php b/config/module.config.php
@@ -14,8 +14,8 @@
             ),
         ),
     ),
-    'view_manager' => array(
-        'helper_map' => array(
+    'view_helpers' => array(
+        'invokables' => array(
             'formelementwrapper' => 'ZfcTwitterBootstrap\Form\View\Helper\FormElementWrapper',
             'formrenderer' => 'ZfcTwitterBootstrap\Form\View\Helper\FormRenderer',
             'formdescription' => 'ZfcTwitterBootstrap\Form\View\Helper\FormDescription',

diff --git a/src/ZfcTwitterBootstrap/Form/View/Helper/FormElementWrapper.php b/src/ZfcTwitterBootstrap/Form/View/Helper/FormElementWrapper.php
@@ -13,7 +13,7 @@
 use Zend\Form\View\Helper\FormElement;
 use Zend\Form\View\Helper\FormLabel;
 use Zend\Form\View\Helper\FormElementErrors;
-use Zend\View\Helper\Escape;
+use Zend\View\Helper\EscapeHtml;
 
 /**
  * Form Element
@@ -35,7 +35,7 @@ class FormElementWrapper extends FormElement
     protected $elementHelper;
 
     /**
-     * @var Zend\View\Helper\Escape
+     * @var Zend\View\Helper\EscapeHtml
      */
     protected $escapeHelper;
 
@@ -86,27 +86,27 @@ public function getLabelHelper()
     }
 
     /**
-     * Set Escape Helper
+     * Set EscapeHtml Helper
      * 
-     * @param Zend\View\Helper\Escape $escapeHelper
+     * @param Zend\View\Helper\EscapeHtml $escapeHelper
      * @return FormElement
      */
-    public function setEscapeHelper(Escape $escapeHelper)
+    public function setEscapeHtmlHelper(EscapeHtml $escapeHelper)
     {
         $escapeHelper->setView($this->getView());
         $this->escapeHelper = $escapeHelper;
         return $this;
     }
 
     /**
-     * Get Escape Helper
+     * Get EscapeHtml Helper
      *
-     * @return Zend\View\Helper\Escape
+     * @return Zend\View\Helper\EscapeHtml
      */
-    public function getEscapeHelper()
+    public function getEscapeHtmlHelper()
     {
         if (!$this->escapeHelper) {
-            $this->setEscapeHelper($this->view->plugin('escape'));
+            $this->setEscapeHtmlHelper($this->view->plugin('escapeHtml'));
         }
         return $this->escapeHelper;
     }
@@ -244,7 +244,7 @@ public function getControlWrapper()
     public function render(ElementInterface $element, $groupWrapper = null, $controlWrapper = null)
     {
         $labelHelper = $this->getLabelHelper();
-        $escapeHelper = $this->getEscapeHelper();
+        $escapeHelper = $this->getEscapeHtmlHelper();
         $elementHelper = $this->getElementHelper();
         $elementErrorHelper = $this->getElementErrorHelper();
         $descriptionHelper = $this->getDescriptionHelper();