Merge branch '4.5'

Author: Steveb-p

phpstan-baseline.neon

@@ -4501,7 +4501,7 @@ parameters:
 			path: src/lib/Form/Data/FormMapper/UserCreateMapper.php
 
 		-
-			message: "#^Cannot access offset mixed on iterable\\<Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Field\\>\\.$#"
+			message: "#^Cannot access offset string on iterable\\<Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Field\\>\\.$#"
 			count: 1
 			path: src/lib/Form/Data/FormMapper/UserUpdateMapper.php
 

src/lib/Menu/ContentEditAnchorMenuBuilder.php

@@ -8,9 +8,9 @@
 
 use Ibexa\AdminUi\Menu\Event\ConfigureMenuEvent;
 use Ibexa\Contracts\AdminUi\Menu\AbstractBuilder;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition;
 use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Ibexa\Core\Repository\Values\ContentType\ContentType;
-use Ibexa\Core\Repository\Values\ContentType\FieldDefinition;
 use JMS\TranslationBundle\Model\Message;
 use JMS\TranslationBundle\Translation\TranslationContainerInterface;
 use Knp\Menu\ItemInterface;

src/lib/Menu/ContentTypeEditAnchorMenuBuilder.php

@@ -10,7 +10,7 @@
 use Ibexa\AdminUi\Menu\Event\ConfigureMenuEvent;
 use Ibexa\Contracts\AdminUi\Menu\AbstractBuilder;
 use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeDraft;
-use Ibexa\Core\Repository\Values\ContentType\FieldDefinition;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition;
 use JMS\TranslationBundle\Model\Message;
 use JMS\TranslationBundle\Translation\TranslationContainerInterface;
 use Knp\Menu\ItemInterface;

tests/lib/Form/Data/FormMapper/ContentTypeDraftMapperTest.php

@@ -14,6 +14,7 @@
 use Ibexa\Contracts\AdminUi\Form\Data\FormMapper\FormDataMapperInterface;
 use Ibexa\Contracts\Core\Repository\ContentTypeService;
 use Ibexa\Contracts\Core\Repository\Values\Content\Location;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition as ApiFieldDefinition;
 use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinitionCollection as FieldDefinitionCollectionInterface;
 use Ibexa\Contracts\Core\Repository\Values\ValueObject;
 use Ibexa\Core\FieldType\Value;
@@ -221,7 +222,7 @@ private function createFieldDefinitionsData(
     }
 
     private function createFieldDefinitionData(
-        FieldDefinition $fieldDefinition,
+        ApiFieldDefinition $fieldDefinition,
         ContentTypeData $contentTypeData,
         bool $enabled
     ): FieldDefinitionData {
@@ -230,8 +231,8 @@ private function createFieldDefinitionData(
             'fieldDefinition' => $fieldDefinition,
             'contentTypeData' => $contentTypeData,
             'identifier' => $fieldDefinition->identifier,
-            'names' => $fieldDefinition->names,
-            'descriptions' => $fieldDefinition->descriptions,
+            'names' => $fieldDefinition->getNames(),
+            'descriptions' => $fieldDefinition->getDescriptions(),
             'fieldGroup' => $fieldDefinition->fieldGroup,
             'position' => $fieldDefinition->position,
             'isTranslatable' => $fieldDefinition->isTranslatable,