Resolved merge conflicts from commit 83ba3cf

zendframework · Jun 20, 2013 · 2791c44 · 2791c44
1 parent 4e70e6c
commit 2791c44
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/src/BaseInputFilter.php b/src/BaseInputFilter.php
@@ -18,10 +18,7 @@
  * @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,9 +13,7 @@
 use Zend\Validator\NotEmpty;
 use Zend\Validator\ValidatorChain;
 
-class Input implements
-    InputInterface,
-    EmptyContextInterface
+class Input implements InputInterface, EmptyContextInterface
 {
     /**
      * @var bool