Merge remote-tracking branch 'origin/11.1' into 11.x

pimcore · Dec 21, 2023 · 75b854f · 75b854f
2 parents 95d96df + 28c2112
commit 75b854f
Show file tree

Hide file tree

Showing 11 changed files with 62 additions and 20 deletions.
diff --git a/bundles/CoreBundle/config/pimcore/default.yaml b/bundles/CoreBundle/config/pimcore/default.yaml
@@ -329,3 +329,8 @@ pimcore:
 
     gotenberg:
         base_url: 'http://gotenberg:3000'
+
+    config_location:
+        select_options:
+            read_target:
+                type: 'symfony-config'
diff --git a/bundles/CoreBundle/src/DependencyInjection/Configuration.php b/bundles/CoreBundle/src/DependencyInjection/Configuration.php
@@ -138,8 +138,6 @@ public function getConfigTreeBuilder(): TreeBuilder
             'perspectives' => PIMCORE_CONFIGURATION_DIRECTORY . '/perspectives',
             'custom_views' => PIMCORE_CONFIGURATION_DIRECTORY . '/custom_views',
             'object_custom_layouts' => PIMCORE_CONFIGURATION_DIRECTORY . '/object_custom_layouts',
-            'system_settings' => PIMCORE_CONFIGURATION_DIRECTORY . '/system_settings',
-            'select_options' => PIMCORE_CONFIGURATION_DIRECTORY . '/select_options',
         ]);
 
         ConfigurationHelper::addConfigLocationTargetNode(
@@ -149,6 +147,13 @@ public function getConfigTreeBuilder(): TreeBuilder
             [LocationAwareConfigRepository::READ_TARGET]
         );
 
+        ConfigurationHelper::addConfigLocationTargetNode(
+            $storageNode,
+            'select_options',
+            PIMCORE_CONFIGURATION_DIRECTORY . '/select_options',
+            [LocationAwareConfigRepository::READ_TARGET]
+        );
+
         return $treeBuilder;
     }
 

diff --git a/bundles/TinymceBundle/public/js/editor.js b/bundles/TinymceBundle/public/js/editor.js
@@ -106,7 +106,7 @@ pimcore.bundle.tinymce.editor = Class.create({
                     document.dispatchEvent(new CustomEvent(pimcore.events.changeWysiwyg, {
                         detail: {
                             e: eChange,
-                            data: tinymce.activeEditor.contentAreaContainer.innerHTML,
+                            data: tinymce.activeEditor.getContent(),
                             context: e.detail.context
                         }
                     }));
@@ -115,7 +115,7 @@ pimcore.bundle.tinymce.editor = Class.create({
                     document.dispatchEvent(new CustomEvent(pimcore.events.changeWysiwyg, {
                         detail: {
                             e: eChange,
-                            data: tinymce.activeEditor.contentAreaContainer.innerHTML,
+                            data: tinymce.activeEditor.getContent(),
                             context: e.detail.context
                         }
                     }));

diff --git a/doc/03_Documents/01_Editables/40_WYSIWYG.md b/doc/03_Documents/01_Editables/40_WYSIWYG.md
@@ -30,7 +30,7 @@ The Editor als needs to dispatch the `pimcore.events.changeWysiwyg` to set the v
 document.dispatchEvent(new CustomEvent(pimcore.events.changeWysiwyg, {
     detail: {
         e: eChange,
-        data: tinymce.activeEditor.contentAreaContainer.innerHTML, //text of the editor-field
+        data: tinymce.activeEditor.getContent(), //text of the editor-field
         context: e.detail.context //the context in which the editor is registered (object, document ...) 
     }
 }));

diff --git a/doc/05_Objects/01_Object_Classes/01_Data_Types/10_Calculated_Value_Type.md b/doc/05_Objects/01_Object_Classes/01_Data_Types/10_Calculated_Value_Type.md
@@ -77,7 +77,8 @@ with details about calculated-value field is affected and where it is located at
 
 ```php
 namespace App;
-
+
+use Pimcore\Logger;
 use Pimcore\Model\DataObject\Concrete;
 use Pimcore\Model\DataObject\ClassDefinition\CalculatorClassInterface;
 use Pimcore\Model\DataObject\Data\CalculatedValue;
@@ -88,9 +89,10 @@ class Calculator implements CalculatorClassInterface
     {
         if ($context->getFieldname() == "sum") {
             $language = $context->getPosition();
-            return $object->getXValue($language) +  $object->getYValue($language);
+            return $object->getXValue($language) + $object->getYValue($language);
         } else {
-            \Logger::error("unknown field");
+            Logger::error("unknown field");
+            return '';
         }
     }
 } 
@@ -102,7 +104,8 @@ In addition to the `compute` method you need to implement the `getCalculatedValu
 This method is used to display the value in object edit mode:
 
 ```php
-public function getCalculatedValueForEditMode(Concrete $object, CalculatedValue $context): string {
+public function getCalculatedValueForEditMode(Concrete $object, CalculatedValue $context): string
+{
     $language = $context->getPosition();
     $result = $object->getXValue($language) . " + " . $object->getYValue($language) . " = " . $this->compute($object, $context);
     return $result;

diff --git a/doc/23_Installation_and_Upgrade/07_Updating_Pimcore/12_V10_to_V11.md b/doc/23_Installation_and_Upgrade/07_Updating_Pimcore/12_V10_to_V11.md
@@ -76,6 +76,20 @@ If you are not using Web2Print functionality, set the flag to false.
 ### WYSIWYG-Editor
 Please add all html tags with attributes you want to allow to the html_sanitizer like described [here](../../03_Documents/01_Editables/40_WYSIWYG.md)
 
+### Redis Cache Configuration
+If you are using `Redis` adapter for `Pimcore\Cache` then adapt the configuration as below:
+```yaml
+framework:
+    cache:
+        pools:
+            pimcore.cache.pool:
+                #tags: true // this line needs to be removed
+                public: true 
+                default_lifetime: 31536000  # 1 year
+                adapter: cache.adapter.redis_tag_aware # use this instead of pimcore.cache.adapter.redis_tag_aware
+                ...
+```
+
 ## Update Pimcore via Composer
 
 Update Pimcore to Pimcore 11 via composer statement `composer require -W pimcore/pimcore:^11.0 pimcore/admin-ui-classic-bundle`. 

diff --git a/lib/Mail/Mailer.php b/lib/Mail/Mailer.php
@@ -20,6 +20,7 @@
 use Pimcore\Mail\Plugins\RedirectingPlugin;
 use Symfony\Component\Mailer\Envelope;
 use Symfony\Component\Mailer\MailerInterface;
+use Symfony\Component\Mime\Message;
 use Symfony\Component\Mime\RawMessage;
 
 class Mailer implements MailerInterface
@@ -40,6 +41,10 @@ public function send(RawMessage $message, Envelope $envelope = null): void
             $this->redirectPlugin->beforeSendPerformed($message);
         }
 
+        if($message instanceof Message && !$message->getHeaders()->has('X-Transport')) {
+            $message->getHeaders()->addTextHeader('X-Transport', 'main');
+        }
+
         $this->mailer->send($message, $envelope);
 
         if ($message instanceof Mail) {

diff --git a/lib/Tool/Admin.php b/lib/Tool/Admin.php
@@ -39,11 +39,11 @@ public static function getLanguages(): array
     {
         $baseResource = \Pimcore::getContainer()->getParameter('pimcore_admin.translations.path');
         $languageDir = \Pimcore::getKernel()->locateResource($baseResource);
-        $adminLang = \Pimcore::getContainer()->getParameter('pimcore_admin.admin_languages');
+        $adminLanguages = \Pimcore::getContainer()->getParameter('pimcore_admin.admin_languages');
         $appDefaultPath = \Pimcore::getContainer()->getParameter('translator.default_path');
 
-        $languages = [];
         $languageDirs = [$languageDir, $appDefaultPath];
+        $translatedLanguages = [];
         foreach ($languageDirs as $filesDir) {
             if (is_dir($filesDir)) {
                 $files = scandir($filesDir);
@@ -57,18 +57,27 @@ public static function getLanguages(): array
                             $languageCode = $parts[1];
                         }
 
-                        if (($adminLang != null && in_array($languageCode, array_values($adminLang))) || $adminLang == null) {
-                            if ($parts[1] === 'json' || $parts[0] === 'admin') {
-                                if (\Pimcore::getContainer()->get(LocaleServiceInterface::class)->isLocale($languageCode)) {
-                                    $languages[] = $languageCode;
-                                }
+                        if ($parts[1] === 'json' || $parts[0] === 'admin') {
+                            if (\Pimcore::getContainer()->get(LocaleServiceInterface::class)->isLocale($languageCode)) {
+                                $translatedLanguages[] = $languageCode;
                             }
                         }
                     }
                 }
             }
         }
 
+        $languages = [];
+        foreach ($adminLanguages as $adminLanguage) {
+            if (in_array($adminLanguage, $translatedLanguages, true) || in_array(\Locale::getPrimaryLanguage($adminLanguage), $translatedLanguages, true)) {
+                $languages[] = $adminLanguage;
+            }
+        }
+
+        if (empty($languages)) {
+            $languages = $translatedLanguages;
+        }
+
         return array_unique($languages);
     }
 

diff --git a/models/Asset/Service.php b/models/Asset/Service.php
@@ -560,7 +560,7 @@ public static function getImageThumbnailByArrayConfig(array $config): null|Thumb
 
                 //check if high res image is called
 
-                preg_match("@([^\@]+)(\@[0-9.]+x)?\.([^\.]+)\.([a-zA-Z]{2,5})@", $config['filename'], $matches);
+                preg_match("@([^\@]+)(\@[0-9.]+x)?\.?([^\.]+)?\.([a-zA-Z]{2,5})@", $config['filename'], $matches);
 
                 if (empty($matches) || !isset($matches[1])) {
                     return null;

diff --git a/models/DataObject/Data/QuantityValueRange.php b/models/DataObject/Data/QuantityValueRange.php
@@ -77,6 +77,7 @@ public function toArray(): array
         return [
             'minimum' => $this->getMinimum(),
             'maximum' => $this->getMaximum(),
+            'unitId' => $this->getUnitId(),
         ];
     }
 

diff --git a/models/DataObject/Traits/ElementWithMetadataComparisonTrait.php b/models/DataObject/Traits/ElementWithMetadataComparisonTrait.php
@@ -46,12 +46,12 @@ public function isEqual(mixed $oldValue, mixed $newValue): bool
                 return !$container1 && !$container2;
             }
 
-            /** @var ElementInterface $el1 */
+            /** @var ElementInterface|null $el1 */
             $el1 = $container1->getElement();
-            /** @var ElementInterface $el2 */
+            /** @var ElementInterface|null $el2 */
             $el2 = $container2->getElement();
 
-            if (! ($el1->getType() == $el2->getType() && ($el1->getId() == $el2->getId()))) {
+            if (! ($el1?->getType() == $el2?->getType() && ($el1?->getId() == $el2?->getId()))) {
                 return false;
             }