Merge remote-tracking branch 'origin/2.4' into 2.5

Author: robertSt7

.github/ci/files/composer.json

@@ -17,11 +17,10 @@
   },
   "require-dev": {
     "codeception/codeception": "^5.3.2",
-    "codeception/stub": "^4.3.0",
     "codeception/phpunit-wrapper": "^9",
     "codeception/module-asserts": "^2",
     "codeception/module-symfony": "^3.1.1",
-    "phpunit/phpunit": "^10.5.63"
+    "phpunit/phpunit": "10.2.7"
   },
   "autoload": {
     "psr-4": {

doc/02_Configuration/05_Elasticsearch.md

@@ -18,7 +18,7 @@ pimcore_elasticsearch_client:
         hosts: ['elastic:9200']
         username: 'elastic'
         password: 'somethingsecret'
-        logger_channel: 'pimcore.elasicsearch'
+        logger_channel: 'pimcore.elasticsearch'
 
 # Define the client to be used by your bundle (default client_type is 'openSearch')
 pimcore_generic_data_index:

doc/04_Searching_For_Data_In_Index/09_Pimcore_Query_Language/README.md

@@ -1,4 +1,4 @@
-# Pimcore Query Language
+# Pimcore Query Language (PQL)
 
 Pimcore Query Language (PQL) is a query language that allows you to search for data in the Pimcore Generic Data Index. It is a simple and powerful query language that allows you to search for data using a wide range of search criteria.
 

src/SearchIndexAdapter/DefaultSearch/DataObject/FieldDefinitionAdapter/TextKeywordAdapter.php

@@ -39,13 +39,4 @@ public function getIndexMapping(): array
             $this->searchIndexConfigService->getSearchAnalyzerAttributes()
         );
     }
-
-    public function normalize(mixed $value): mixed
-    {
-        if (is_string($value) && $value !== '') {
-            return preg_replace("/src=(['\"])data:[^;]+;base64,.+?\\1/", '', $value);
-        }
-
-        return parent::normalize($value);
-    }
 }

src/SearchIndexAdapter/DefaultSearch/DataObject/FieldDefinitionAdapter/TimeAdapter.php

@@ -27,4 +27,13 @@ public function getIndexMapping(): array
             'format' => 'strict_hour_minute',
         ];
     }
+
+    public function normalize(mixed $value): mixed
+    {
+        if ($value === '') {
+            return null;
+        }
+
+        return parent::normalize($value);
+    }
 }

src/SearchIndexAdapter/DefaultSearch/PathService.php

@@ -124,8 +124,6 @@ private function updatePath(string $indexName, string $currentPath, string $newP
                     'params' => [
                         'currentPath' => $currentPath . '/',
                         'newPath' => $newPath . '/',
-                        'changePathLevel' => count($pathLevels) - 1,
-                        'newPathLevelName' => end($pathLevels),
                     ],
                 ],
 
@@ -154,15 +152,65 @@ private function getScriptSource(): string
                     String subFullPath = ctx._source.system_fields.fullPath.substring(params.currentPath.length());
                     ctx._source.system_fields.fullPath = params.newPath + subFullPath;
 
-                    for (int i = 0; i < ctx._source.system_fields.pathLevels.length; i++) {
-
+                    if(ctx._source.system_fields.thumbnail != null && 
+                       ctx._source.system_fields.thumbnail.length() >= params.currentPath.length()) {
+                        String thumbnailPrefix = ctx._source.system_fields.thumbnail.substring(
+                            0, 
+                            params.currentPath.length()
+                        );
+                        if(thumbnailPrefix == params.currentPath) {
+                            String thumbnailSubPath = ctx._source.system_fields.thumbnail.substring(
+                                params.currentPath.length()
+                            );
+                            ctx._source.system_fields.thumbnail = params.newPath + thumbnailSubPath;
+                        }   
+                    }
 
-                      if(ctx._source.system_fields.pathLevels[i].level == params.changePathLevel) {
+                    if(ctx._source.containsKey("custom_fields") && 
+                       ctx._source.custom_fields.containsKey("PortalEngineBundle") && 
+                       ctx._source.custom_fields.PortalEngineBundle.containsKey("system_fields") && 
+                       ctx._source.custom_fields.PortalEngineBundle.system_fields.containsKey("thumbnail")) {
+                        def customFields = ctx._source.custom_fields.PortalEngineBundle.system_fields;
+                        if(customFields.thumbnail != null && customFields.thumbnail instanceof String) {
+                            String thumb = customFields.thumbnail;
+                            String prefix = "";
+                            int pathStart = 0;
+                            
+                            if(thumb.startsWith("/cache-buster-")) {
+                                int slashPos = thumb.indexOf("/", 1);
+                                if(slashPos > 0) {
+                                    prefix = thumb.substring(0, slashPos);
+                                    pathStart = slashPos;
+                                }
+                            }
+                            
+                            String encodedCurrentPath = params.currentPath.replace(" ", "%20");
+                            String thumbPath = thumb.substring(pathStart);
+                            
+                            if(thumbPath.startsWith(encodedCurrentPath) || thumbPath.startsWith(params.currentPath)) {
+                                String matchedPath = thumbPath.startsWith(encodedCurrentPath) ? 
+                                    encodedCurrentPath : params.currentPath;
+                                String remainingPath = thumbPath.substring(matchedPath.length());
+                                String encodedNewPath = params.newPath.replace(" ", "%20");
+                                customFields.thumbnail = prefix + encodedNewPath + remainingPath;
+                            }
+
+                        }
+                    }
 
-                        ctx._source.system_fields.pathLevels[i].name = params.newPathLevelName;
+                    String[] newPathParts = ctx._source.system_fields.path.splitOnToken("/");
+                    
+                    def newLevels = [];
+                    int levelCounter = 1;
+                    for (int i = 0; i < newPathParts.length; i++) {
+                      if(newPathParts[i].length() > 0) {
+                        newLevels.add(["level": levelCounter, "name": newPathParts[i]]);
+                        levelCounter++;
                       }
                     }
+                    ctx._source.system_fields.pathLevels = newLevels;
                 }
+                ctx._source.system_fields.modificationDate = Instant.now().toString();
                 ctx._source.system_fields.checksum = 0';
     }