Merge branch 'hotfix/56' into develop

weierophinney · weierophinney · commit 00dfd496d218 · 2015-09-03T12:49:50.000-05:00
Forward port #56
diff --git a/test/ArrayInputTest.php b/test/ArrayInputTest.php
@@ -13,7 +13,6 @@
 use Zend\Filter;
 use Zend\InputFilter\ArrayInput;
 use Zend\InputFilter\Exception\InvalidArgumentException;
-use Zend\InputFilter\Input;
 use Zend\Validator;
 
 /**
diff --git a/test/InputTest.php b/test/InputTest.php
@@ -671,7 +671,7 @@ public function mixedValueProvider()
     }
 
     /**
-     * @return InputInterface|MockObject|
+     * @return InputInterface|MockObject
      */
     protected function createInputInterfaceMock()
     {
@@ -695,7 +695,7 @@ protected function createFilterChainMock()
     /**
      * @param null|bool $isValid If set stub isValid method for return the argument value.
      *
-     * @return MockObject|ValidatorChain
+     * @return ValidatorChain|MockObject
      */
     protected function createValidatorChainMock($isValid = null)
     {

Original file line number	Diff line number	Diff line change
`@@ -671,7 +671,7 @@ public function mixedValueProvider()`
`671`	`671`	`}`
`672`	`672`
`673`	`673`	`/**`
`674`		`- * @return InputInterface\|MockObject\|`
	`674`	`+ * @return InputInterface\|MockObject`
`675`	`675`	`*/`
`676`	`676`	`protected function createInputInterfaceMock()`
`677`	`677`	`{`
`@@ -695,7 +695,7 @@ protected function createFilterChainMock()`
`695`	`695`	`/**`
`696`	`696`	`* @param null\|bool $isValid If set stub isValid method for return the argument value.`
`697`	`697`	`*`
`698`		`- * @return MockObject\|ValidatorChain`
	`698`	`+ * @return ValidatorChain\|MockObject`
`699`	`699`	`*/`
`700`	`700`	`protected function createValidatorChainMock($isValid = null)`
`701`	`701`	`{`