Merged branch '1.3' of ezsystems/ezplatform-kernel into 4.3

Author: alongosz

src/contracts/Persistence/Content/Location/Handler.php

@@ -110,6 +110,8 @@ public function loadParentLocationsForDraftContent($contentId);
      */
     public function copySubtree($sourceId, $destinationParentId);
 
+    public function getSubtreeSize(string $path): int;
+
     /**
      * Moves location identified by $sourceId into new parent identified by $destinationParentId.
      *

src/contracts/Repository/Decorator/LocationServiceDecorator.php

@@ -87,6 +87,11 @@ public function getLocationChildCount(Location $location): int
         return $this->innerService->getLocationChildCount($location);
     }
 
+    public function getSubtreeSize(Location $location): int
+    {
+        return $this->innerService->getSubtreeSize($location);
+    }
+
     public function createLocation(
         ContentInfo $contentInfo,
         LocationCreateStruct $locationCreateStruct

src/contracts/Repository/LocationService.php

@@ -125,6 +125,13 @@ public function loadParentLocationsForDraftContent(VersionInfo $versionInfo, ?ar
      */
     public function getLocationChildCount(Location $location): int;
 
+    /**
+     * Return the subtree size of a given location.
+     *
+     * Warning! This method is not permission aware by design.
+     */
+    public function getSubtreeSize(Location $location): int;
+
     /**
      * Creates the new $location in the content repository for the given content.
      *

src/contracts/Repository/Values/Content/Location.php

@@ -24,7 +24,7 @@
  * @property-read bool $explicitlyHidden Indicates that the Location entity has been explicitly marked as hidden.
  * @property-read string $remoteId a global unique id of the content object
  * @property-read int $parentLocationId the id of the parent location
- * @property-read string $pathString the path to this location e.g. /1/2/4/23 where 23 is current id.
+ * @property-read string $pathString @deprecated use {@see Location::getPathString()} instead.
  * @property-read array $path Same as $pathString but as array, e.g. [ 1, 2, 4, 23 ]
  * @property-read int $depth Depth location has in the location tree
  * @property-read int $sortField Specifies which property the child locations should be sorted on. Valid values are found at {@link Location::SORT_FIELD_*}
@@ -239,6 +239,15 @@ public function getSortClauses(): array
 
         return [$sortClause];
     }
+
+    /**
+     * The path to the Location represented by the current instance,
+     * e.g. /1/2/4/23 where 23 is current id.
+     */
+    public function getPathString(): string
+    {
+        return $this->pathString;
+    }
 }
 
 class_alias(Location::class, 'eZ\Publish\API\Repository\Values\Content\Location');

src/contracts/Repository/Values/ContentType/ContentType.php

@@ -27,7 +27,7 @@
  * @property-read string $remoteId a global unique id of the content object
  * @property-read string $urlAliasSchema URL alias schema. If nothing is provided, $nameSchema will be used instead.
  * @property-read string $nameSchema  The name schema.
- * @property-read bool $isContainer This flag hints to UIs if type may have children or not.
+ * @property-read bool $isContainer @deprecated use strict getter {@see ContentType::isContainer} instead.
  * @property-read string $mainLanguageCode the main language of the content type names and description used for fallback.
  * @property-read bool $defaultAlwaysAvailable if an instance of a content type is created the always available flag is set by default this this value.
  * @property-read string[] $languageCodes array of language codes used by content type translations.
@@ -228,6 +228,11 @@ public function getFirstFieldDefinitionOfType(string $fieldTypeIdentifier): ?Fie
 
         return null;
     }
+
+    public function isContainer(): bool
+    {
+        return $this->isContainer;
+    }
 }
 
 class_alias(ContentType::class, 'eZ\Publish\API\Repository\Values\ContentType\ContentType');

src/lib/Persistence/Cache/LocationHandler.php

@@ -256,6 +256,15 @@ public function copySubtree($sourceId, $destinationParentId, $newOwnerId = null)
         return $this->persistenceHandler->locationHandler()->copySubtree($sourceId, $destinationParentId, $newOwnerId);
     }
 
+    public function getSubtreeSize(string $path): int
+    {
+        $this->logger->logCall(__METHOD__, [
+            'path' => $path,
+        ]);
+
+        return $this->persistenceHandler->locationHandler()->getSubtreeSize($path);
+    }
+
     /**
      * {@inheritdoc}
      */

src/lib/Persistence/Legacy/Content/Location/Gateway.php

@@ -111,6 +111,8 @@ abstract public function loadParentLocationsDataForDraftContent(int $contentId):
      */
     abstract public function getSubtreeContent(int $sourceId, bool $onlyIds = false): array;
 
+    abstract public function getSubtreeSize(string $path): int;
+
     /**
      * Returns data for the first level children of the location identified by given $locationId.
      */

src/lib/Persistence/Legacy/Content/Location/Gateway/DoctrineDatabase.php

@@ -237,6 +237,21 @@ public function getSubtreeContent(int $sourceId, bool $onlyIds = false): array
             : $results;
     }
 
+    public function getSubtreeSize(string $path): int
+    {
+        $query = $this->createNodeQueryBuilder([$this->dbPlatform->getCountExpression('node_id')]);
+        $query->andWhere(
+            $query->expr()->like(
+                't.path_string',
+                $query->createPositionalParameter(
+                    $path . '%',
+                )
+            )
+        );
+
+        return (int) $query->execute()->fetchOne();
+    }
+
     /**
      * Return constraint which limits the given $query to the subtree starting at $rootLocationId.
      */

src/lib/Persistence/Legacy/Content/Location/Gateway/ExceptionConversion.php

@@ -106,6 +106,15 @@ public function getSubtreeContent(int $sourceId, bool $onlyIds = false): array
         }
     }
 
+    public function getSubtreeSize(string $path): int
+    {
+        try {
+            return $this->innerGateway->getSubtreeSize($path);
+        } catch (DBALException | PDOException $e) {
+            throw DatabaseException::wrap($e);
+        }
+    }
+
     public function getChildren(int $locationId): array
     {
         try {

src/lib/Persistence/Legacy/Content/Location/Handler.php

@@ -332,6 +332,11 @@ public function copySubtree($sourceId, $destinationParentId, $newOwnerId = null)
         return $copiedSubtreeRootLocation;
     }
 
+    public function getSubtreeSize(string $path): int
+    {
+        return $this->locationGateway->getSubtreeSize($path);
+    }
+
     /**
      * Retrieves section ID of the location's content.
      *