hub#18485 Correction d'une erreur d'invalidation de cache lors de la création ou la suppression d'une page.

CHANGELOG.md

@@ -0,0 +1,7 @@
+# Changelog
+All notable changes to this extension will be documented in this file.
+
+## [13.0.4] - 2025-09-02
+
+### Fixed
+- Fixed cache invalidation bug when creating or deleting a page.

Classes/Cache/CloudFrontCacheManager.php

@@ -253,7 +253,7 @@ public function queueClearCache(int $pageId, bool $recursive = false, string|nul
 
             if (count($languages) > 0) {
                 if ($this->isMultiLanguageDomains($entry)) {
-                    $this->enqueue($this->buildLink($entry, array('_language' => 0)) . $wildcard, $this->distributionsMapping[$languages[0]->getBase()->getHost()]);
+                    $this->enqueue($this->buildLink($entry, array('_language' => 0)) . $wildcard, $this->distributionsMapping[(string)$languages[0]->getBase()->getHost()]);
                     foreach ($languages as $k => $lang) {
                         if ($lang->getLanguageId() != 0) {
                             $this->enqueue($this->buildLink($entry, array('_language' => $lang->getLanguageId())) . $wildcard, $this->distributionsMapping[$lang->getBase()->getHost()]);
@@ -327,15 +327,10 @@ public function getLanguagesDomains(int $uid_page): array
      * @return bool True if there are multiple languages with different domains, false otherwise.
      */
     public function isMultiLanguageDomains(int $uid_page): bool
-    {
-        $multi = true;
+    {;
         $domains = $this->getLanguagesDomains($uid_page);
-        foreach ($domains as $lang => $domain) {
-            if (strpos($domain, '.') === false) {
-                $multi = false;
-            }
-        }
-        return $multi;
+
+        return count(array_unique(array_map('strtolower', $domains))) > 1;
     }
 
     /**

Classes/Hooks/ClearCachePostProc.php

@@ -17,6 +17,7 @@
 
 namespace Toumoro\TmCloudfront\Hooks;
 
+use Doctrine\DBAL\ParameterType;
 use Toumoro\TmCloudfront\Cache\CloudFrontCacheManager;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -33,7 +34,9 @@ class ClearCachePostProc
 
     protected CloudFrontCacheManager $cacheManager;
 
-    public function __construct()
+    public function __construct(
+        protected SiteFinder $siteFinder
+    )
     {
         $this->cloudFrontConfiguration = GeneralUtility::makeInstance(ExtensionConfiguration::class)
             ->get('tm_cloudfront')['cloudfront'];
@@ -105,8 +108,10 @@ public function clearCachePostProc(&$params, &$pObj): void
             $distributionIds = $this->getDistributionIds($uid_page, $params);
 
             // Priority to TsConfig settings
-            if (!empty($tsConfig['distributionIds'])) {
-                $distributionIds = $tsConfig['distributionIds'];
+            if (!empty($tsConfig['TCEMAIN.'])) {
+                if(!empty($tsConfig['TCEMAIN.']['distributionIds'])) {
+                    $distributionIds = $tsConfig['TCEMAIN.']['distributionIds'];
+                }
             }
 
             // If the record is not a page, enqueue only the current page
@@ -178,8 +183,10 @@ protected function getDistributionsFromDomains(array $domains): string
     protected function getDistributionIds(int $uid_page, array $params): string
     {
         $domain = '';
-        if ($uid_page > 0 && isset($params['table'], $params['uid'])) {
-            $site = GeneralUtility::makeInstance(SiteFinder::class)->getSiteByPageId($uid_page);
+
+        if ($uid_page > 0 && isset($params['table'], $params['uid']) && !$this->isPageDeleted($uid_page)) {
+            $site = $this->siteFinder->getSiteByPageId($uid_page);
+
             $row = GeneralUtility::makeInstance(ConnectionPool::class)
                 ->getQueryBuilderForTable($params['table'])
                 ->select('*')
@@ -206,4 +213,24 @@ protected function getDistributionIds(int $uid_page, array $params): string
 
         return $distributionIds;
     }
+
+    private function isPageDeleted($uid): int
+    {
+        $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
+            ->getQueryBuilderForTable('pages');
+
+        $queryBuilder->getRestrictions()->removeAll();
+
+       return (int)$queryBuilder
+            ->select('deleted')
+            ->from('pages')
+            ->where(
+                $queryBuilder->expr()->eq(
+                    'uid',
+                    $queryBuilder->createNamedParameter($uid, ParameterType::INTEGER)
+                )
+            )
+            ->executeQuery()
+            ->fetchOne();
+    }
 }

ext_emconf.php

@@ -17,7 +17,7 @@
     'author' => 'Simon Ouellet',
     'author_email' => '',
     'state' => 'beta',
-    'version' => '13.0.2',
+    'version' => '13.0.4',
     'constraints' => [
         'depends' => [
             'typo3' => '12.4.0-13.5.99',