Merge remote-tracking branch 'ezsystems/7.5' into 1.3

ezsystems · Mar 18, 2022 · ca23200 · ca23200
2 parents 2de8ac5 + 6aa912e
commit ca23200
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/eZ/Bundle/EzPublishCoreBundle/Command/NormalizeImagesPathsCommand.php b/eZ/Bundle/EzPublishCoreBundle/Command/NormalizeImagesPathsCommand.php
@@ -227,10 +227,10 @@ static function (array $data) use ($filePath) {
 
     private function getImagePathsToNormalize(SymfonyStyle $io): array
     {
-        $imagesCount = $this->imageGateway->countDistinctImages();
+        $imagesDataCount = $this->imageGateway->countDistinctImagesData();
         $imagePathsToNormalize = [];
-        $iterations = ceil($imagesCount / self::IMAGE_LIMIT);
-        $io->progressStart($imagesCount);
+        $iterations = ceil($imagesDataCount / self::IMAGE_LIMIT);
+        $io->progressStart($imagesDataCount);
         for ($i = 0; $i < $iterations; ++$i) {
             $imagesData = $this->imageGateway->getImagesData(
                 $i * self::IMAGE_LIMIT,

diff --git a/eZ/Publish/Core/FieldType/Image/ImageStorage/Gateway.php b/eZ/Publish/Core/FieldType/Image/ImageStorage/Gateway.php
@@ -76,4 +76,6 @@ abstract public function updateImageData(int $fieldId, int $versionNo, string $x
     abstract public function getImagesData(int $offset, int $limit): array;
 
     abstract public function updateImagePath(int $fieldId, string $oldPath, string $newPath): void;
+
+    abstract public function countDistinctImagesData(): int;
 }
diff --git a/eZ/Publish/Core/FieldType/Image/ImageStorage/Gateway/DoctrineStorage.php b/eZ/Publish/Core/FieldType/Image/ImageStorage/Gateway/DoctrineStorage.php
@@ -274,17 +274,17 @@ public function isImageReferenced(string $uri): bool
         return (bool)$statement->fetchOne();
     }
 
-    public function countDistinctImages(): int
+    public function countDistinctImagesData(): int
     {
         $selectQuery = $this->connection->createQueryBuilder();
         $selectQuery
-            ->select($this->connection->getDatabasePlatform()->getCountExpression('DISTINCT(filepath)'))
+            ->select($this->connection->getDatabasePlatform()->getCountExpression('id'))
             ->from($this->connection->quoteIdentifier(self::IMAGE_FILE_TABLE))
         ;
 
         $statement = $selectQuery->execute();
 
-        return (int) $statement->fetchColumn();
+        return (int) $statement->fetchOne();
     }
 
     /**