Merge remote-tracking branch 'origin/master' into upgrade-sf5

src/Bundle/ChillDocStoreBundle/Form/AccompanyingCourseDocumentType.php

@@ -24,7 +24,7 @@ use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
-class AccompanyingCourseDocumentType extends AbstractType
+final class AccompanyingCourseDocumentType extends AbstractType
 {
     public function __construct(
         private readonly TranslatableStringHelperInterface $translatableStringHelper

src/Bundle/ChillDocStoreBundle/Form/CollectionStoredObjectType.php

@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\DocStoreBundle\Form;
+
+use Chill\MainBundle\Form\Type\ChillCollectionType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class CollectionStoredObjectType extends AbstractType
+{
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setDefault('entry_type', StoredObjectType::class)
+            ->setDefault('allow_add', true)
+            ->setDefault('allow_delete', true)
+            ->setDefault('button_add_label', 'stored_object.Insert a document')
+            ->setDefault('button_remove_label', 'stored_object.Remove a document')
+            ->setDefault('empty_collection_explain', 'No documents')
+            ->setDefault('entry_options', ['has_title' => true])
+            ->setDefault('js_caller', 'data-collection-stored-object');
+    }
+
+    public function getParent()
+    {
+        return ChillCollectionType::class;
+    }
+}

src/Bundle/ChillDocStoreBundle/Form/DataMapper/StoredObjectDataMapper.php

@@ -0,0 +1,75 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\DocStoreBundle\Form\DataMapper;
+
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Symfony\Component\Form\DataMapperInterface;
+use Symfony\Component\Form\Exception;
+use Symfony\Component\Form\FormInterface;
+
+class StoredObjectDataMapper implements DataMapperInterface
+{
+    public function __construct()
+    {
+    }
+
+    /**
+     * @param FormInterface[]|\Traversable $forms A list of {@link FormInterface} instances
+     */
+    public function mapDataToForms($viewData, $forms)
+    {
+        if (null === $viewData) {
+            return;
+        }
+
+        if (!$viewData instanceof StoredObject) {
+            throw new Exception\UnexpectedTypeException($viewData, StoredObject::class);
+        }
+
+        $forms = iterator_to_array($forms);
+        if (array_key_exists('title', $forms)) {
+            $forms['title']->setData($viewData->getTitle());
+        }
+        $forms['stored_object']->setData($viewData);
+    }
+
+    /**
+     * @param FormInterface[]|\Traversable $forms A list of {@link FormInterface} instances
+     */
+    public function mapFormsToData($forms, &$viewData)
+    {
+        $forms = iterator_to_array($forms);
+
+        if (!(null === $viewData || $viewData instanceof StoredObject)) {
+            throw new Exception\UnexpectedTypeException($viewData, StoredObject::class);
+        }
+
+        if (null === $forms['stored_object']->getData()) {
+            return;
+        }
+
+        /** @var StoredObject $viewData */
+        if ($viewData->getFilename() !== $forms['stored_object']->getData()['filename']) {
+            // we do not want to erase the previous object
+            $viewData = new StoredObject();
+        }
+
+        $viewData->setFilename($forms['stored_object']->getData()['filename']);
+        $viewData->setIv($forms['stored_object']->getData()['iv']);
+        $viewData->setKeyInfos($forms['stored_object']->getData()['keyInfos']);
+        $viewData->setType($forms['stored_object']->getData()['type']);
+
+        if (array_key_exists('title', $forms)) {
+            $viewData->setTitle($forms['title']->getData());
+        }
+    }
+}

src/Bundle/ChillDocStoreBundle/Form/DataTransformer/StoredObjectDataTransformer.php

@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\DocStoreBundle\Form\DataTransformer;
+
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\DocStoreBundle\Serializer\Normalizer\StoredObjectNormalizer;
+use Symfony\Component\Form\DataTransformerInterface;
+use Symfony\Component\Form\Exception\UnexpectedTypeException;
+use Symfony\Component\Serializer\SerializerInterface;
+
+class StoredObjectDataTransformer implements DataTransformerInterface
+{
+    public function __construct(
+        private readonly SerializerInterface $serializer
+    ) {
+    }
+
+    public function transform(mixed $value): mixed
+    {
+        if (null === $value) {
+            return '';
+        }
+
+        if ($value instanceof StoredObject) {
+            return $this->serializer->serialize($value, 'json', [
+                'groups' => [
+                    StoredObjectNormalizer::ADD_DAV_EDIT_LINK_CONTEXT,
+                ],
+            ]);
+        }
+
+        throw new UnexpectedTypeException($value, StoredObject::class);
+    }
+
+    public function reverseTransform(mixed $value): mixed
+    {
+        if ('' === $value || null === $value) {
+            return null;
+        }
+
+        return json_decode((string) $value, true, 10, JSON_THROW_ON_ERROR);
+    }
+}

src/Bundle/ChillDocStoreBundle/Form/StoredObjectType.php

@@ -11,11 +11,10 @@ declare(strict_types=1);
 
 namespace Chill\DocStoreBundle\Form;
 
-use Chill\DocStoreBundle\Form\Type\AsyncUploaderType;
 use Chill\DocStoreBundle\Entity\StoredObject;
-use Doctrine\ORM\EntityManagerInterface;
+use Chill\DocStoreBundle\Form\DataMapper\StoredObjectDataMapper;
+use Chill\DocStoreBundle\Form\DataTransformer\StoredObjectDataTransformer;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\CallbackTransformer;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -24,9 +23,13 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 /**
  * Form type which allow to join a document.
  */
-class StoredObjectType extends AbstractType
+final class StoredObjectType extends AbstractType
 {
-    public function __construct(private readonly EntityManagerInterface $em) {}
+    public function __construct(
+        private readonly StoredObjectDataTransformer $storedObjectDataTransformer,
+        private readonly StoredObjectDataMapper $storedObjectDataMapper,
+    ) {
+    }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
@@ -37,30 +40,9 @@ class StoredObjectType extends AbstractType
                 ]);
         }
 
-        $builder
-            ->add('filename', AsyncUploaderType::class)
-            ->add('type', HiddenType::class)
-            ->add('keyInfos', HiddenType::class)
-            ->add('iv', HiddenType::class);
-
-        $builder
-            ->get('keyInfos')
-            ->addModelTransformer(new CallbackTransformer(
-                $this->transform(...),
-                $this->reverseTransform(...)
-            ));
-        $builder
-            ->get('iv')
-            ->addModelTransformer(new CallbackTransformer(
-                $this->transform(...),
-                $this->reverseTransform(...)
-            ));
-
-        $builder
-            ->addModelTransformer(new CallbackTransformer(
-                $this->transformObject(...),
-                $this->reverseTransformObject(...)
-            ));
+        $builder->add('stored_object', HiddenType::class);
+        $builder->get('stored_object')->addModelTransformer($this->storedObjectDataTransformer);
+        $builder->setDataMapper($this->storedObjectDataMapper);
     }
 
     public function configureOptions(OptionsResolver $resolver)
@@ -72,43 +54,4 @@ class StoredObjectType extends AbstractType
             ->setDefault('has_title', false)
             ->setAllowedTypes('has_title', ['bool']);
     }
-
-    public function reverseTransform($value)
-    {
-        if (null === $value) {
-            return null;
-        }
-
-        return \json_decode((string) $value, true, 512, JSON_THROW_ON_ERROR);
-    }
-
-    public function reverseTransformObject($object)
-    {
-        if (null === $object) {
-            return null;
-        }
-
-        if (null === $object->getFilename()) {
-            // remove the original object
-            $this->em->remove($object);
-
-            return null;
-        }
-
-        return $object;
-    }
-
-    public function transform($object)
-    {
-        if (null === $object) {
-            return null;
-        }
-
-        return \json_encode($object, JSON_THROW_ON_ERROR);
-    }
-
-    public function transformObject($object = null)
-    {
-        return $object;
-    }
 }