deblan-mirror/respect-validation
deblan-mirror/respect-validation
1
0
Fork 0
mirror of https://github.com/Respect/Validation.git synced 2024-06-04 14:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug with allOf message template

Browse source
This commit is contained in:
Alexandre Gaigalas 2012-04-08 22:27:25 -03:00
parent 78c0a9023a
commit 71f4af32a3
4 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
library/Respect/Validation/Exceptions/AbstractGroupedException.php
View file

@ -53,5 +53,4 @@ class AbstractGroupedException extends AbstractNestedException
else
return $parentTemplate;
}
}

8
library/Respect/Validation/Exceptions/AllOfException.php
View file

@ -7,12 +7,12 @@ class AllOfException extends AbstractGroupedException
public static $defaultTemplates = array(
self::MODE_DEFAULT => array(
self::NONE => 'All of the {{failed}} required rules must pass for {{name}}',
self::SOME => 'These {{failed}} rules must pass for {{name}}',
self::NONE => 'All of the required rules must pass for {{name}}',
self::SOME => 'These rules must pass for {{name}}',
),
self::MODE_NEGATIVE => array(
self::NONE => 'None of these {{failed}} rules must pass for {{name}}',
self::SOME => 'These {{failed}} rules must not pass for {{name}}',
self::NONE => 'None of these rules must pass for {{name}}',
self::SOME => 'These rules must not pass for {{name}}',
)
);

2
tests/library/Respect/Validation/Exceptions/AbstractNestedExceptionTest.php
View file

@ -82,7 +82,7 @@ class AbstractNestedExceptionTest extends \PHPUnit_Framework_TestCase
array('allOf', 'first_name.length')
);
$this->assertEquals($messages['allOf'],
'These 8 rules must pass for Validation Form');
'These rules must pass for Validation Form');
$this->assertEquals($messages['first_name_length'],
'"fiif" must have a length between 5 and 256');
}

2
tests/library/Respect/Validation/ValidatorTest.php
View file

@ -40,7 +40,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
try {
Validator::string()->length(1,15)->assert('');
} catch (\Exception $e) {
$this->assertEquals('\-These {{failed}} rules must pass for ""
$this->assertEquals('\-These rules must pass for ""
\-"" must have a length between 1 and 15', $e->getFullMessage());
}
}