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/3246' into develop
Browse files Browse the repository at this point in the history 
Close zendframework/zendframework#3246
  • Loading branch information
@weierophinney
weierophinney committed Dec 19, 2012
80 parents 779ae47 + 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 + 5ef112f + 7ea9722 + e951b83 + 37c7404 + e730f97 + 43752c5 + ba32611 + 7c15be9 + e3a9518 + cc9ba24 + e2fbb5c commit ecabb9a
Show file tree
Hide file tree
Showing 2 changed files with 90 additions and 41 deletions.
30 changes: 16 additions & 14 deletions src/FileInput.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,22 +51,24 @@ public function getAutoPrependUploadValidator()
*/
public function getValue()
{
$filter = $this->getFilterChain();
$value = (is_array($this->value) && isset($this->value['tmp_name']))
? $this->value['tmp_name'] : $this->value;
if (is_scalar($value) && $this->isValid) {
// Single file input
$value = $filter->filter($value);
} elseif (is_array($value)) {
// Multi file input (multiple attribute set)
$newValue = array();
foreach ($value as $multiFileData) {
$fileName = (is_array($multiFileData) && isset($multiFileData['tmp_name']))
? $multiFileData['tmp_name'] : $multiFileData;
$newValue[] = ($this->isValid) ? $filter->filter($fileName) : $fileName;
$value = $this->value;
if ($this->isValid && is_array($value)) {
$filter = $this->getFilterChain();
if (isset($value['tmp_name'])) {
// Single file input
$value = $filter->filter($value);
} else {
// Multi file input (multiple attribute set)
$newValue = array();
foreach ($value as $fileData) {
if (is_array($fileData) && isset($fileData['tmp_name'])) {
$newValue[] = $filter->filter($fileData);
}
}
$value = $newValue;
}
$value = $newValue;
}

return $value;
}

Expand Down
101 changes: 74 additions & 27 deletions test/FileInputTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,29 +86,36 @@ public function testValueIsNullByDefault()

public function testValueMayBeInjected()
{
$this->input->setValue(array('tmp_name' => 'bar'));
$this->assertEquals('bar', $this->input->getValue());
$value = array('tmp_name' => 'bar');
$this->input->setValue($value);
$this->assertEquals($value, $this->input->getValue());
}

public function testRetrievingValueFiltersTheValueOnlyAfterValidating()
{
$this->input->setValue(array('tmp_name' => 'bar'));
$filter = new Filter\StringToUpper();
$this->input->getFilterChain()->attach($filter);
$this->assertEquals('bar', $this->input->getValue());
$this->assertTrue($this->input->isValid());
$this->assertEquals('BAR', $this->input->getValue());
}

public function testCanFilterArrayOfFileData()
{
$value = array('tmp_name' => 'foo');
$value = array('tmp_name' => 'bar');
$this->input->setValue($value);
$filter = new Filter\StringToUpper();
$this->input->getFilterChain()->attach($filter);
$this->assertEquals('foo', $this->input->getValue());

$newValue = array('tmp_name' => 'foo');
$filterMock = $this->getMockBuilder('Zend\Filter\File\Rename')
->disableOriginalConstructor()
->getMock();
$filterMock->expects($this->any())
->method('filter')
->will($this->returnValue($newValue));

// Why not attach mocked filter directly?
// No worky without wrapping in a callback.
// Missing something in mock setup?
$this->input->getFilterChain()->attach(
function ($value) use ($filterMock) {
return $filterMock->filter($value);
}
);

$this->assertEquals($value, $this->input->getValue());
$this->assertTrue($this->input->isValid());
$this->assertEquals('FOO', $this->input->getValue());
$this->assertEquals($newValue, $this->input->getValue());
}

public function testCanFilterArrayOfMultiFileData()
Expand All @@ -119,11 +126,30 @@ public function testCanFilterArrayOfMultiFileData()
array('tmp_name' => 'baz'),
);
$this->input->setValue($values);
$filter = new Filter\StringToUpper();
$this->input->getFilterChain()->attach($filter);
$this->assertEquals(array('foo', 'bar', 'baz'), $this->input->getValue());

$newValue = array('tmp_name' => 'new');
$filterMock = $this->getMockBuilder('Zend\Filter\File\Rename')
->disableOriginalConstructor()
->getMock();
$filterMock->expects($this->any())
->method('filter')
->will($this->returnValue($newValue));

// Why not attach mocked filter directly?
// No worky without wrapping in a callback.
// Missing something in mock setup?
$this->input->getFilterChain()->attach(
function ($value) use ($filterMock) {
return $filterMock->filter($value);
}
);

$this->assertEquals($values, $this->input->getValue());
$this->assertTrue($this->input->isValid());
$this->assertEquals(array('FOO', 'BAR', 'BAZ'), $this->input->getValue());
$this->assertEquals(
array($newValue, $newValue, $newValue),
$this->input->getValue()
);
}

public function testCanRetrieveRawValue()
Expand Down Expand Up @@ -153,24 +179,45 @@ public function testIsValidReturnsTrueIfValidationChainSucceeds()

public function testValidationOperatesBeforeFiltering()
{
$this->input->setValue(array(
$badValue = array(
'tmp_name' => ' ' . __FILE__ . ' ',
'name' => 'foo',
'size' => 1,
'error' => 0,
));
$filter = new Filter\StringTrim();
$this->input->getFilterChain()->attach($filter);
);
$this->input->setValue($badValue);

$filteredValue = array('tmp_name' => 'new');
$filterMock = $this->getMockBuilder('Zend\Filter\File\Rename')
->disableOriginalConstructor()
->getMock();
$filterMock->expects($this->any())
->method('filter')
->will($this->returnValue($filteredValue));

// Why not attach mocked filter directly?
// No worky without wrapping in a callback.
// Missing something in mock setup?
$this->input->getFilterChain()->attach(
function ($value) use ($filterMock) {
return $filterMock->filter($value);
}
);

$validator = new Validator\File\Exists();
$this->input->getValidatorChain()->attach($validator);
$this->assertFalse($this->input->isValid());
$this->input->setValue(array(
$this->assertEquals($badValue, $this->input->getValue());

$goodValue = array(
'tmp_name' => __FILE__,
'name' => 'foo',
'size' => 1,
'error' => 0,
));
);
$this->input->setValue($goodValue);
$this->assertTrue($this->input->isValid());
$this->assertEquals($filteredValue, $this->input->getValue());
}

public function testGetMessagesReturnsValidationMessages()
Expand Down

0 comments on commit ecabb9a

Please sign in to comment.