Merge branch 'hotfix/ViewHelperCleanup'

bnkr · Jan 2, 2014 · db072e7 · db072e7
2 parents ca59a6c + c542d39
commit db072e7
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 5 deletions.
diff --git a/library/Zend/View/Helper/AbstractHelper.php b/library/Zend/View/Helper/AbstractHelper.php
@@ -9,7 +9,6 @@
 
 namespace Zend\View\Helper;
 
-use Zend\View\Helper\HelperInterface;
 use Zend\View\Renderer\RendererInterface as Renderer;
 
 abstract class AbstractHelper implements HelperInterface

diff --git a/library/Zend/View/Helper/FlashMessenger.php b/library/Zend/View/Helper/FlashMessenger.php
@@ -12,8 +12,6 @@
 use Zend\Mvc\Controller\Plugin\FlashMessenger as PluginFlashMessenger;
 use Zend\ServiceManager\ServiceLocatorAwareInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
-use Zend\View\Helper\AbstractHelper;
-use Zend\View\Helper\EscapeHtml;
 use Zend\I18n\View\Helper\AbstractTranslatorHelper;
 
 /**

diff --git a/library/Zend/View/Helper/Placeholder/Container/AbstractStandalone.php b/library/Zend/View/Helper/Placeholder/Container/AbstractStandalone.php
@@ -169,7 +169,6 @@ protected function escape($string)
         if ($this->getView() instanceof RendererInterface
             && method_exists($this->getView(), 'getEncoding')
         ) {
-            $enc     = $this->getView()->getEncoding();
             $escaper = $this->getView()->plugin('escapeHtml');
             return $escaper((string) $string);
         }

diff --git a/library/Zend/View/View.php b/library/Zend/View/View.php
@@ -182,7 +182,7 @@ public function render(Model $model)
         }
 
         $event->setRenderer($renderer);
-        $results = $events->trigger(ViewEvent::EVENT_RENDERER_POST, $event);
+        $events->trigger(ViewEvent::EVENT_RENDERER_POST, $event);
 
         // If EVENT_RENDERER or EVENT_RENDERER_POST changed the model, make sure
         // we use this new model instead of the current $model