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

Commit

Permalink
Making sure this branch isn't behind master
Browse files Browse the repository at this point in the history 
Merge remote-tracking branch 'zf2/master' into fix#3373
  • Loading branch information
@bartmcleod
bartmcleod committed Mar 26, 2013
106 parents 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 + 3ed20dd commit 918afd4
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 20 deletions.
15 changes: 9 additions & 6 deletions src/BaseInputFilter.php
View file
Expand Up @@ -159,6 +159,14 @@ public function isValid()
$inputs = $this->validationGroup ?: array_keys($this->inputs);
foreach ($inputs as $name) {
$input = $this->inputs[$name];
if ((!array_key_exists($name, $this->data)
|| (null === $this->data[$name]))
&& $input instanceof InputInterface
&& !$input->isRequired()
) {
$this->validInputs[$name] = $input;
continue;
}
if (!array_key_exists($name, $this->data)
|| (null === $this->data[$name])
|| (is_string($this->data[$name]) && strlen($this->data[$name]) === 0)
Expand All @@ -170,19 +178,14 @@ public function isValid()
&& isset($this->data[$name][0]['error']) && $this->data[$name][0]['error'] === UPLOAD_ERR_NO_FILE)
) {
if ($input instanceof InputInterface) {
// - test if input is required
if (!$input->isRequired()) {
$this->validInputs[$name] = $input;
continue;
}
// - test if input allows empty
if ($input->allowEmpty()) {
$this->validInputs[$name] = $input;
continue;
}
}
// make sure we have a value (empty) for validation
$this->data[$name] = '';
$this->data[$name] = null;
}

if ($input instanceof InputFilterInterface) {
Expand Down
63 changes: 49 additions & 14 deletions test/BaseInputFilterTest.php
View file
Expand Up @@ -85,9 +85,15 @@ public function getInputFilter()
$baz->getFilterChain()->attachByName('stringtrim');
$baz->getValidatorChain()->attach(new Validator\StringLength(1, 6));

$qux = new Input();
$qux->setAllowEmpty(true);
$qux->getFilterChain()->attachByName('stringtrim');
$qux->getValidatorChain()->attach(new Validator\StringLength(5, 6));

$filter->add($foo, 'foo')
->add($bar, 'bar')
->add($baz, 'baz')
->add($qux, 'qux')
->add($this->getChildInputFilter(), 'nest');

return $filter;
Expand Down Expand Up @@ -123,20 +129,48 @@ public function testCanValidateEntireDataset()
$validData = array(
'foo' => ' bazbat ',
'bar' => '12345',
'baz' => '',
'baz' => null,
'qux' => '',
'nest' => array(
'foo' => ' bazbat ',
'bar' => '12345',
'baz' => '',
'baz' => null,
),
);
$filter->setData($validData);
$this->assertTrue($filter->isValid());

$filter = $this->getInputFilter();
$validData = array(
'foo' => ' bazbat ',
'bar' => '12345',
'qux' => '',
'nest' => array(
'foo' => ' bazbat ',
'bar' => '12345',
),
);
$filter->setData($validData);
$this->assertTrue($filter->isValid());

$invalidData = array(
'foo' => ' bazbat ',
'bar' => '12345',
'baz' => '',
'nest' => array(
'foo' => ' bazbat ',
'bar' => '12345',
'baz' => '',
),
);
$filter->setData($invalidData);
$this->assertFalse($filter->isValid());

$invalidData = array(
'foo' => ' baz bat ',
'bar' => 'abc45',
'baz' => ' ',
'qux' => ' ',
'nest' => array(
'foo' => ' baz bat ',
'bar' => '123ab',
Expand Down Expand Up @@ -227,23 +261,23 @@ public function testValuesRetrievedAreFiltered()
$validData = array(
'foo' => ' bazbat ',
'bar' => '12345',
'baz' => '',
'qux' => '',
'nest' => array(
'foo' => ' bazbat ',
'bar' => '12345',
'baz' => '',
),
);
$filter->setData($validData);
$this->assertTrue($filter->isValid());
$expected = array(
'foo' => 'bazbat',
'bar' => '12345',
'baz' => '',
'baz' => null,
'qux' => '',
'nest' => array(
'foo' => 'bazbat',
'bar' => '12345',
'baz' => '',
'baz' => null,
),
);
$this->assertEquals($expected, $filter->getValues());
Expand All @@ -255,11 +289,12 @@ public function testCanGetRawInputValues()
$validData = array(
'foo' => ' bazbat ',
'bar' => '12345',
'baz' => '',
'baz' => null,
'qux' => '',
'nest' => array(
'foo' => ' bazbat ',
'bar' => '12345',
'baz' => '',
'baz' => null,
),
);
$filter->setData($validData);
Expand Down Expand Up @@ -415,13 +450,13 @@ public function testValidationSkipsFieldsMarkedNotRequiredWhenNoDataPresent()
$this->assertTrue($filter->isValid());
}

public function testValidationSkipsFileInputsMarkedNotRequiredWhenNoFileDataIsPresent()
public function testValidationSkipsFileInputsMarkedAllowEmptyWhenNoFileDataIsPresent()
{
$filter = new InputFilter();

$foo = new FileInput();
$foo->getValidatorChain()->attach(new Validator\File\UploadFile());
$foo->setRequired(false);
$foo->setAllowEmpty(true);

$filter->add($foo, 'foo');

Expand All @@ -438,16 +473,16 @@ public function testValidationSkipsFileInputsMarkedNotRequiredWhenNoFileDataIsPr
$this->assertTrue($filter->isValid());

// Negative test
$foo->setRequired(true);
$foo->setAllowEmpty(false);
$filter->setData($data);
$this->assertFalse($filter->isValid());
}

public function testValidationSkipsFileInputsMarkedNotRequiredWhenNoMultiFileDataIsPresent()
public function testValidationSkipsFileInputsMarkedAllowEmptyWhenNoMultiFileDataIsPresent()
{
$filter = new InputFilter();
$foo = new FileInput();
$foo->setRequired(false);
$foo->setAllowEmpty(true);
$filter->add($foo, 'foo');

$data = array(
Expand All @@ -463,7 +498,7 @@ public function testValidationSkipsFileInputsMarkedNotRequiredWhenNoMultiFileDat
$this->assertTrue($filter->isValid());

// Negative test
$foo->setRequired(true);
$foo->setAllowEmpty(false);
$filter->setData($data);
$this->assertFalse($filter->isValid());
}
Expand Down

0 comments on commit 918afd4

Please sign in to comment.