IBX-8562: Applied rebranding to ezplatform-kernel code

ibexa · Aug 7, 2024 · bfb03b0 · bfb03b0
1 parent cac2b16
commit bfb03b0
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 109 deletions.
diff --git a/eZ/Publish/Core/settings/storage_engines/legacy/content.yml b/eZ/Publish/Core/settings/storage_engines/legacy/content.yml
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -14905,21 +14905,6 @@ parameters:
 			count: 1
 			path: src/lib/Persistence/Legacy/Bookmark/Mapper.php
 
-		-
-			message: "#^Access to an undefined property object\\:\\:\\$languageCode\\.$#"
-			count: 1
-			path: src/lib/Persistence/Legacy/Content/FieldHandler.php
-
-		-
-			message: "#^Cannot access offset int\\|string on Ibexa\\\\Contracts\\\\Core\\\\Persistence\\\\Content\\\\Field\\.$#"
-			count: 3
-			path: src/lib/Persistence/Legacy/Content/FieldHandler.php
-
-		-
-			message: "#^Cannot access offset string on Ibexa\\\\Contracts\\\\Core\\\\Persistence\\\\Content\\\\Field\\.$#"
-			count: 5
-			path: src/lib/Persistence/Legacy/Content/FieldHandler.php
-
 		-
 			message: "#^Method Ibexa\\\\Core\\\\Persistence\\\\Legacy\\\\Content\\\\FieldHandler\\:\\:copyField\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -14970,11 +14955,6 @@ parameters:
 			count: 1
 			path: src/lib/Persistence/Legacy/Content/FieldHandler.php
 
-		-
-			message: "#^Method Ibexa\\\\Core\\\\Persistence\\\\Legacy\\\\Content\\\\FieldHandler\\:\\:getFieldMap\\(\\) should return array\\<Ibexa\\\\Contracts\\\\Core\\\\Persistence\\\\Content\\\\Field\\> but returns array\\<int, array\\<string, Ibexa\\\\Contracts\\\\Core\\\\Persistence\\\\Content\\\\Field\\>\\>\\.$#"
-			count: 1
-			path: src/lib/Persistence/Legacy/Content/FieldHandler.php
-
 		-
 			message: "#^Method Ibexa\\\\Core\\\\Persistence\\\\Legacy\\\\Content\\\\FieldHandler\\:\\:loadExternalFieldData\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -14995,18 +14975,13 @@ parameters:
 			count: 1
 			path: src/lib/Persistence/Legacy/Content/FieldHandler.php
 
-		-
-			message: "#^Parameter \\#1 \\$field of method Ibexa\\\\Core\\\\Persistence\\\\Legacy\\\\Content\\\\FieldHandler\\:\\:updateField\\(\\) expects Ibexa\\\\Contracts\\\\Core\\\\Persistence\\\\Content\\\\Field, object given\\.$#"
-			count: 1
-			path: src/lib/Persistence/Legacy/Content/FieldHandler.php
-
 		-
 			message: "#^Parameter \\#2 \\$languageCode of method Ibexa\\\\Core\\\\Persistence\\\\Legacy\\\\Content\\\\FieldHandler\\:\\:getEmptyField\\(\\) expects string, int\\|string given\\.$#"
 			count: 2
 			path: src/lib/Persistence/Legacy/Content/FieldHandler.php
 
 		-
-			message: "#^Parameter \\#3 \\$originalField of method Ibexa\\\\Core\\\\Persistence\\\\Legacy\\\\Content\\\\FieldHandler\\:\\:updateCopiedField\\(\\) expects Ibexa\\\\Contracts\\\\Core\\\\Persistence\\\\Content\\\\Field, object given\\.$#"
+			message: "#^Property Ibexa\\\\Contracts\\\\Core\\\\Persistence\\\\Content\\\\Field\\:\\:\\$id \\(int\\) in isset\\(\\) is not nullable\\.$#"
 			count: 1
 			path: src/lib/Persistence/Legacy/Content/FieldHandler.php
 

diff --git a/src/lib/Persistence/Legacy/Content/FieldHandler.php b/src/lib/Persistence/Legacy/Content/FieldHandler.php
@@ -424,7 +424,7 @@ protected function updateCopiedField(Field $field, Field $updateField, Field $or
      * @param \Ibexa\Contracts\Core\Persistence\Content\Field[] $fields
      * @param array $languageCodes
      *
-     * @return array<int, array<string, \Ibexa\Contracts\Core\Persistence\Content\Field[]>
+     * @return array<int, array<string, \Ibexa\Contracts\Core\Persistence\Content\Field>>
      */
     protected function getFieldMap(array $fields, &$languageCodes = null)
     {

diff --git a/src/lib/Persistence/Legacy/Content/Handler.php b/src/lib/Persistence/Legacy/Content/Handler.php
@@ -85,10 +85,7 @@ class Handler implements BaseContentHandler
      */
     protected $treeHandler;
 
-    /**
-     * @var \eZ\Publish\SPI\Persistence\Content\Language\Handler
-     */
-    protected $languageHandler;
+    protected LanguageHandler $languageHandler;
 
     /** @var \Psr\Log\LoggerInterface */
     private $logger;

diff --git a/src/lib/Persistence/Legacy/Content/Mapper.php b/src/lib/Persistence/Legacy/Content/Mapper.php
@@ -327,6 +327,7 @@ private function buildContentObjects(
 
     /**
      * @phpstan-param TRawContentRow[] $rows
+     * @param string[]|null $translations
      *
      * @phpstan-return TVersionedLanguageFieldDefinitionsMap
      *

diff --git a/tests/lib/Persistence/Legacy/Content/ContentHandlerTest.php b/tests/lib/Persistence/Legacy/Content/ContentHandlerTest.php
@@ -112,13 +112,11 @@ class ContentHandlerTest extends TestCase
     protected $contentTypeHandlerMock;
 
     /**
-     * @var \PHPUnit\Framework\MockObject\MockObject&\eZ\Publish\Core\Persistence\Legacy\Content\Language\Handler
+     * @var \PHPUnit\Framework\MockObject\MockObject&\Ibexa\Core\Persistence\Legacy\Content\Language\Handler
      */
-    private $languageHandlerMock;
+    private LanguageHandler $languageHandlerMock;
 
     /**
-     * @covers \eZ\Publish\Core\Persistence\Legacy\Content\Handler::create
-     *
      * @todo Current method way to complex to test, refactor!
      */
     public function testCreate()
@@ -1590,7 +1588,7 @@ protected function getContentTypeHandlerMock()
     }
 
     /**
-     * @return \PHPUnit\Framework\MockObject\MockObject&\eZ\Publish\Core\Persistence\Legacy\Content\Language\Handler
+     * @return \PHPUnit\Framework\MockObject\MockObject&\Ibexa\Core\Persistence\Legacy\Content\Language\Handler
      */
     protected function getLanguageHandlerMock(): LanguageHandler
     {