Merge branch 'zendStudioDLTKProblems' of /~https://github.com/marc-mabe…

…/zf2 into hotfix/coding-standards Conflicts: library/Zend/Mvc/Controller/ActionController.php library/Zend/Mvc/Controller/RestfulController.php
zendframework · Feb 22, 2012 · c5340fc · c5340fc
commit c5340fc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/AbstractValidator.php b/src/AbstractValidator.php
@@ -112,7 +112,7 @@ public function getOption($option)
         }
 
         if (isset($this->options) && array_key_exists($option, $this->options)) {
-            return $this->options[$options];
+            return $this->options[$option];
         }
 
         throw new InvalidArgumentException("Invalid option '$option'");

diff --git a/src/Ip.php b/src/Ip.php
@@ -23,6 +23,8 @@
  */
 namespace Zend\Validator;
 
+use Traversable;
+
 /**
  * @uses       \Zend\Validator\AbstractValidator
  * @uses       \Zend\Validator\Exception
@@ -76,7 +78,7 @@ public function __construct($options = array())
 
         $options += $this->_options;
         $this->setOptions($options);
-        
+
         parent::__construct();
     }