Skip to content

Commit

Permalink
Merge pull request #120 from kdambekalns/bugfix/getuploadedimage-retu…
Browse files Browse the repository at this point in the history
…rn-type

BUGFIX: Allow ImageInterface to be returned in UploadedImageViewHelper
  • Loading branch information
daniellienert authored Aug 19, 2020
2 parents ae9c8c2 + e6beb93 commit d72f3e9
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions Classes/ViewHelpers/Form/UploadedImageViewHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use Neos\Flow\Property\PropertyMapper;
use Neos\FluidAdaptor\ViewHelpers\Form\AbstractFormFieldViewHelper;
use Neos\Media\Domain\Model\Image;
use Neos\Media\Domain\Model\ImageInterface;

/**
* This ViewHelper makes the specified Image object available for its
Expand Down Expand Up @@ -73,17 +74,17 @@ public function render(): string
* Returns a previously uploaded image.
* If errors occurred during property mapping for this property, NULL is returned
*
* @return Image
* @return ImageInterface
* @throws \Neos\Flow\Property\Exception
* @throws \Neos\Flow\Security\Exception
*/
protected function getUploadedImage(): ?Image
protected function getUploadedImage(): ?ImageInterface
{
if ($this->getMappingResultsForProperty()->hasErrors()) {
return null;
}
$image = $this->getPropertyValue();
if ($image instanceof Image) {
if ($image instanceof ImageInterface) {
return $image;
}
return $this->propertyMapper->convert($this->getValueAttribute(), Image::class);
Expand Down

0 comments on commit d72f3e9

Please sign in to comment.