EZP-31118: Introduced strict types for ContentService

eZ/Bundle/EzPublishCoreBundle/Tests/Imagine/ImageAsset/AliasGeneratorTest.php

@@ -49,9 +49,7 @@ protected function setUp(): void
     public function testGetVariationOfImageAsset()
     {
         $assetField = new Field([
-            'value' => new ImageAsset\Value([
-                'destinationContentId' => 486,
-            ]),
+            'value' => new ImageAsset\Value(486),
         ]);
         $imageField = new Field([
             'value' => new Image\Value([

eZ/Publish/Core/Event/ContentService.php

@@ -116,7 +116,7 @@ public function updateContentMetadata(
         return $content;
     }
 
-    public function deleteContent(ContentInfo $contentInfo): array
+    public function deleteContent(ContentInfo $contentInfo): iterable
     {
         $eventData = [$contentInfo];
 
@@ -140,8 +140,8 @@ public function deleteContent(ContentInfo $contentInfo): array
 
     public function createContentDraft(
         ContentInfo $contentInfo,
-        VersionInfo $versionInfo = null,
-        User $creator = null,
+        ?VersionInfo $versionInfo = null,
+        ?User $creator = null,
         ?Language $language = null
     ): Content {
         $eventData = [
@@ -242,7 +242,7 @@ public function deleteVersion(VersionInfo $versionInfo): void
     public function copyContent(
         ContentInfo $contentInfo,
         LocationCreateStruct $destinationLocationCreateStruct,
-        VersionInfo $versionInfo = null
+        ?VersionInfo $versionInfo = null
     ): Content {
         $eventData = [
             $contentInfo,
@@ -320,7 +320,7 @@ public function deleteRelation(
 
     public function deleteTranslation(
         ContentInfo $contentInfo,
-        $languageCode
+        string $languageCode
     ): void {
         $eventData = [
             $contentInfo,

eZ/Publish/Core/FieldType/ImageAsset/Type.php

@@ -71,10 +71,14 @@ public function validate(FieldDefinition $fieldDefinition, SPIValue $fieldValue)
             return $errors;
         }
 
-        $content = $this->contentService->loadContent($fieldValue->destinationContentId);
+        $content = $this->contentService->loadContent(
+            (int)$fieldValue->destinationContentId
+        );
 
         if (!$this->assetMapper->isAsset($content)) {
-            $currentContentType = $this->contentTypeService->loadContentType($content->contentInfo->contentTypeId);
+            $currentContentType = $this->contentTypeService->loadContentType(
+                (int)$content->contentInfo->contentTypeId
+            );
 
             $errors[] = new ValidationError(
                 'Content %type% is not a valid asset target',
@@ -207,11 +211,16 @@ protected function getSortInfo(BaseValue $value): bool
      */
     public function fromHash($hash): Value
     {
-        if ($hash) {
-            return new Value($hash['destinationContentId'], $hash['alternativeText']);
+        if (!$hash) {
+            return new Value();
         }
 
-        return new Value();
+        $destinationContentId = $hash['destinationContentId'];
+        if ($destinationContentId !== null) {
+            $destinationContentId = (int)$destinationContentId;
+        }
+
+        return new Value($destinationContentId, $hash['alternativeText']);
     }
 
     /**
@@ -223,8 +232,13 @@ public function fromHash($hash): Value
      */
     public function toHash(SPIValue $value): array
     {
+        $destinationContentId = null;
+        if ($value->destinationContentId !== null) {
+            $destinationContentId = (int)$value->destinationContentId;
+        }
+
         return [
-            'destinationContentId' => $value->destinationContentId,
+            'destinationContentId' => $destinationContentId,
             'alternativeText' => $value->alternativeText,
         ];
     }

eZ/Publish/Core/FieldType/Relation/Type.php

@@ -241,7 +241,12 @@ protected function getSortInfo(BaseValue $value)
      */
     public function fromHash($hash)
     {
-        return new Value($hash['destinationContentId']);
+        $destinationContentId = $hash['destinationContentId'];
+        if ($destinationContentId !== null) {
+            $destinationContentId = (int)$destinationContentId;
+        }
+
+        return new Value($destinationContentId);
     }
 
     /**
@@ -253,7 +258,14 @@ public function fromHash($hash)
      */
     public function toHash(SPIValue $value)
     {
-        return ['destinationContentId' => $value->destinationContentId];
+        $destinationContentId = null;
+        if ($value->destinationContentId !== null) {
+            $destinationContentId = (int)$value->destinationContentId;
+        }
+
+        return [
+            'destinationContentId' => $destinationContentId,
+        ];
     }
 
     /**

eZ/Publish/Core/MVC/Symfony/FieldType/Relation/ParameterProvider.php

@@ -32,18 +32,23 @@ public function __construct(ContentService $contentService)
      *
      * @return array
      */
-    public function getViewParameters(Field $field)
+    public function getViewParameters(Field $field): array
     {
         try {
-            $contentInfo = $this->contentService->loadContentInfo($field->value->destinationContentId);
+            $contentInfo = null;
+            if ($field->value->destinationContentId !== null) {
+                $contentInfo = $this->contentService->loadContentInfo(
+                    $field->value->destinationContentId
+                );
+            }
 
             return [
-                'available' => !$contentInfo->isTrashed(),
+                'available' => $contentInfo !== null && !$contentInfo->isTrashed(),
+            ];
+        } catch (NotFoundException | UnauthorizedException $exception) {
+            return [
+                'available' => false,
             ];
-        } catch (NotFoundException $exception) {
-            return ['available' => false];
-        } catch (UnauthorizedException $exception) {
-            return ['available' => false];
         }
     }
 }