TASK: Merge branch '5.0' into master

# Conflicts: # Classes/ViewHelpers/Form/UploadedImageViewHelper.php
neos · Aug 19, 2020 · 442a4a6 · 442a4a6
2 parents 3ba1c8d + d72f3e9
commit 442a4a6
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/Classes/ViewHelpers/Form/UploadedImageViewHelper.php b/Classes/ViewHelpers/Form/UploadedImageViewHelper.php
@@ -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
@@ -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);