Commit62ade6a

committed

Use Mime component to determine mime type for file validator

1 parentfd584bb commit62ade6aCopy full SHA for 62ade6a

File tree

-3

lines changed

-3

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,10 @@`
`13`	`13`
`14`	`14`	`useSymfony\Component\HttpFoundation\File\FileasFileObject;`
`15`	`15`	`useSymfony\Component\HttpFoundation\File\UploadedFile;`
	`16`	`+useSymfony\Component\Mime\MimeTypes;`
`16`	`17`	`useSymfony\Component\Validator\Constraint;`
`17`	`18`	`useSymfony\Component\Validator\ConstraintValidator;`
	`19`	`+useSymfony\Component\Validator\Exception\LogicException;`
`18`	`20`	`useSymfony\Component\Validator\Exception\UnexpectedTypeException;`
`19`	`21`	`useSymfony\Component\Validator\Exception\UnexpectedValueException;`
`20`	`22`
`@@ -170,12 +172,12 @@ public function validate($value, Constraint $constraint)`
`170`	`172`	`}`
`171`	`173`
`172`	`174`	`if ($constraint->mimeTypes) {`
`173`		`-if (!$valueinstanceof FileObject) {`
`174`		`-$value =newFileObject($value);`
	`175`	`+if (!class_exists(MimeTypes::class)) {`
	`176`	`+thrownewLogicException('You cannot validate the mime-type of files as the Mime component is not installed. Try running "composer require symfony/mime".');`
`175`	`177`	`}`
`176`	`178`
`177`	`179`	`$mimeTypes = (array)$constraint->mimeTypes;`
`178`		`-$mime =$value->getMimeType();`
	`180`	`+$mime =$valueinstanceof FileObject ?$value->getMimeType() : MimeTypes::getDefault()->guessMimeType($path);`
`179`	`181`
`180`	`182`	`foreach ($mimeTypesas$mimeType) {`
`181`	`183`	`if ($mimeType ===$mime) {`

Comments

(0)