fix: Apply suggestions from code review

Co-authored-by: Paweł Niedzielski <pawel.niedzielski@ibexa.co>
ezsystems · Mar 21, 2024 · b1d6e31 · b1d6e31
1 parent aa1a848
commit b1d6e31
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 15 deletions.
diff --git a/eZ/Publish/API/Repository/Values/Content/Field.php b/eZ/Publish/API/Repository/Values/Content/Field.php
@@ -87,6 +87,9 @@ public function getFieldTypeIdentifier(): string
         return $this->fieldTypeIdentifier;
     }
 
+    /**
+     * @phpstan-assert-if-true !null $this->getId()
+     */
     public function isVirtual(): bool
     {
         return null === $this->id;

diff --git a/eZ/Publish/Core/Persistence/Legacy/Content/FieldHandler.php b/eZ/Publish/Core/Persistence/Legacy/Content/FieldHandler.php
@@ -151,7 +151,7 @@ protected function getEmptyField(FieldDefinition $fieldDefinition, $languageCode
     public function createExistingFieldsInNewVersion(Content $content): void
     {
         foreach ($content->fields as $field) {
-            if ($field->id === null) {
+            if ($field->getId() === null) {
                 // Virtual field with default value, skip creating field as it has no id
                 continue;
             }

diff --git a/eZ/Publish/Core/Persistence/Legacy/Content/Mapper.php b/eZ/Publish/Core/Persistence/Legacy/Content/Mapper.php
@@ -25,11 +25,35 @@
  *
  * Performs mapping of Content objects.
  *
- * @phpstan-type TVersionedLanguageFieldDefinitionsMap array<int, array<int, array<string, array<int, \eZ\Publish\SPI\Persistence\Content\Type\FieldDefinition>>>>
- * @phpstan-type TVersionedFieldMap array<int, array<int, array<int, \eZ\Publish\SPI\Persistence\Content\Field>>>
- * @phpstan-type TVersionedNameMap array<int, array<int, array<string, array<int, string>>>>
+ * @phpstan-type TVersionedLanguageFieldDefinitionsMap array<
+       int, array<
+           int, array<
+               string, array<
+                   int, \eZ\Publish\SPI\Persistence\Content\Type\FieldDefinition,
+               >
+           >
+       >
+   >
+ * @phpstan-type TVersionedFieldMap array<
+     int, array<
+          int, array<
+              int, \eZ\Publish\SPI\Persistence\Content\Field,
+          >
+      >
+  >
+ * @phpstan-type TVersionedNameMap array<
+     int, array<
+         int, array<
+             string, array<int, string>
+         >
+     >
+ >
  * @phpstan-type TContentInfoMap array<int, \eZ\Publish\SPI\Persistence\Content\ContentInfo>
- * @phpstan-type TVersionInfoMap array<int, array<int, \eZ\Publish\SPI\Persistence\Content\VersionInfo>>
+ * @phpstan-type TVersionInfoMap array<
+     int, array<
+         int, \eZ\Publish\SPI\Persistence\Content\VersionInfo,
+     >
+ >
  */
 class Mapper
 {
@@ -324,8 +348,7 @@ private function loadCachedVersionFieldDefinitionsPerLanguage(
             }
 
             $languageCodes = $this->extractLanguageCodesFromMask($languageMask, $allLanguages);
-            $contentType = $contentTypes[$contentTypeId] = $contentTypes[$contentTypeId]
-                ?? $this->contentTypeHandler->load($contentTypeId);
+            $contentType = $contentTypes[$contentTypeId] ??= $this->contentTypeHandler->load($contentTypeId);
             foreach ($contentType->fieldDefinitions as $fieldDefinition) {
                 foreach ($languageCodes as $languageCode) {
                     $id = $fieldDefinition->id;

diff --git a/eZ/Publish/Core/Persistence/Legacy/Content/StorageHandler.php b/eZ/Publish/Core/Persistence/Legacy/Content/StorageHandler.php
@@ -79,7 +79,7 @@ public function copyFieldData(VersionInfo $versionInfo, Field $field, Field $ori
     public function getFieldData(VersionInfo $versionInfo, Field $field)
     {
         $storage = $this->storageRegistry->getStorage($field->type);
-        if ($field->id !== null && $storage->hasFieldData()) {
+        if ($field->getId() !== null && $storage->hasFieldData()) {
             $storage->getFieldData($versionInfo, $field, $this->context);
         }
     }

diff --git a/eZ/Publish/Core/Persistence/Legacy/Tests/Content/MapperTest.php b/eZ/Publish/Core/Persistence/Legacy/Tests/Content/MapperTest.php
@@ -264,9 +264,11 @@ static function (Content\Type\FieldDefinition $fieldDefinition) {
         $result = $mapper->extractContentFromRows($rowsFixture, $nameRowsFixture);
 
         $expectedContent = $this->getContentExtractReference();
-        $expectedContent->fields = array_values(array_filter($expectedContent->fields, static function (Field $field) {
-            return $field->fieldDefinitionId !== 185;
-        }));
+        $expectedContent->fields = array_values(
+            array_filter($expectedContent->fields, static function (Field $field): bool {
+                return $field->fieldDefinitionId !== 185;
+            })
+        );
 
         $this->assertEquals(
             [
@@ -331,8 +333,8 @@ private function getFieldRegistry(
         $converterMock = $this->createMock(Converter::class);
         $converterMock->expects(
             $expectedConverterCalls === null
-            ? self::any()
-            : self::exactly($expectedConverterCalls)
+                ? self::any()
+                : self::exactly($expectedConverterCalls)
         )
             ->method('toFieldValue')
             ->willReturn(new FieldValue());
@@ -735,7 +737,7 @@ static function ($languageCode) use ($languages) {
     }
 
     /**
-     * @return Content\Type\Handler|\PHPUnit\Framework\MockObject\MockObject
+     * @return \eZ\Publish\SPI\Persistence\Content\Type\Handler&\PHPUnit\Framework\MockObject\MockObject
      */
     protected function getContentTypeHandler()
     {

diff --git a/eZ/Publish/Core/Persistence/Legacy/Tests/Content/StorageHandlerTest.php b/eZ/Publish/Core/Persistence/Legacy/Tests/Content/StorageHandlerTest.php
@@ -153,7 +153,7 @@ public function testGetFieldDataNotAvailableForVirtualField()
 
         $storageRegistryMock->expects(self::once())
             ->method('getStorage')
-            ->with($this->equalTo('foobar'))
+            ->with(self::equalTo('foobar'))
             ->willReturn($storageMock);
 
         $field = new Field();