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

Commit 239be0f

Browse files
committed
added missing messageTemplates in ExcludeMimeType validator
1 parent 33f11ae commit 239be0f

File tree

2 files changed

+20
-0
lines changed

2 files changed

+20
-0
lines changed

src/File/ExcludeMimeType.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,15 @@ class ExcludeMimeType extends MimeType
2121
const NOT_DETECTED = 'fileExcludeMimeTypeNotDetected';
2222
const NOT_READABLE = 'fileExcludeMimeTypeNotReadable';
2323

24+
/**
25+
* @var array Error message templates
26+
*/
27+
protected $messageTemplates = [
28+
self::FALSE_TYPE => "File has an incorrect mimetype of '%type%'",
29+
self::NOT_DETECTED => "The mimetype could not be detected from the file",
30+
self::NOT_READABLE => "File is not readable or does not exist",
31+
];
32+
2433
/**
2534
* Returns true if the mimetype of the file does not matche the given ones. Also parts
2635
* of mimetypes can be checked. If you give for example "image" all image

test/File/ExcludeMimeTypeTest.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ public function testBasic($options, $isValidParam, $expected)
5151
$validator = new ExcludeMimeType($options);
5252
$validator->enableHeaderCheck();
5353
$this->assertEquals($expected, $validator->isValid($isValidParam));
54+
if (!$expected) {
55+
$this->assertArrayHasKey($validator::FALSE_TYPE, $validator->getMessages());
56+
$this->assertNotEmpty($validator->getMessages()[$validator::FALSE_TYPE]);
57+
}
5458
}
5559

5660
/**
@@ -137,6 +141,12 @@ public function testEmptyFileShouldReturnFalseAndDisplayNotFoundMessage()
137141

138142
$this->assertFalse($validator->isValid(''));
139143
$this->assertArrayHasKey(ExcludeMimeType::NOT_READABLE, $validator->getMessages());
144+
$this->assertNotEmpty($validator->getMessages()[ExcludeMimeType::NOT_READABLE]);
145+
}
146+
147+
public function testEmptyArrayFileShouldReturnFalseAdnDisplayNotFoundMessage()
148+
{
149+
$validator = new ExcludeMimeType();
140150

141151
$filesArray = [
142152
'name' => '',
@@ -148,6 +158,7 @@ public function testEmptyFileShouldReturnFalseAndDisplayNotFoundMessage()
148158

149159
$this->assertFalse($validator->isValid($filesArray));
150160
$this->assertArrayHasKey(ExcludeMimeType::NOT_READABLE, $validator->getMessages());
161+
$this->assertNotEmpty($validator->getMessages()[ExcludeMimeType::NOT_READABLE]);
151162
}
152163

153164
public function testIsValidRaisesExceptionWithArrayNotInFilesFormat()

0 commit comments

Comments
 (0)