Fix review comments

ezsystems · Nov 16, 2018 · fa9ee61 · fa9ee61
1 parent f9259df
commit fa9ee61
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 10 deletions.
diff --git a/eZ/Publish/Core/Persistence/Legacy/Content/Type/Gateway.php b/eZ/Publish/Core/Persistence/Legacy/Content/Type/Gateway.php
@@ -186,13 +186,13 @@ abstract public function updateFieldDefinition(
     abstract public function updateType($typeId, $status, UpdateStruct $updateStruct);
 
     /**
-     * Loads an array with data about several Types in defined status..
+     * Loads an array with data about several Types in defined status.
      *
      * @param array $typeIds
      *
      * @return array Data rows.
      */
-    abstract public function loadTypesDataList(array $typeIds): array;
+    abstract public function loadTypesListData(array $typeIds): array;
 
     /**
      * Loads an array with data about $typeId in $status.

diff --git a/eZ/Publish/Core/Persistence/Legacy/Content/Type/Gateway/DoctrineDatabase.php b/eZ/Publish/Core/Persistence/Legacy/Content/Type/Gateway/DoctrineDatabase.php
@@ -870,7 +870,7 @@ public function updateType($typeId, $status, UpdateStruct $updateStruct)
         $this->insertTypeNameData($typeId, $status, $updateStruct->name);
     }
 
-    public function loadTypesDataList(array $typeIds): array
+    public function loadTypesListData(array $typeIds): array
     {
         $q = $this->getLoadTypeQueryBuilder();
         $q

diff --git a/eZ/Publish/Core/Persistence/Legacy/Content/Type/Gateway/ExceptionConversion.php b/eZ/Publish/Core/Persistence/Legacy/Content/Type/Gateway/ExceptionConversion.php
@@ -350,10 +350,10 @@ public function updateType($typeId, $status, UpdateStruct $updateStruct)
         }
     }
 
-    public function loadTypesDataList(array $typeIds): array
+    public function loadTypesListData(array $typeIds): array
     {
         try {
-            return $this->innerGateway->loadTypesDataList($typeIds);
+            return $this->innerGateway->loadTypesListData($typeIds);
         } catch (PDOException | DBALException $e) {
             throw new RuntimeException('Database error', 0, $e);
         }

diff --git a/eZ/Publish/Core/Persistence/Legacy/Content/Type/Handler.php b/eZ/Publish/Core/Persistence/Legacy/Content/Type/Handler.php
@@ -190,7 +190,7 @@ public function loadContentTypes($groupId, $status = 0)
     public function loadContentTypeList(array $contentTypeIds): array
     {
         return $this->mapper->extractTypesFromRows(
-            $this->contentTypeGateway->loadTypesDataList($contentTypeIds),
+            $this->contentTypeGateway->loadTypesListData($contentTypeIds),
             true
         );
     }

diff --git a/eZ/Publish/Core/Persistence/Legacy/Tests/Content/Type/ContentTypeHandlerTest.php b/eZ/Publish/Core/Persistence/Legacy/Tests/Content/Type/ContentTypeHandlerTest.php
@@ -307,7 +307,7 @@ public function testLoadContentTypeList(): void
     {
         $gatewayMock = $this->getGatewayMock();
         $gatewayMock->expects($this->once())
-            ->method('loadTypesDataList')
+            ->method('loadTypesListData')
             ->with($this->equalTo([23, 24]))
             ->willReturn([]);
 

diff --git a/eZ/Publish/Core/Repository/Helper/DomainMapper.php b/eZ/Publish/Core/Repository/Helper/DomainMapper.php
@@ -73,7 +73,7 @@ class DomainMapper
     protected $contentLanguageHandler;
 
     /**
-     * @var FieldTypeRegistry
+     * @var \eZ\Publish\Core\Repository\Helper\FieldTypeRegistry
      */
     protected $fieldTypeRegistry;
 
@@ -83,8 +83,9 @@ class DomainMapper
      * @param \eZ\Publish\SPI\Persistence\Content\Handler $contentHandler
      * @param \eZ\Publish\SPI\Persistence\Content\Location\Handler $locationHandler
      * @param \eZ\Publish\SPI\Persistence\Content\Type\Handler $contentTypeHandler
+     * @param \eZ\Publish\Core\Repository\Helper\ContentTypeDomainMapper $contentTypeDomainMapper
      * @param \eZ\Publish\SPI\Persistence\Content\Language\Handler $contentLanguageHandler
-     * @param FieldTypeRegistry $fieldTypeRegistry
+     * @param \eZ\Publish\Core\Repository\Helper\FieldTypeRegistry $fieldTypeRegistry
      */
     public function __construct(
         ContentHandler $contentHandler,

diff --git a/eZ/Publish/SPI/Persistence/Content/Type/Handler.php b/eZ/Publish/SPI/Persistence/Content/Type/Handler.php
@@ -87,7 +87,7 @@ public function loadContentTypes($groupId, $status = Type::STATUS_DEFINED);
      * Missing items (NotFound) will be missing from the array and not cause an exception, it's up
      * to calling logic to determine if this should cause exception or not.
      *
-     * @param mixed[] $contentTypeIds
+     * @param array $contentTypeIds
      *
      * @return \eZ\Publish\SPI\Persistence\Content\Type[]
      */