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

Author: robertSt7

composer.json

@@ -17,27 +17,25 @@
   "prefer-stable": true,
   "minimum-stability": "dev",
   "require": {
-    "php": "~8.3.0 || ~8.4.0 ",
+    "php": "~8.4.0 || ~8.5.0 ",
     "nesbot/carbon": "^3.8.4",
-    "pimcore/pimcore": "^12.3",
-    "pimcore/static-resolver-bundle": "^3.0",
+    "pimcore/pimcore": "^2026.1",
+    "pimcore/static-resolver-bundle": "^2026.1",
     "pimcore/opensearch-client": "^2.0",
     "pimcore/elasticsearch-client": "^2.0",
     "doctrine/orm": "^3.0",
-    "symfony/scheduler": "^6.4 || ^7.2"
+    "symfony/scheduler": "^7.2"
   },
   "require-dev": {
     "roave/security-advisories": "dev-latest",
-    "codeception/codeception": "^5.3.2",
-    "codeception/stub": "^4.3.0",
-    "codeception/phpunit-wrapper": "^9",
-    "codeception/module-asserts": "^2",
-    "codeception/module-symfony": "^3.1.1",
+    "codeception/codeception": "^5.3.4",
+    "codeception/module-asserts": "^3.0",
+    "codeception/module-symfony": "^3.7.1",
     "phpstan/phpstan": "1.12.15",
     "phpstan/phpstan-symfony": "^1.2.20",
-    "phpunit/phpunit": "^10.5.63",
+    "phpunit/phpunit": "^10.5",
     "nyholm/psr7": "^1",
-    "symfony/phpunit-bridge": "^6",
+    "symfony/phpunit-bridge": "^7",
     "fakerphp/faker": "^1.23",
     "friendsofphp/php-cs-fixer": "^3.4"
   },
@@ -53,7 +51,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-2.x": "2.4.x-dev"
+      "dev-2026.x": "2026.1.x-dev"
     },
     "pimcore": {
       "bundles": [

doc/01_Installation/02_Upgrade.md

@@ -2,6 +2,10 @@
 
 Following steps are necessary during updating to newer versions.
 
+## Upgrade to 2026.1.0
+- Added support to `PHP` `8.5`.
+- Removed support to `PHP` `8.3` and Symfony `v6`.
+- 
 ## Upgrade to 2.2.0
 - [Indexing] Added `id` column as new primary key to `generic_data_index_queue`. Please make sure to execute migrations.
 - [Searching] Added `trackTotalHits` parameter to `DefaultSearchService` and `SearchExecutionService`. The default value is true,       which means that total hits will always be computed accurately, even if they exceed the search engines threshold for accurate hit calculation. Change this parameter to `null`, to use the default threshold, pass an integer value to set a specific one.

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:
@@ -32,4 +32,4 @@ For the further configuration of the client, please refer to the [Pimcore Elasti
 
 ## Important Elasticsearch Configuration
 
-Elasticsearch automatically creates indices on storing data if the index does not yet exist. This will cause issues with wrong indices and missing aliases. To overcome this issue, you need to disable that feature with the configuration `action.auto_create_index=false`.
+Elasticsearch automatically creates indices on storing data if the index does not yet exist. This will cause issues with wrong indices and missing aliases. To overcome this issue, you need to disable that feature with the configuration `action.auto_create_index=false`.

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/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';
     }