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

Commit

Permalink
Merge branch 'hotfix/5111' into develop
Browse files Browse the repository at this point in the history 
Forward port zendframework/zendframework#5111

Conflicts:
	tests/ZendTest/I18n/Translator/Loader/GettextTest.php
	tests/ZendTest/I18n/Translator/Loader/PhpArrayTest.php
  • Loading branch information
@weierophinney
weierophinney committed Oct 22, 2013
137 parents bb4175e + 265e07a + 7198368 + 1214d4a + 2a94048 + e55039d + b3e6575 + 28a083e + f57823e + 8e9d237 + 4eaa835 + 1d32d23 + bfc0ac0 + 0337874 + ac4e5a4 + 74ad4e1 + 8037ddd + c91b8cb + 442a604 + ce86130 + 6a17c00 + 3be35a1 + b101693 + 38a8855 + 2503264 + 1330305 + c63994b + 0cebe75 + 88437dd + 335a7e0 + 49f818c + 94c6248 + babc2b3 + c5537ad + a278174 + ee91e56 + f730475 + e954d31 + aa83987 + 4272527 + 760e014 + 8f9644f + 89ddc85 + ef5a070 + af19258 + 363ebe6 + 774ea64 + db99c7e + fb3727c + d8ea42f + a5c0289 + 9730940 + ebc1a56 + 1d8cf16 + 09b3859 + efe96d1 + acf177c + 7a7f261 + df4c86b + 4d14dd3 + d0b7057 + c858228 + 8855a3f + 956acc6 + 085a083 + 99b3987 + 59e9d17 + edd16d1 + 17ad876 + 401ed50 + f43d222 + 73ebfdd + da15c07 + 4652c73 + 6a7b288 + 93b11b3 + d67242e + be0deed + c16475f + 68c3d64 + 537f455 + e79de85 + 0cbbdec + 3e0855f + a7a27db + a851ed1 + 86bf6e9 + 9fcf3f0 + c6deb01 + 811568b + 7222979 + 61e594a + 3e10b67 + ecabb9a + 8cdd2bc + 779ae47 + 5ef112f + 7ea9722 + e951b83 + 37c7404 + e730f97 + 43752c5 + ba32611 + 7c15be9 + e3a9518 + cc9ba24 + 5fbd138 + 8bab1da + fa276b4 + 3615cdf + 663ba3c + f0e4074 + c39cf5f + bfa79e5 + 3951384 + 428584d + 9dccbe3 + bc78b89 + 918afd4 + 3ed20dd + 03fd3e7 + 105081b + a6837d0 + 45c4355 + ef30a66 + 06503d1 + 870c487 + 178c8e6 + 059662a + 022a3e8 + 2791c44 + e059c77 + 5011c6b + daa0af0 + 064e54f + 6d4c9af + 347844b commit 2595c1a
Show file tree
Hide file tree
Showing 2 changed files with 88 additions and 0 deletions.
44 changes: 44 additions & 0 deletions test/BaseInputFilterTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,13 +187,21 @@ public function dataSets()
*/
public function testCanValidateEntireDataset($dataset, $expected)
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

$filter = $this->getInputFilter();
$filter->setData($dataset);
$this->assertSame($expected, $filter->isValid());
}

public function testCanValidatePartialDataset()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

$filter = $this->getInputFilter();
$validData = array(
'foo' => ' bazbat ',
Expand All @@ -217,6 +225,10 @@ public function testCanValidatePartialDataset()

public function testCanRetrieveInvalidInputsOnFailedValidation()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

$filter = $this->getInputFilter();
$invalidData = array(
'foo' => ' bazbat ',
Expand All @@ -242,6 +254,10 @@ public function testCanRetrieveInvalidInputsOnFailedValidation()

public function testCanRetrieveValidInputsOnFailedValidation()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

$filter = $this->getInputFilter();
$invalidData = array(
'foo' => ' bazbat ',
Expand All @@ -268,6 +284,10 @@ public function testCanRetrieveValidInputsOnFailedValidation()

public function testValuesRetrievedAreFiltered()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

$filter = $this->getInputFilter();
$validData = array(
'foo' => ' bazbat ',
Expand Down Expand Up @@ -296,6 +316,10 @@ public function testValuesRetrievedAreFiltered()

public function testCanGetRawInputValues()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

$filter = $this->getInputFilter();
$validData = array(
'foo' => ' bazbat ',
Expand All @@ -315,6 +339,10 @@ public function testCanGetRawInputValues()

public function testCanGetValidationMessages()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

$filter = $this->getInputFilter();
$filter->get('baz')->setRequired(true);
$filter->get('nest')->get('baz')->setRequired(true);
Expand Down Expand Up @@ -621,6 +649,10 @@ public function testValidationMarksInputValidWhenAllowEmptyFlagIsTrueAndContinue

public function testCanRetrieveRawValuesIndividuallyWithoutValidating()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

$filter = $this->getInputFilter();
$data = array(
'foo' => ' bazbat ',
Expand All @@ -637,6 +669,10 @@ public function testCanRetrieveRawValuesIndividuallyWithoutValidating()

public function testCanRetrieveUnvalidatedButFilteredInputValue()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

$filter = $this->getInputFilter();
$data = array(
'foo' => ' baz 2 bat ',
Expand Down Expand Up @@ -671,6 +707,10 @@ public function testGetRequiredNotEmptyValidationMessages()
}
public function testHasUnknown()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

$filter = $this->getInputFilter();
$validData = array(
'foo' => ' bazbat ',
Expand All @@ -691,6 +731,10 @@ public function testHasUnknown()
}
public function testGetUknown()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

$filter = $this->getInputFilter();
$unknown = array(
'bar' => '12345',
Expand Down
44 changes: 44 additions & 0 deletions test/CollectionInputFilterTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,10 @@ public function testSetInputFilter()

public function testInputFilterInputsAppliedToCollection()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

$this->filter->setInputFilter($this->getBaseInputFilter());

$this->assertCount(4, $this->filter->getInputs());
Expand Down Expand Up @@ -158,13 +162,21 @@ public function testGetCountUsesSpecifiedCount()

public function testCanValidateValidData()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

$this->filter->setInputFilter($this->getBaseInputFilter());
$this->filter->setData($this->getValidCollectionData());
$this->assertTrue($this->filter->isValid());
}

public function testCanValidateValidDataWithNonConsecutiveKeys()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

$collectionData = $this->getValidCollectionData();
$collectionData[2] = $collectionData[0];
unset($collectionData[0]);
Expand All @@ -175,6 +187,10 @@ public function testCanValidateValidDataWithNonConsecutiveKeys()

public function testInvalidDataReturnsFalse()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

$invalidCollectionData = array(
array(
'foo' => ' bazbatlong ',
Expand All @@ -195,6 +211,10 @@ public function testInvalidDataReturnsFalse()

public function testDataLessThanCountIsInvalid()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

$invalidCollectionData = array(
array(
'foo' => ' bazbat ',
Expand All @@ -216,6 +236,10 @@ public function testDataLessThanCountIsInvalid()

public function testGetValues()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

$expectedData = array(
array(
'foo' => 'bazbat',
Expand Down Expand Up @@ -253,6 +277,10 @@ public function testGetValues()

public function testGetRawValues()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

$expectedData = array(
array(
'foo' => ' bazbat ',
Expand Down Expand Up @@ -285,6 +313,10 @@ public function testGetRawValues()

public function testGetMessagesForInvalidInputs()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

$invalidCollectionData = array(
array(
'foo' => ' bazbattoolong ',
Expand Down Expand Up @@ -327,6 +359,10 @@ public function testGetMessagesForInvalidInputs()

public function testSetValidationGroupUsingFormStyle()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

// forms set an array of identical validation groups for each set of data
$formValidationGroup = array(
array(
Expand Down Expand Up @@ -367,6 +403,10 @@ public function testSetValidationGroupUsingFormStyle()

public function testEmptyCollectionIsValidByDefault()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

$data = array();

$this->filter->setInputFilter($this->getBaseInputFilter());
Expand All @@ -377,6 +417,10 @@ public function testEmptyCollectionIsValidByDefault()

public function testEmptyCollectionIsNotValidIfRequired()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

$data = array();

$this->filter->setInputFilter($this->getBaseInputFilter());
Expand Down

0 comments on commit 2595c1a

Please # to comment.