Merge remote-tracking branch 'origin/2026.1' into 2026.x

Author: martineiber

CONTRIBUTING.md

@@ -0,0 +1,10 @@
+## Contributing Studio Pull Requests
+We gladly accept community pull requests. This is the preferred way to contribute to Pimcore. There are a few necessary steps before we can accept a pull request:
+
+* [Fork us!](https://help.github.com/articles/fork-a-repo/)
+* Select the right branch. `main`(`2026.x`) for features and improvements or latest maintenance branch for bug fixes (`2025.4`)
+* [Send a pull request](https://help.github.com/articles/using-pull-requests/) from your fork’s branch to our repo branch.
+* [Sign the CLA](https://cla-assistant.io/pimcore/pimcore) - see also below.
+* Ensure that Github pipelines pass (linter, tests...)
+
+For details please check also the contributing docs of [pimcore/pimcore](https://github.com/pimcore/pimcore/blob/2026.x/CONTRIBUTING.md).

README.md

@@ -39,3 +39,11 @@ This bundle requires the following dependencies:
 - [Installation and Configuration](./doc/02_Installation_and_Configuration/README.md)
 - [Extending](./doc/03_Extending/README.md)
 - [Development Details](./doc/04_Development_Details/README.md)
+
+
+## Contribute
+**Bug fixes:** please create a pull request including a step by step description to reproduce the problem  
+**Contribute features:** contact the core-team via issue before you start developing   
+**Security vulnerabilities:** please see our [security policy](https://github.com/pimcore/pimcore/security/policy)
+
+For details, please have a look at our [contributing guide](CONTRIBUTING.md).

composer.json

@@ -20,7 +20,7 @@
     "php": "~8.4.0 || ~8.5.0",
     "league/csv": "^9.27",
     "nesbot/carbon": "^3.10.0",
-    "pimcore/static-resolver-bundle": "^2026.1",
+    "pimcore/static-resolver-bundle": "^2026.1.1",
     "pimcore/generic-data-index-bundle": "^2026.1",
     "pimcore/pimcore": "^2026.1",
     "zircote/swagger-php": "^5.0",
@@ -38,14 +38,13 @@
   },
   "require-dev": {
     "roave/security-advisories": "dev-latest",
-    "codeception/codeception": "^5.3",
-    "codeception/stub": "^4.1.4",
+    "codeception/codeception": "^5.3.5",
+    "codeception/stub": "^4.3.0",
     "codeception/module-symfony": "^3.5",
-    "codeception/phpunit-wrapper": "^9",
     "codeception/module-asserts": "^2",
     "phpstan/phpstan": "2.1.26",
     "phpstan/phpstan-symfony": "^2.0.2",
-    "phpunit/phpunit": "^10.5",
+    "phpunit/phpunit": "^12.5.23 || ^13.1.7",
     "nyholm/psr7": "^1",
     "symfony/phpunit-bridge": "^6",
     "fakerphp/faker": "^1.23"

doc/03_Extending/06_Data_Objects/01_Field_Definition_Adapters.md

@@ -11,6 +11,8 @@ types. Each field type (input, date, relation, etc.) has an adapter that control
 - **Saved** — transforming incoming API request data into the format the field definition
   expects before it is stored.
 - **Read** — normalizing stored data into an API-friendly response format.
+- **Detail page** — providing a detail-page-specific representation that may differ from the
+  normalized value (falls back to normalization when not implemented).
 - **Exported** — converting stored data into a string for grid/CSV export.
 - **Inherited** — resolving inherited values in the data object hierarchy.
 - **Previewed** — providing preview data for search results.
@@ -43,6 +45,7 @@ and can be added when your field type needs the corresponding capability.
 |---|---|---|
 | `SetterDataInterface` | **Yes** | Transform API request data for saving |
 | `DataNormalizerInterface` | No | Customize the API response format |
+| `DetailDataInterface` | No | Provide a detail-page-specific value (falls back to `DataNormalizerInterface`) |
 | `DataExportInterface` | No | Provide a string representation for grid/CSV export |
 | `DataInheritanceInterface` | No | Resolve inherited values in the object hierarchy |
 | `SearchPreviewDataInterface` | No | Contribute preview data to search results |
@@ -128,6 +131,47 @@ Return the API-friendly representation of the value.
 
 ---
 
+### DetailDataInterface
+
+Implement this interface when the detail page of a data object should display a different
+representation than the normalized value. When this interface
+is **not** implemented, the system automatically falls back to
+`DataNormalizerInterface::normalize()`.
+
+**When to use:**
+
+- The detail page requires a richer or more descriptive value than from `normalize()`.
+
+
+```php
+namespace Pimcore\Bundle\StudioBackendBundle\DataObject\Data;
+
+use Pimcore\Bundle\StudioBackendBundle\DataObject\Data\Model\FieldContextData;
+use Pimcore\Model\DataObject\ClassDefinition\Data;
+use Pimcore\Model\DataObject\Concrete;
+
+interface DetailDataInterface
+{
+    public function getDetailData(
+        Concrete $object,
+        mixed $value,
+        Data $fieldDefinition,
+        ?FieldContextData $contextData = null,
+    ): mixed;
+}
+```
+
+| Parameter | Description |
+|---|---|
+| `$object` | The data object being loaded for the detail page. |
+| `$value` | The raw stored value from the data object getter. |
+| `$fieldDefinition` | The Pimcore field definition for this field. |
+| `$contextData` | Container context (object brick, localized field, etc.), or `null` for top-level fields. |
+
+Return the detail-page-specific representation of the value.
+
+---
+
 ### DataExportInterface
 
 Implement this interface when the field type needs custom handling for grid column display
@@ -314,6 +358,7 @@ namespace App\DataObject\Data\Adapter;
 use Pimcore\Bundle\StudioBackendBundle\DataObject\Data\DataExportInterface;
 use Pimcore\Bundle\StudioBackendBundle\DataObject\Data\DataInheritanceInterface;
 use Pimcore\Bundle\StudioBackendBundle\DataObject\Data\DataNormalizerInterface;
+use Pimcore\Bundle\StudioBackendBundle\DataObject\Data\DetailDataInterface;
 use Pimcore\Bundle\StudioBackendBundle\DataObject\Data\Model\FieldContextData;
 use Pimcore\Bundle\StudioBackendBundle\DataObject\Data\SearchPreviewDataInterface;
 use Pimcore\Bundle\StudioBackendBundle\DataObject\Data\SetterDataInterface;
@@ -326,6 +371,7 @@ use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag;
 final readonly class CustomFieldAdapter implements
     SetterDataInterface,
     DataNormalizerInterface,
+    DetailDataInterface,
     DataExportInterface,
     DataInheritanceInterface,
     SearchPreviewDataInterface
@@ -374,6 +420,19 @@ final readonly class CustomFieldAdapter implements
         return $value;
     }
 
+    // --- DetailDataInterface (optional) ---
+
+    public function getDetailData(
+        Concrete $object,
+        mixed $value,
+        Data $fieldDefinition,
+        ?FieldContextData $contextData = null,
+    ): mixed {
+        // Return a detail-page-specific representation of the value.
+        // When this interface is not implemented, normalize() is called instead.
+        return $value;
+    }
+
     // --- DataExportInterface (optional) ---
 
     public function getExportData(
@@ -466,19 +525,19 @@ class required.
 | `InputQuantityValueAdapter` | `inputQuantityValue` | Setter |
 | `QuantityValueRangeAdapter` | `quantityValueRange` | Setter |
 | `UrlSlugAdapter` | `urlSlug` | Setter |
-| `CalculatedValueAdapter` | `calculatedValue` | Setter |
+| `CalculatedValueAdapter` | `calculatedValue` | Setter, Detail |
 | `EncryptedFieldAdapter` | `encryptedField` | Setter, Normalizer, Export |
 | `TableAdapter` | `table` | Setter, SearchPreview |
 | `StructuredTableAdapter` | `structuredTable` | Setter, Normalizer, SearchPreview |
 | `BlockAdapter` | `block` | Setter, Normalizer, SearchPreview |
 | `FieldCollectionsAdapter` | `fieldcollections` | Setter, Normalizer, SearchPreview |
-| `ObjectBricksAdapter` | `objectbricks` | Setter, Normalizer, Inheritance, SearchPreview |
-| `LocalizedFieldsAdapter` | `localizedfields` | Setter, Normalizer, Inheritance, SearchPreview |
-| `ClassificationStoreAdapter` | `classificationstore` | Setter, Normalizer, Inheritance, SearchPreview |
+| `ObjectBricksAdapter` | `objectbricks` | Setter, Normalizer, Detail, Inheritance, SearchPreview |
+| `LocalizedFieldsAdapter` | `localizedfields` | Setter, Normalizer, Detail, Inheritance, SearchPreview |
+| `ClassificationStoreAdapter` | `classificationstore` | Setter, Normalizer, Detail, Inheritance, SearchPreview |
 
 **Legend:** Setter = `SetterDataInterface`, Normalizer = `DataNormalizerInterface`,
-Export = `DataExportInterface`, Inheritance = `DataInheritanceInterface`,
-SearchPreview = `SearchPreviewDataInterface`
+Detail = `DetailDataInterface`, Export = `DataExportInterface`,
+Inheritance = `DataInheritanceInterface`, SearchPreview = `SearchPreviewDataInterface`
 
 :::info
 

src/DataObject/Data/Adapter/CalculatedValueAdapter.php

@@ -13,20 +13,38 @@
 
 namespace Pimcore\Bundle\StudioBackendBundle\DataObject\Data\Adapter;
 
+use Pimcore\Bundle\StaticResolverBundle\Models\DataObject\DataObjectServiceResolverInterface;
+use Pimcore\Bundle\StudioBackendBundle\DataObject\Data\DetailDataInterface;
 use Pimcore\Bundle\StudioBackendBundle\DataObject\Data\Model\FieldContextData;
 use Pimcore\Bundle\StudioBackendBundle\DataObject\Data\SetterDataInterface;
 use Pimcore\Bundle\StudioBackendBundle\DataObject\Service\DataAdapterLoaderInterface;
 use Pimcore\Model\DataObject\ClassDefinition\Data;
+use Pimcore\Model\DataObject\ClassDefinition\Data\CalculatedValue as CalculatedValueDefinition;
 use Pimcore\Model\DataObject\Concrete;
+use Pimcore\Model\DataObject\Data\CalculatedValue;
+use Pimcore\Model\DataObject\Objectbrick\Data\AbstractData;
 use Pimcore\Model\UserInterface;
 use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag;
 
 /**
  * @internal
  */
 #[AutoconfigureTag(DataAdapterLoaderInterface::ADAPTER_TAG)]
-final readonly class CalculatedValueAdapter implements SetterDataInterface
+final readonly class CalculatedValueAdapter implements SetterDataInterface, DetailDataInterface
 {
+    private const string OWNER_TYPE_OBJECT = 'object';
+
+    private const string OWNER_TYPE_LOCALIZED_FIELD = 'localizedfield';
+
+    private const string OWNER_TYPE_OBJECT_BRICK = 'objectbrick';
+
+    private const string LOCALIZED_FIELDS_NAME = 'localizedfields';
+
+    public function __construct(
+        private DataObjectServiceResolverInterface $dataObjectServiceResolver,
+    ) {
+    }
+
     public function getDataForSetter(
         Concrete $element,
         Data $fieldDefinition,
@@ -38,4 +56,72 @@ public function getDataForSetter(
     ): null {
         return null;
     }
+
+    public function getDetailData(
+        Concrete $object,
+        mixed $value,
+        Data $fieldDefinition,
+        ?FieldContextData $contextData = null,
+    ): ?string {
+        if (!$fieldDefinition instanceof CalculatedValueDefinition) {
+            return null;
+        }
+
+        $calculatedValue = new CalculatedValue($fieldDefinition->getName());
+        $this->applyContextualData($calculatedValue, $fieldDefinition, $contextData);
+
+        return $this->dataObjectServiceResolver->getCalculatedFieldValueForEditMode(
+            $object,
+            [],
+            $calculatedValue,
+        );
+    }
+
+    private function applyContextualData(
+        CalculatedValue $calculatedValue,
+        CalculatedValueDefinition $fieldDefinition,
+        ?FieldContextData $contextData,
+    ): void {
+        $contextObject = $contextData?->getContextObject();
+
+        if ($contextObject instanceof AbstractData) {
+            $calculatedValue->setContextualData(
+                self::OWNER_TYPE_OBJECT_BRICK,
+                $contextObject->getFieldname(),
+                $contextObject->getType(),
+                $fieldDefinition->getName(),
+                null,
+                null,
+                $fieldDefinition,
+            );
+
+            return;
+        }
+
+        $language = $contextData?->getLanguage();
+
+        if ($language !== null) {
+            $calculatedValue->setContextualData(
+                self::OWNER_TYPE_LOCALIZED_FIELD,
+                self::LOCALIZED_FIELDS_NAME,
+                null,
+                $language,
+                null,
+                null,
+                $fieldDefinition,
+            );
+
+            return;
+        }
+
+        $calculatedValue->setContextualData(
+            self::OWNER_TYPE_OBJECT,
+            $fieldDefinition->getName(),
+            null,
+            null,
+            null,
+            null,
+            $fieldDefinition,
+        );
+    }
 }