Revert "Merge branch 'signature-app/wp-576-restorestored-object-version' into 'master'"

This reverts merge request !586
This commit is contained in:
2024-09-19 13:26:12 +00:00
parent 671bb6d593
commit e4d0705e84
1701 changed files with 14541 additions and 35017 deletions

View File

@@ -18,12 +18,14 @@ 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, \Traversable $forms)
public function mapDataToForms($viewData, $forms)
{
if (null === $viewData) {
return;
@@ -43,7 +45,7 @@ class StoredObjectDataMapper implements DataMapperInterface
/**
* @param FormInterface[]|\Traversable $forms A list of {@link FormInterface} instances
*/
public function mapFormsToData(\Traversable $forms, &$viewData)
public function mapFormsToData($forms, &$viewData)
{
$forms = iterator_to_array($forms);
@@ -55,8 +57,16 @@ class StoredObjectDataMapper implements DataMapperInterface
return;
}
/* @var StoredObject $viewData */
$viewData = $forms['stored_object']->getData();
/** @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']);
if (array_key_exists('title', $forms)) {
$viewData->setTitle($forms['title']->getData());