Revert "Merge branch 'revert-671bb6d5' into 'master'"

This reverts merge request !732
This commit is contained in:
2024-09-19 13:40:09 +00:00
parent bfd7dc2270
commit 68688dd528
1701 changed files with 35022 additions and 14546 deletions

View File

@@ -18,14 +18,12 @@ use Symfony\Component\Form\FormInterface;
class StoredObjectDataMapper implements DataMapperInterface
{
public function __construct()
{
}
public function __construct() {}
/**
* @param FormInterface[]|\Traversable $forms A list of {@link FormInterface} instances
*/
public function mapDataToForms($viewData, $forms)
public function mapDataToForms($viewData, \Traversable $forms)
{
if (null === $viewData) {
return;
@@ -45,7 +43,7 @@ class StoredObjectDataMapper implements DataMapperInterface
/**
* @param FormInterface[]|\Traversable $forms A list of {@link FormInterface} instances
*/
public function mapFormsToData($forms, &$viewData)
public function mapFormsToData(\Traversable $forms, &$viewData)
{
$forms = iterator_to_array($forms);
@@ -57,16 +55,8 @@ class StoredObjectDataMapper implements DataMapperInterface
return;
}
/** @var StoredObject $viewData */
if ($viewData->getFilename() !== $forms['stored_object']->getData()['filename']) {
// we want to keep the previous history
$viewData->saveHistory();
}
$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']);
/* @var StoredObject $viewData */
$viewData = $forms['stored_object']->getData();
if (array_key_exists('title', $forms)) {
$viewData->setTitle($forms['title']->getData());