Merge remote-tracking branch 'origin/4.6'

# Conflicts:
#	phpstan-baseline.neon
#	src/lib/Content/View/Filter/ContentEditViewFilter.php

Author: ViniTou

phpstan-baseline.neon

@@ -210,24 +210,12 @@ parameters:
 			count: 1
 			path: src/lib/FieldType/DataTransformer/AbstractBinaryBaseTransformer.php
 
-		-
-			message: '#^Method Ibexa\\ContentForms\\FieldType\\DataTransformer\\BinaryFileValueTransformer\:\:transform\(\) return type has no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: src/lib/FieldType/DataTransformer/BinaryFileValueTransformer.php
-
 		-
 			message: '#^Method Ibexa\\ContentForms\\FieldType\\DataTransformer\\ImageAssetValueTransformer\:\:reverseTransform\(\) has parameter \$value with no value type specified in iterable type array\.$#'
 			identifier: missingType.iterableValue
 			count: 1
 			path: src/lib/FieldType/DataTransformer/ImageAssetValueTransformer.php
 
-		-
-			message: '#^Method Ibexa\\ContentForms\\FieldType\\DataTransformer\\MediaValueTransformer\:\:transform\(\) return type has no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: src/lib/FieldType/DataTransformer/MediaValueTransformer.php
-
 		-
 			message: '#^Method Ibexa\\ContentForms\\FieldType\\FieldTypeFormMapperDispatcherInterface\:\:map\(\) has parameter \$form with generic interface Symfony\\Component\\Form\\FormInterface but does not specify its types\: TData$#'
 			identifier: missingType.generics
@@ -361,8 +349,8 @@ parameters:
 			path: src/lib/Form/Processor/User/UserUpdateFormProcessor.php
 
 		-
-			message: '#^Method Ibexa\\ContentForms\\Form\\Transformer\\RelationTransformer\:\:transform\(\) return type has no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
+			message: '#^Method Ibexa\\ContentForms\\Form\\Transformer\\RelationTransformer\:\:transform\(\) should return array\{location\: int\|null, location_type\: string\} but returns array\{location\: int\<min, \-2\>\|int\<0, max\>\|null, location_type\: \-1\|0\|1\}\.$#'
+			identifier: return.type
 			count: 1
 			path: src/lib/Form/Transformer/RelationTransformer.php
 
@@ -630,12 +618,6 @@ parameters:
 			count: 1
 			path: src/lib/Form/Type/User/UserUpdateType.php
 
-		-
-			message: '#^Method Ibexa\\ContentForms\\Validator\\Constraints\\Password\:\:getTargets\(\) return type has no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: src/lib/Validator/Constraints/Password.php
-
 		-
 			message: '#^Access to an undefined property Ibexa\\Contracts\\Core\\Repository\\Values\\Translation\:\:\$message\.$#'
 			identifier: property.notFound

src/contracts/Event/AutosaveEnabled.php

@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace Ibexa\Contracts\ContentForms\Event;
+
+use Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo;
+use Symfony\Contracts\EventDispatcher\Event;
+
+final class AutosaveEnabled extends Event
+{
+    private VersionInfo $versionInfo;
+
+    private bool $autosaveEnabled = true;
+
+    public function __construct(VersionInfo $versionInfo)
+    {
+        $this->versionInfo = $versionInfo;
+    }
+
+    public function getVersionInfo(): VersionInfo
+    {
+        return $this->versionInfo;
+    }
+
+    public function isAutosaveEnabled(): bool
+    {
+        return $this->autosaveEnabled;
+    }
+
+    public function enableAutosave(): void
+    {
+        $this->autosaveEnabled = true;
+    }
+
+    public function disableAutosave(): void
+    {
+        $this->autosaveEnabled = false;
+    }
+}

src/lib/Content/View/Filter/ContentEditViewFilter.php

@@ -11,6 +11,7 @@
 use Ibexa\ContentForms\Data\Content\ContentUpdateData;
 use Ibexa\ContentForms\Data\Mapper\ContentUpdateMapper;
 use Ibexa\ContentForms\Form\Type\Content\ContentEditType;
+use Ibexa\Contracts\ContentForms\Event\AutosaveEnabled;
 use Ibexa\Contracts\Core\Repository\ContentService;
 use Ibexa\Contracts\Core\Repository\ContentTypeService;
 use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException;
@@ -24,6 +25,7 @@
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Form\FormInterface;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
 final readonly class ContentEditViewFilter implements EventSubscriberInterface
 {
@@ -32,7 +34,8 @@ public function __construct(
         private LocationService $locationService,
         private ContentTypeService $contentTypeService,
         private FormFactoryInterface $formFactory,
-        private UserLanguagePreferenceProviderInterface $languagePreferenceProvider
+        private UserLanguagePreferenceProviderInterface $languagePreferenceProvider,
+        private EventDispatcherInterface $eventDispatcher
     ) {
     }
 
@@ -86,11 +89,13 @@ public function handleContentEditForm(FilterViewBuilderParametersEvent $event):
             $currentFields
         );
 
+        $autosaveEnabled = $this->eventDispatcher->dispatch(new AutosaveEnabled($contentDraft->getVersionInfo()))->isAutosaveEnabled();
         $form = $this->resolveContentEditForm(
             $contentUpdate,
             $languageCode,
             $contentDraft,
-            $location ?? null
+            $location ?? null,
+            $autosaveEnabled
         );
 
         $event->getParameters()->add([
@@ -124,7 +129,8 @@ private function resolveContentEditForm(
         ContentUpdateData $contentUpdate,
         string $languageCode,
         Content $content,
-        ?Location $location = null
+        ?Location $location = null,
+        bool $autosaveEnabled = true
     ): FormInterface {
         return $this->formFactory->create(
             ContentEditType::class,
@@ -137,6 +143,7 @@ private function resolveContentEditForm(
                 'contentUpdateStruct' => $contentUpdate,
                 'struct' => $contentUpdate,
                 'drafts_enabled' => true,
+                'autosave_enabled' => $autosaveEnabled,
             ]
         );
     }