Merge branch '5.0' into 5.1

neos · Mar 12, 2021 · 99c9400 · 99c9400
2 parents 08f1bcc + e04e788
commit 99c9400
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Classes/Core/Runtime/FormRuntime.php b/Classes/Core/Runtime/FormRuntime.php
@@ -181,7 +181,7 @@ protected function initializeFormStateFromRequest()
             $this->formState = new FormState();
         } else {
             $serializedFormState = $this->hashService->validateAndStripHmac($serializedFormStateWithHmac);
-            $this->formState = unserialize(base64_decode($serializedFormState), ['allowed_classes' => [FormState::class]]);
+            $this->formState = unserialize(base64_decode($serializedFormState), ['allowed_classes' => [FormState::class, \DateTime::class, \DateTimeImmutable::class]]);
         }
     }
 

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);