Skip to content
This repository has been archived by the owner on Jan 31, 2020. It is now read-only.

Commit

Permalink
Merge pull request zendframework/zendframework#5808 from samsonasik/f…
Browse files Browse the repository at this point in the history
…ix/multiple-invalid-explodevalidator

Fixes zendframework/zendframework#5796
  • Loading branch information
weierophinney committed Mar 4, 2014
152 parents 6546999 + 4d6040d + 56df441 + 3ddc8fa + 274bd7f + c9e433d + 99f6515 + 8d1a271 + 2c2bc35 + 16359e3 + 10b9b3c + d05ac01 + 9628c66 + 66c8763 + 943d333 + 8342f70 + 4eb4184 + 4ea0bc2 + 860b725 + 7d29287 + 49a7844 + 3836aa0 + de1fe83 + 929eb12 + 6e6902f + f823467 + f3b3f76 + 93aff47 + 5f2adec + 7674ec8 + 2200ed2 + f033c86 + d43a2da + 4434323 + 88b21e1 + b02b602 + b692de7 + 7f833d2 + 2eaf4da + a7848de + 5bd9f85 + d7a26e8 + 173f53d + bd77e8e + 45f017e + 118612c + 3a09f79 + 47d92bc + dbf56ad + a753b61 + 6467186 + 5ac4124 + 2bf68ca + e7cd709 + 7a552db + f112e0c + cec42fc + 066eb37 + 3569d8b + 00def10 + ecae47b + 0e552a5 + 4f854c2 + 2b17650 + c1c0447 + 73b1f80 + dd4a335 + a40eb42 + 9262db1 + bdbd950 + 6d50117 + 10b08a7 + f692a0d + ebe63d3 + 528260b + 5f04a7f + c0dcd12 + 224f280 + 8785f25 + 866539b + d711927 + e280213 + 002f0d4 + 5ffcbbe + 8937705 + 5803840 + 3d7cd9a + 6b14f0e + 24bd169 + 0eba870 + 4e4acfe + 9e243bd + e156354 + 2a84563 + 3f1f758 + 4e425f4 + 7030f97 + ea08a0f + 213ebd9 + 5d80740 + 800c29c + be31ff1 + 8f989d6 + 8b02a8b + 4cfd82c + c411f06 + 4229561 + b321e3b + 2e660f9 + 3fff65f + a2eb7bf + 82469ff + 22fa741 + 99819cb + 8c16404 + a7c0820 + 7d277af + da0bec5 + 33f214a + a07f208 + 963d2fe + 1100f88 + 6713bf5 + 7421758 + b64a638 + 772a2a1 + dff3231 + 56bc4ca + 463e3d7 + 14bd316 + f8b9e58 + ef0268c + 3fe91ce + 130da19 + 6d4097d + 02fa5b3 + 927b7df + 2fbc2a0 + c772270 + 1cdc0cc + 852db9e + 047576f + 1b49389 + d7193b9 + 3fed016 + 082acdb + ecb5260 + 3ec34d8 + 838bdc9 + 3c0e07f + 6ac386b + a44aa87 commit a446e88
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/AbstractValidator.php
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public function setOptions($options = array())
*/
public function getMessages()
{
return array_unique($this->abstractOptions['messages']);
return array_unique($this->abstractOptions['messages'], SORT_REGULAR);
}

/**
Expand Down
22 changes: 22 additions & 0 deletions test/ExplodeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
namespace ZendTest\Validator;

use Zend\Validator\Explode;
use Zend\Validator\EmailAddress;

/**
* @group Zend_Validator
Expand Down Expand Up @@ -129,4 +130,25 @@ public function testSetValidatorInvalidParam()
$validator = new Explode();
$validator->setValidator('inarray');
}

/**
* @group ZF2-5796
*/
public function testGetMessagesMultipleInvalid()
{
$validator = new Explode(array(
'validator' => new EmailAddress,
'valueDelimiter' => ',',
'breakOnFirstFailure' => true,
));

$messages = array(
0 => array(
'emailAddressInvalidFormat' => 'The input is not a valid email address. Use the basic format local-part@hostname',
),
);

$this->assertFalse($validator->isValid('zf-devteam@zend.com,abc,defghij'));
$this->assertEquals($messages, $validator->getMessages());
}
}

0 comments on commit a446e88

Please sign in to comment.