Merge pull request #428 from Eye4web/validator-array_push-fix

Validator array push fix

Author: Danielss89

src/ZfcUser/Form/ChangeEmailFilter.php

@@ -22,7 +22,7 @@ public function __construct(AuthenticationOptionsInterface $options, $emailValid
         $identityFields = $options->getAuthIdentityFields();
         if ($identityFields == array('email')) {
             $validators = array('name' => 'EmailAddress');
-            array_push($validators, $identityParams['validators']);
+            array_push($identityParams['validators'], $validators);
         }
 
         $this->add($identityParams);

src/ZfcUser/Form/ChangePasswordFilter.php

@@ -18,7 +18,7 @@ public function __construct(AuthenticationOptionsInterface $options)
         $identityFields = $options->getAuthIdentityFields();
         if ($identityFields == array('email')) {
             $validators = array('name' => 'EmailAddress');
-            array_push($validators, $identityParams['validators']);
+            array_push($identityParams['validators'], $validators);
         }
 
         $this->add($identityParams);

tests/ZfcUserTest/Form/ChangeEmailFilterTest.php

@@ -21,7 +21,9 @@ public function testConstruct()
         $this->assertArrayHasKey('newIdentity', $inputs);
         $this->assertArrayHasKey('newIdentityVerify', $inputs);
 
-        $this->assertEquals(0, $inputs['identity']->getValidatorChain()->count());
+        $validators = $inputs['identity']->getValidatorChain()->getValidators();
+        $this->assertArrayHasKey('instance', $validators[0]);
+        $this->assertInstanceOf('\Zend\Validator\EmailAddress', $validators[0]['instance']);
     }
 
     /**
@@ -32,7 +34,7 @@ public function testConstructIdentityEmail($onlyEmail)
         $options = $this->getMock('ZfcUser\Options\ModuleOptions');
         $options->expects($this->once())
                 ->method('getAuthIdentityFields')
-                ->will($this->returnValue(array('email')));
+                ->will($this->returnValue(($onlyEmail) ? array('email') : array('username')));
 
         $validator = $this->getMockBuilder('ZfcUser\Validator\NoRecordExists')->disableOriginalConstructor()->getMock();
         $filter = new Filter($options, $validator);
@@ -47,11 +49,6 @@ public function testConstructIdentityEmail($onlyEmail)
         if ($onlyEmail === false) {
             $this->assertEquals(0, $inputs['identity']->getValidatorChain()->count());
         } else {
-            // @todo remove this test skip if #383 is fixed
-            if ($identity instanceof \Zend\InputFilter\Input && $identity->getValidatorChain()->count() == 0) {
-                $this->markTestSkipped("currently we have a bug in this validator, pls fix #383");
-            }
-
             // test email as identity
             $validators = $identity->getValidatorChain()->getValidators();
             $this->assertArrayHasKey('instance', $validators[0]);

tests/ZfcUserTest/Form/ChangePasswordFilterTest.php

@@ -21,7 +21,9 @@ public function testConstruct()
         $this->assertArrayHasKey('newCredential', $inputs);
         $this->assertArrayHasKey('newCredentialVerify', $inputs);
 
-        $this->assertEquals(0, $inputs['identity']->getValidatorChain()->count());
+        $validators = $inputs['identity']->getValidatorChain()->getValidators();
+        $this->assertArrayHasKey('instance', $validators[0]);
+        $this->assertInstanceOf('\Zend\Validator\EmailAddress', $validators[0]['instance']);
     }
 
     /**
@@ -32,7 +34,7 @@ public function testConstructIdentityEmail($onlyEmail)
         $options = $this->getMock('ZfcUser\Options\ModuleOptions');
         $options->expects($this->once())
                 ->method('getAuthIdentityFields')
-                ->will($this->returnValue($onlyEmail ? array('email') : array()));
+                ->will($this->returnValue($onlyEmail ? array('email') : array('username')));
 
         $filter = new Filter($options);
 
@@ -47,11 +49,6 @@ public function testConstructIdentityEmail($onlyEmail)
         if ($onlyEmail === false) {
             $this->assertEquals(0, $inputs['identity']->getValidatorChain()->count());
         } else {
-            // @todo remove this test skip if #383 is fixed
-            if ($identity instanceof \Zend\InputFilter\Input && $identity->getValidatorChain()->count() == 0) {
-                $this->markTestSkipped("currently we have a bug in this validator, pls fix #383");
-            }
-
             // test email as identity
             $validators = $identity->getValidatorChain()->getValidators();
             $this->assertArrayHasKey('instance', $validators[0]);