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

Commit

Permalink
Merge branch 'hotfix/3837'
Browse files Browse the repository at this point in the history 
Close zendframework/zendframework#3837
Fixes zendframework/zendframework#3771
  • Loading branch information
@weierophinney
weierophinney committed Feb 20, 2013
92 parents 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 + 55a2974 commit 49a7844
Show file tree
Hide file tree
Showing 28 changed files with 351 additions and 31 deletions.
9 changes: 7 additions & 2 deletions src/File/Crc32.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,16 @@ public function addCrc32($options)
* Returns true if and only if the given file confirms the set hash
*
* @param string|array $value Filename to check for hash
* @param array $file File data from \Zend\File\Transfer\Transfer (optional)
* @return bool
*/
public function isValid($value)
public function isValid($value, $file = null)
{
if (is_array($value)) {
if (is_string($value) && is_array($file)) {
// Legacy Zend\Transfer API support
$filename = $file['name'];
$file = $file['tmp_name'];
} elseif (is_array($value)) {
if (!isset($value['tmp_name']) || !isset($value['name'])) {
throw new Exception\InvalidArgumentException(
'Value array must be in $_FILES format'
Expand Down
9 changes: 7 additions & 2 deletions src/File/ExcludeExtension.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,16 @@ class ExcludeExtension extends Extension
* set extension list
*
* @param string|array $value Real file to check for extension
* @param array $file File data from \Zend\File\Transfer\Transfer (optional)
* @return bool
*/
public function isValid($value)
public function isValid($value, $file = null)
{
if (is_array($value)) {
if (is_string($value) && is_array($file)) {
// Legacy Zend\Transfer API support
$filename = $file['name'];
$file = $file['tmp_name'];
} elseif (is_array($value)) {
if (!isset($value['tmp_name']) || !isset($value['name'])) {
throw new Exception\InvalidArgumentException(
'Value array must be in $_FILES format'
Expand Down
10 changes: 8 additions & 2 deletions src/File/ExcludeMimeType.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,17 @@ class ExcludeMimeType extends MimeType
* mime types will not be accepted like "image/gif", "image/jpeg" and so on.
*
* @param string|array $value Real file to check for mimetype
* @param array $file File data from \Zend\File\Transfer\Transfer (optional)
* @return bool
*/
public function isValid($value)
public function isValid($value, $file = null)
{
if (is_array($value)) {
if (is_string($value) && is_array($file)) {
// Legacy Zend\Transfer API support
$filename = $file['name'];
$filetype = $file['type'];
$file = $file['tmp_name'];
} elseif (is_array($value)) {
if (!isset($value['tmp_name']) || !isset($value['name']) || !isset($value['type'])) {
throw new Exception\InvalidArgumentException(
'Value array must be in $_FILES format'
Expand Down
10 changes: 8 additions & 2 deletions src/File/Exists.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,17 @@ public function addDirectory($directory)
* Returns true if and only if the file already exists in the set directories
*
* @param string|array $value Real file to check for existence
* @param array $file File data from \Zend\File\Transfer\Transfer (optional)
* @return bool
*/
public function isValid($value)
public function isValid($value, $file = null)
{
if (is_array($value)) {
if (is_string($value) && is_array($file)) {
// Legacy Zend\Transfer API support
$filename = $file['name'];
$file = $file['tmp_name'];
$this->setValue($filename);
} elseif (is_array($value)) {
if (!isset($value['tmp_name']) || !isset($value['name'])) {
throw new Exception\InvalidArgumentException(
'Value array must be in $_FILES format'
Expand Down
9 changes: 7 additions & 2 deletions src/File/Extension.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,11 +171,16 @@ public function addExtension($extension)
* set extension list
*
* @param string|array $value Real file to check for extension
* @param array $file File data from \Zend\File\Transfer\Transfer (optional)
* @return bool
*/
public function isValid($value)
public function isValid($value, $file = null)
{
if (is_array($value)) {
if (is_string($value) && is_array($file)) {
// Legacy Zend\Transfer API support
$filename = $file['name'];
$file = $file['tmp_name'];
} elseif (is_array($value)) {
if (!isset($value['tmp_name']) || !isset($value['name'])) {
throw new Exception\InvalidArgumentException(
'Value array must be in $_FILES format'
Expand Down
9 changes: 7 additions & 2 deletions src/File/Hash.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,16 @@ public function addHash($options)
* Returns true if and only if the given file confirms the set hash
*
* @param string|array $value File to check for hash
* @param array $file File data from \Zend\File\Transfer\Transfer (optional)
* @return bool
*/
public function isValid($value)
public function isValid($value, $file = null)
{
if (is_array($value)) {
if (is_string($value) && is_array($file)) {
// Legacy Zend\Transfer API support
$filename = $file['name'];
$file = $file['tmp_name'];
} elseif (is_array($value)) {
if (!isset($value['tmp_name']) || !isset($value['name'])) {
throw new Exception\InvalidArgumentException(
'Value array must be in $_FILES format'
Expand Down
9 changes: 7 additions & 2 deletions src/File/ImageSize.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -319,11 +319,16 @@ public function setImageHeight($options)
* not bigger than max
*
* @param string|array $value Real file to check for image size
* @param array $file File data from \Zend\File\Transfer\Transfer (optional)
* @return bool
*/
public function isValid($value)
public function isValid($value, $file = null)
{
if (is_array($value)) {
if (is_string($value) && is_array($file)) {
// Legacy Zend\Transfer API support
$filename = $file['name'];
$file = $file['tmp_name'];
} elseif (is_array($value)) {
if (!isset($value['tmp_name']) || !isset($value['name'])) {
throw new Exception\InvalidArgumentException(
'Value array must be in $_FILES format'
Expand Down
9 changes: 7 additions & 2 deletions src/File/Md5.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,16 @@ public function addMd5($options)
* Returns true if and only if the given file confirms the set hash
*
* @param string|array $value Filename to check for hash
* @param array $file File data from \Zend\File\Transfer\Transfer (optional)
* @return bool
*/
public function isValid($value)
public function isValid($value, $file = null)
{
if (is_array($value)) {
if (is_string($value) && is_array($file)) {
// Legacy Zend\Transfer API support
$filename = $file['name'];
$file = $file['tmp_name'];
} elseif (is_array($value)) {
if (!isset($value['tmp_name']) || !isset($value['name'])) {
throw new Exception\InvalidArgumentException(
'Value array must be in $_FILES format'
Expand Down
10 changes: 8 additions & 2 deletions src/File/MimeType.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -342,11 +342,17 @@ public function addMimeType($mimetype)
* mime types will be accepted like "image/gif", "image/jpeg" and so on.
*
* @param string|array $value Real file to check for mimetype
* @param array $file File data from \Zend\File\Transfer\Transfer (optional)
* @return bool
*/
public function isValid($value)
public function isValid($value, $file = null)
{
if (is_array($value)) {
if (is_string($value) && is_array($file)) {
// Legacy Zend\Transfer API support
$filename = $file['name'];
$filetype = $file['type'];
$file = $file['tmp_name'];
} elseif (is_array($value)) {
if (!isset($value['tmp_name']) || !isset($value['name']) || !isset($value['type'])) {
throw new Exception\InvalidArgumentException(
'Value array must be in $_FILES format'
Expand Down
10 changes: 8 additions & 2 deletions src/File/NotExists.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,17 @@ class NotExists extends Exists
* Returns true if and only if the file does not exist in the set destinations
*
* @param string|array $value Real file to check for existence
* @param array $file File data from \Zend\File\Transfer\Transfer (optional)
* @return bool
*/
public function isValid($value)
public function isValid($value, $file = null)
{
if (is_array($value)) {
if (is_string($value) && is_array($file)) {
// Legacy Zend\Transfer API support
$filename = $file['name'];
$file = $file['tmp_name'];
$this->setValue($filename);
} elseif (is_array($value)) {
if (!isset($value['tmp_name']) || !isset($value['name'])) {
throw new Exception\InvalidArgumentException(
'Value array must be in $_FILES format'
Expand Down
9 changes: 7 additions & 2 deletions src/File/Sha1.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,16 @@ public function addSha1($options)
* Returns true if and only if the given file confirms the set hash
*
* @param string $value|array Filename to check for hash
* @param array $file File data from \Zend\File\Transfer\Transfer (optional)
* @return bool
*/
public function isValid($value)
public function isValid($value, $file = null)
{
if (is_array($value)) {
if (is_string($value) && is_array($file)) {
// Legacy Zend\Transfer API support
$filename = $file['name'];
$file = $file['tmp_name'];
} elseif (is_array($value)) {
if (!isset($value['tmp_name']) || !isset($value['name'])) {
throw new Exception\InvalidArgumentException(
'Value array must be in $_FILES format'
Expand Down
9 changes: 7 additions & 2 deletions src/File/Size.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,11 +229,16 @@ protected function setSize($size)
* not bigger than max (when max is not null).
*
* @param string|array $value File to check for size
* @param array $file File data from \Zend\File\Transfer\Transfer (optional)
* @return bool
*/
public function isValid($value)
public function isValid($value, $file = null)
{
if (is_array($value)) {
if (is_string($value) && is_array($file)) {
// Legacy Zend\Transfer API support
$filename = $file['name'];
$file = $file['tmp_name'];
} elseif (is_array($value)) {
if (!isset($value['tmp_name']) || !isset($value['name'])) {
throw new Exception\InvalidArgumentException(
'Value array must be in $_FILES format'
Expand Down
11 changes: 8 additions & 3 deletions src/File/WordCount.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,12 +166,17 @@ public function setMax($max)
* Returns true if and only if the counted words are at least min and
* not bigger than max (when max is not null).
*
* @param string $value|array Filename to check for word count
* @param string|array $value Filename to check for word count
* @param array $file File data from \Zend\File\Transfer\Transfer (optional)
* @return bool
*/
public function isValid($value)
public function isValid($value, $file = null)
{
if (is_array($value)) {
if (is_string($value) && is_array($file)) {
// Legacy Zend\Transfer API support
$filename = $file['name'];
$file = $file['tmp_name'];
} elseif (is_array($value)) {
if (!isset($value['tmp_name']) || !isset($value['name'])) {
throw new Exception\InvalidArgumentException(
'Value array must be in $_FILES format'
Expand Down
17 changes: 17 additions & 0 deletions test/File/Crc32Test.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,23 @@ public function testBasic($options, $isValidParam, $expected, $messageKey)
}
}

/**
* Ensures that the validator follows expected behavior for legacy Zend\Transfer API
*
* @dataProvider basicBehaviorDataProvider
* @return void
*/
public function testLegacy($options, $isValidParam, $expected, $messageKey)
{
if (is_array($isValidParam)) {
$validator = new File\Crc32($options);
$this->assertEquals($expected, $validator->isValid($isValidParam['tmp_name'], $isValidParam));
if (!$expected) {
$this->assertTrue(array_key_exists($messageKey, $validator->getMessages()));
}
}
}

/**
* Ensures that getCrc32() returns expected value
*
Expand Down
17 changes: 17 additions & 0 deletions test/File/ExcludeExtensionTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,23 @@ public function testBasic($options, $isValidParam, $expected, $messageKey)
}
}

/**
* Ensures that the validator follows expected behavior for legacy Zend\Transfer API
*
* @dataProvider basicBehaviorDataProvider
* @return void
*/
public function testLegacy($options, $isValidParam, $expected, $messageKey)
{
if (is_array($isValidParam)) {
$validator = new File\ExcludeExtension($options);
$this->assertEquals($expected, $validator->isValid($isValidParam['tmp_name'], $isValidParam));
if (!$expected) {
$this->assertTrue(array_key_exists($messageKey, $validator->getMessages()));
}
}
}

public function testCaseTesting()
{
$files = array(
Expand Down
15 changes: 15 additions & 0 deletions test/File/ExcludeMimeTypeTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,21 @@ public function testBasic($options, $isValidParam, $expected)
$this->assertEquals($expected, $validator->isValid($isValidParam));
}

/**
* Ensures that the validator follows expected behavior for legacy Zend\Transfer API
*
* @dataProvider basicBehaviorDataProvider
* @return void
*/
public function testLegacy($options, $isValidParam, $expected)
{
if (is_array($isValidParam)) {
$validator = new ExcludeMimeType($options);
$validator->enableHeaderCheck();
$this->assertEquals($expected, $validator->isValid($isValidParam['tmp_name'], $isValidParam));
}
}

/**
* Ensures that getMimeType() returns expected value
*
Expand Down
14 changes: 14 additions & 0 deletions test/File/ExistsTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,20 @@ public function testBasic($options, $isValidParam, $expected)
$this->assertEquals($expected, $validator->isValid($isValidParam));
}

/**
* Ensures that the validator follows expected behavior for legacy Zend\Transfer API
*
* @dataProvider basicBehaviorDataProvider
* @return void
*/
public function testLegacy($options, $isValidParam, $expected)
{
if (is_array($isValidParam)) {
$validator = new File\Exists($options);
$this->assertEquals($expected, $validator->isValid($isValidParam['tmp_name'], $isValidParam));
}
}

/**
* Ensures that getDirectory() returns expected value
*
Expand Down
17 changes: 17 additions & 0 deletions test/File/ExtensionTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,23 @@ public function testBasic($options, $isValidParam, $expected, $messageKey)
}
}

/**
* Ensures that the validator follows expected behavior for legacy Zend\Transfer API
*
* @dataProvider basicBehaviorDataProvider
* @return void
*/
public function testLegacy($options, $isValidParam, $expected, $messageKey)
{
if (is_array($isValidParam)) {
$validator = new File\Extension($options);
$this->assertEquals($expected, $validator->isValid($isValidParam['tmp_name'], $isValidParam));
if (!$expected) {
$this->assertTrue(array_key_exists($messageKey, $validator->getMessages()));
}
}
}

/**
* @return void
*/
Expand Down
17 changes: 17 additions & 0 deletions test/File/HashTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,23 @@ public function testBasic($options, $isValidParam, $expected, $messageKey)
}
}

/**
* Ensures that the validator follows expected behavior for legacy Zend\Transfer API
*
* @dataProvider basicBehaviorDataProvider
* @return void
*/
public function testLegacy($options, $isValidParam, $expected, $messageKey)
{
if (is_array($isValidParam)) {
$validator = new File\Hash($options);
$this->assertEquals($expected, $validator->isValid($isValidParam['tmp_name'], $isValidParam));
if (!$expected) {
$this->assertTrue(array_key_exists($messageKey, $validator->getMessages()));
}
}
}

/**
* Ensures that getHash() returns expected value
*
Expand Down
Loading

0 comments on commit 49a7844

Please sign in to comment.