Merge branch 'hotfix/4699'

Close zendframework/zendframework#4699
zendframework · Jun 28, 2013 · 1b9fd60 · 1b9fd60
commit 1b9fd60
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/Helper/Cycle.php b/src/Helper/Cycle.php
@@ -9,13 +9,16 @@
 
 namespace Zend\View\Helper;
 
+use Iterator;
+
 /**
  * Helper for alternating between set of values
  */
-class Cycle extends AbstractHelper implements \Iterator
+class Cycle extends AbstractHelper implements Iterator
 {
     /**
      * Default name
+     *
      * @var string
      */
     const DEFAULT_NAME = 'default';
@@ -180,9 +183,9 @@ public function key()
     {
         if ($this->pointers[$this->name] < 0) {
             return 0;
-        } else {
-            return $this->pointers[$this->name];
         }
+
+        return $this->pointers[$this->name];
     }
 
     /**

diff --git a/src/Helper/Placeholder/Container/AbstractContainer.php b/src/Helper/Placeholder/Container/AbstractContainer.php
@@ -9,12 +9,13 @@
 
 namespace Zend\View\Helper\Placeholder\Container;
 
+use ArrayObject;
 use Zend\View\Exception;
 
 /**
  * Abstract class representing container for placeholder values
  */
-abstract class AbstractContainer extends \ArrayObject
+abstract class AbstractContainer extends ArrayObject
 {
     /**
      * Whether or not to override all contents of placeholder