Merged branch '1.3' of ezsystems/ezplatform-kernel into 4.5 (#302)

Cross-merged changes from ezsystems/ezplatform-kernel#392.
ibexa · Dec 4, 2023 · 65fb6d5 · 65fb6d5
2 parents 369a277 + 67d9256
commit 65fb6d5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/lib/Persistence/Cache/ContentTypeHandler.php b/src/lib/Persistence/Cache/ContentTypeHandler.php
@@ -19,9 +19,10 @@ class ContentTypeHandler extends AbstractInMemoryPersistenceHandler implements C
     private const TYPE_IDENTIFIER = 'type';
     private const TYPE_GROUP_IDENTIFIER = 'type_group';
     private const CONTENT_TYPE_IDENTIFIER = 'content_type';
+    private const CONTENT_TYPE_WITH_ID_SUFFIX_IDENTIFIER = 'content_type_with_id_suffix';
+    private const CONTENT_TYPE_WITH_BY_REMOTE_SUFFIX_IDENTIFIER = 'content_type_with_by_remote_suffix';
     private const CONTENT_TYPE_GROUP_IDENTIFIER = 'content_type_group';
     private const CONTENT_TYPE_GROUP_WITH_ID_SUFFIX_IDENTIFIER = 'content_type_group_with_id_suffix';
-    private const CONTENT_TYPE_GROUP_WITH_BY_REMOTE_SUFFIX_IDENTIFIER = 'content_type_group_with_by_remote_suffix';
     private const CONTENT_TYPE_GROUP_LIST_IDENTIFIER = 'content_type_group_list';
     private const BY_IDENTIFIER_SUFFIX = 'by_identifier_suffix';
     private const CONTENT_TYPE_LIST_BY_GROUP_IDENTIFIER = 'content_type_list_by_group';
@@ -77,12 +78,12 @@ protected function init(): void
                 $this->cacheIdentifierGenerator->generateKey(self::CONTENT_TYPE_IDENTIFIER, [$type->id], true),
                 $this->cacheIdentifierGenerator->generateKey(self::CONTENT_TYPE_IDENTIFIER, [$type->id], true) . '-' . $status,
                 $this->cacheIdentifierGenerator->generateKey(
-                    self::CONTENT_TYPE_GROUP_WITH_ID_SUFFIX_IDENTIFIER,
+                    self::CONTENT_TYPE_WITH_ID_SUFFIX_IDENTIFIER,
                     [$this->cacheIdentifierSanitizer->escapeForCacheKey($type->identifier)],
                     true
                 ),
                 $this->cacheIdentifierGenerator->generateKey(
-                    self::CONTENT_TYPE_GROUP_WITH_BY_REMOTE_SUFFIX_IDENTIFIER,
+                    self::CONTENT_TYPE_WITH_BY_REMOTE_SUFFIX_IDENTIFIER,
                     [$this->cacheIdentifierSanitizer->escapeForCacheKey($type->remoteId)],
                     true
                 ),

diff --git a/src/lib/Resources/settings/storage_engines/cache.yml b/src/lib/Resources/settings/storage_engines/cache.yml
@@ -24,10 +24,11 @@ parameters:
         content_version_list: 'c-%s-vl'
         content_version: 'c-%%s-v-%%s'
         content_type: 'ct-%s'
+        content_type_with_by_remote_suffix: 'ct-%s-br'
+        content_type_with_id_suffix: 'ct-%s-bi'
         content_type_field_map: 'ctfm'
         content_type_group: 'ctg-%s'
         content_type_group_with_id_suffix: 'ctg-%s-bi'
-        content_type_group_with_by_remote_suffix: 'ctg-%s-br'
         content_type_group_list: 'ctgl-%s'
         content_type_list_by_group: 'ctlbg-%s'
         image_variation: 'ig'
@@ -121,10 +122,11 @@ parameters:
         content_version_list: 'c-%s-vl'
         content_version: 'c-%%s-v-%%s'
         content_type: 'ct-%s'
+        content_type_with_by_remote_suffix: 'ct-%s-br'
+        content_type_with_id_suffix: 'ct-%s-bi'
         content_type_field_map: 'ctfm'
         content_type_group: 'ctg-%s'
         content_type_group_with_id_suffix: 'ctg-%s-bi'
-        content_type_group_with_by_remote_suffix: 'ctg-%s-br'
         content_type_list_by_field_definition_identifier: 'ctlbfdi-%s'
         content_type_group_list: 'ctgl-%s'
         content_type_list_by_group: 'ctlbg-%s'