From e6a8adb0e613639c8f53f3fa1cf1f991c35245b0 Mon Sep 17 00:00:00 2001 From: Marco Rieger Date: Mon, 9 Dec 2013 11:54:14 +0100 Subject: [PATCH 1/6] removed unused local variable --- .../View/Helper/Placeholder/Container/AbstractStandalone.php | 1 - 1 file changed, 1 deletion(-) diff --git a/library/Zend/View/Helper/Placeholder/Container/AbstractStandalone.php b/library/Zend/View/Helper/Placeholder/Container/AbstractStandalone.php index 5ab9ed67318..811ffddb56f 100644 --- 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); } From 579592c68aa9ebf9e296c37a39d483272792ae72 Mon Sep 17 00:00:00 2001 From: ins0 Date: Tue, 10 Dec 2013 01:06:09 +0100 Subject: [PATCH 2/6] removed unused namespace --- library/Zend/View/Helper/AbstractHelper.php | 1 - library/Zend/View/Helper/FlashMessenger.php | 2 -- 2 files changed, 3 deletions(-) diff --git a/library/Zend/View/Helper/AbstractHelper.php b/library/Zend/View/Helper/AbstractHelper.php index 6dce9330cb5..38fcec340d0 100644 --- 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 index 4af4c33a981..527900aecda 100644 --- 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; /** From c577252ff2521cdbec799b5fb552721df818e3a2 Mon Sep 17 00:00:00 2001 From: ins0 Date: Tue, 10 Dec 2013 01:06:35 +0100 Subject: [PATCH 3/6] removed unused return value --- library/Zend/View/View.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/Zend/View/View.php b/library/Zend/View/View.php index c2f4cb21dff..8e884992c62 100644 --- 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 From 9bc27da78a2735cd37ab0bc6b7ab9d8ac198c2f1 Mon Sep 17 00:00:00 2001 From: Marco Rieger Date: Mon, 9 Dec 2013 11:54:14 +0100 Subject: [PATCH 4/6] removed unused local variable --- .../View/Helper/Placeholder/Container/AbstractStandalone.php | 1 - 1 file changed, 1 deletion(-) diff --git a/library/Zend/View/Helper/Placeholder/Container/AbstractStandalone.php b/library/Zend/View/Helper/Placeholder/Container/AbstractStandalone.php index 5ab9ed67318..811ffddb56f 100644 --- 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); } From 008b749e198f3d5f949af33e17d1b384782256fe Mon Sep 17 00:00:00 2001 From: ins0 Date: Tue, 10 Dec 2013 01:06:09 +0100 Subject: [PATCH 5/6] removed unused namespace --- library/Zend/View/Helper/AbstractHelper.php | 1 - library/Zend/View/Helper/FlashMessenger.php | 2 -- 2 files changed, 3 deletions(-) diff --git a/library/Zend/View/Helper/AbstractHelper.php b/library/Zend/View/Helper/AbstractHelper.php index 6dce9330cb5..38fcec340d0 100644 --- 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 index 4af4c33a981..527900aecda 100644 --- 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; /** From 0b448a6913b0bb746ce6410f54d22aa63242784a Mon Sep 17 00:00:00 2001 From: ins0 Date: Tue, 10 Dec 2013 01:06:35 +0100 Subject: [PATCH 6/6] removed unused return value --- library/Zend/View/View.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/Zend/View/View.php b/library/Zend/View/View.php index c2f4cb21dff..8e884992c62 100644 --- 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