Merge branch 'master' of git://git.zendframework.com/zf

zendframework · Sep 20, 2011 · 32d2e16 · 32d2e16
commit 32d2e16
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 10 deletions.
diff --git a/src/Adapter.php b/src/Adapter.php
@@ -52,7 +52,7 @@ public function generate();
      * @param  mixed $element
      * @return string
      */
-    public function render(\Zend\View\ViewEngine $view = null, $element = null);
+    public function render(\Zend\View\Renderer $view = null, $element = null);
 
     /**
      * Set captcha name

diff --git a/src/Dumb.php b/src/Dumb.php
@@ -45,7 +45,7 @@ class Dumb extends Word
      * @param  mixed $element
      * @return string
      */
-    public function render(\Zend\View\ViewEngine $view = null, $element = null)
+    public function render(\Zend\View\Renderer $view = null, $element = null)
     {
         return 'Please type this word backwards: <b>'
              . strrev($this->getWord())

diff --git a/src/Figlet.php b/src/Figlet.php
@@ -76,7 +76,7 @@ public function generate()
      * @param mixed $element
      * @return string
      */
-    public function render(\Zend\View\ViewEngine $view = null, $element = null)
+    public function render(\Zend\View\Renderer $view = null, $element = null)
     {
         return '<pre>'
              . $this->_figlet->render($this->getWord())

diff --git a/src/Image.php b/src/Image.php
@@ -624,7 +624,7 @@ protected function _gc()
      * @param mixed $element
      * @return string
      */
-    public function render(\Zend\View\ViewEngine $view = null, $element = null)
+    public function render(\Zend\View\Renderer $view = null, $element = null)
     {
         return '<img width="' . $this->getWidth() . '" height="' . $this->getHeight() . '" alt="' . $this->getImgAlt()
              . '" src="' . $this->getImgUrl() . $this->getId() . $this->getSuffix() . '" />';

diff --git a/src/ReCaptcha.php b/src/ReCaptcha.php
@@ -261,7 +261,7 @@ public function isValid($value, $context = null)
      * @param  mixed $element
      * @return string
      */
-    public function render(\Zend\View\ViewEngine $view = null, $element = null)
+    public function render(\Zend\View\Renderer $view = null, $element = null)
     {
         return $this->getService()->getHTML();
     }

diff --git a/test/DumbTest.php b/test/DumbTest.php
@@ -62,7 +62,7 @@ public function testRendersWordInReverse()
     {
         $id   = $this->captcha->generate('test');
         $word = $this->captcha->getWord();
-        $html = $this->captcha->render(new \Zend\View\View);
+        $html = $this->captcha->render(new \Zend\View\PhpRenderer);
         $this->assertContains(strrev($word), $html);
         $this->assertNotContains($word, $html);
     }

diff --git a/test/FigletTest.php b/test/FigletTest.php
@@ -23,7 +23,7 @@
  * @namespace
  */
 namespace ZendTest\Captcha;
-use Zend\View\View;
+use Zend\View\PhpRenderer as View;
 
 /**
  * @category   Zend
@@ -67,7 +67,6 @@ public function testCaptchaAdapterCreated()
     public function getView()
     {
         $view = new View();
-        $view->addHelperPath(__DIR__ . '/../../../../library/Zend/View/Helper');
         return $view;
     }
 

diff --git a/test/ImageTest.php b/test/ImageTest.php
@@ -23,7 +23,8 @@
  * @namespace
  */
 namespace ZendTest\Captcha;
-use Zend\View\View,
+
+use Zend\View\PhpRenderer as View,
     Zend\Captcha\Image;
 
 /**
@@ -106,7 +107,6 @@ protected function _getTmpDir()
     public function getView()
     {
         $view = new View;
-        $view->addHelperPath(__DIR__ . '/../../../../library/Zend/View/Helper');
         return $view;
     }