Forward port zendframework/zendframework#5672

Conflicts: library/Zend/EventManager/EventManagerAwareTrait.php library/Zend/Form/View/Helper/FormRow.php library/Zend/I18n/Translator/TranslatorAwareTrait.php library/Zend/Stdlib/Hydrator/AbstractHydrator.php tests/.php_cs tests/ZendTest/Loader/AutoloadDoesNotHideParseError.php tests/ZendTest/Loader/AutoloadableClass.php tests/ZendTest/Loader/MyLoader.php tests/ZendTest/Loader/MyOverloader.php tests/ZendTest/Loader/TestAsset/UnMappedClass.php tests/ZendTest/Version/VersionTest.php tests/ZendTest/View/_stubs/FilterDir1/Foo.php tests/ZendTest/View/_stubs/HelperDir1/Stub1.php tests/ZendTest/View/_stubs/HelperDir1/StubEmpty.php tests/ZendTest/View/_stubs/HelperDir2/Datetime.php tests/ZendTest/View/_stubs/HelperDir2/Stub1.php tests/ZendTest/View/_stubs/HelperDir2/Stub2.php
zendframework · Jan 4, 2014 · 008b63c · 008b63c
commit 008b63c
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/src/DateStep.php b/src/DateStep.php
@@ -14,7 +14,6 @@
 use DateTimeZone;
 use Traversable;
 use Zend\Stdlib\ArrayUtils;
-use Zend\Validator\Exception;
 
 class DateStep extends Date
 {

diff --git a/src/Iban.php b/src/Iban.php
@@ -11,8 +11,6 @@
 
 use Traversable;
 use Zend\Stdlib\ArrayUtils;
-use Zend\Validator\AbstractValidator;
-use Zend\Validator\Exception;
 
 /**
  * Validates IBAN Numbers (International Bank Account Numbers)

diff --git a/test/IbanTest.php b/test/IbanTest.php
@@ -7,7 +7,7 @@
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
-namespace ZendTest\I18n\Validator;
+namespace ZendTest\Validator;
 
 use Zend\Validator\Iban as IbanValidator;