Resolved merge conflicts from commit a8eda2d

zendframework · Jun 20, 2013 · 4e70e6c · 4e70e6c
commit 4e70e6c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/BaseInputFilter.php b/src/BaseInputFilter.php
@@ -18,7 +18,10 @@
  * @todo       How should we deal with required input when data is missing?
  *             should a message be returned? if so, what message?
  */
-class BaseInputFilter implements InputFilterInterface, UnknownInputsCapableInterface, InitializableInterface
+class BaseInputFilter implements
+    InputFilterInterface,
+    UnknownInputsCapableInterface,
+    InitializableInterface
 {
     protected $data;
     protected $inputs = array();

diff --git a/src/Input.php b/src/Input.php
@@ -13,7 +13,9 @@
 use Zend\Validator\NotEmpty;
 use Zend\Validator\ValidatorChain;
 
-class Input implements InputInterface, EmptyContextInterface
+class Input implements
+    InputInterface,
+    EmptyContextInterface
 {
     /**
      * @var bool