Merge 3.4 to 4.0

aryaantony92 · aryaantony92 · commit 572b04bc06d6 · 2023-08-03T17:43:07.000+02:00
diff --git a/composer.json b/composer.json
@@ -27,7 +27,6 @@
     "pimcore/admin-ui-classic-bundle": "^1.0",
     "pimcore/object-merger": "^4.0",
     "pimcore/pimcore": "^11.0",
-    "pimcore/admin-ui-classic-bundle": "^1.0",
     "pimcore/search-query-parser": "^1.3",
     "pimcore/personalization-bundle": "^1.0",
     "symfony/asset": "^6.2",
diff --git a/install/class_source/class_CustomerSegmentGroup_export.json b/install/class_source/class_CustomerSegmentGroup_export.json
@@ -1,7 +1,7 @@
 {
-    "description": null,
-    "parentClass": null,
-    "useTraits": null,
+    "description": "",
+    "parentClass": "",
+    "useTraits": "",
     "allowInherit": false,
     "allowVariants": false,
     "showVariants": false,
@@ -255,4 +255,4 @@
             "creationDate": true
         }
     }
-}
+}
diff --git a/install/class_source/class_CustomerSegment_export.json b/install/class_source/class_CustomerSegment_export.json
@@ -1,12 +1,12 @@
 {
-    "description": null,
+    "description": "",
     "parentClass": "\\CustomerManagementFrameworkBundle\\Model\\AbstractCustomerSegment",
     "implementsInterfaces": null,
     "listingParentClass": "",
     "useTraits": "",
     "listingUseTraits": "",
     "allowInherit": false,
-    "allowVariants": null,
+    "allowVariants": false,
     "showVariants": false,
     "layoutDefinitions": {
         "fieldtype": "panel",
@@ -239,4 +239,4 @@
         }
     },
     "enableGridLocking": false
-}
+}
diff --git a/install/class_source/class_LinkActivityDefinition_export.json b/install/class_source/class_LinkActivityDefinition_export.json
@@ -6,7 +6,7 @@
     "useTraits": "",
     "listingUseTraits": "",
     "allowInherit": true,
-    "allowVariants": null,
+    "allowVariants": false,
     "showVariants": false,
     "generateTypeDeclarations": true,
     "layoutDefinitions": {
diff --git a/install/class_source/class_TermSegmentBuilderDefinition_export.json b/install/class_source/class_TermSegmentBuilderDefinition_export.json
@@ -1,7 +1,7 @@
 {
-    "description": null,
+    "description": "",
     "parentClass": "CustomerManagementFrameworkBundle\\Model\\AbstractTermSegmentBuilderDefinition",
-    "useTraits": null,
+    "useTraits": "",
     "allowInherit": false,
     "allowVariants": false,
     "showVariants": false,
@@ -164,4 +164,4 @@
             "creationDate": true
         }
     }
-}
+}
diff --git a/install/class_source/optional/class_Customer_export.json b/install/class_source/optional/class_Customer_export.json
@@ -1,12 +1,12 @@
 {
-    "description": null,
+    "description": "",
     "parentClass": "\\CustomerManagementFrameworkBundle\\Model\\AbstractCustomer",
     "implementsInterfaces": null,
     "listingParentClass": "",
     "useTraits": "",
     "listingUseTraits": "",
     "allowInherit": false,
-    "allowVariants": null,
+    "allowVariants": false,
     "showVariants": false,
     "layoutDefinitions": {
         "fieldtype": "panel",
@@ -1734,4 +1734,4 @@
         }
     },
     "enableGridLocking": false
-}
+}
diff --git a/src/View/Formatter/DefaultViewFormatter.php b/src/View/Formatter/DefaultViewFormatter.php
@@ -19,6 +19,7 @@
 use CustomerManagementFrameworkBundle\Model\CustomerSegmentInterface;
 use Pimcore\Model\DataObject\ClassDefinition;
 use Pimcore\Model\DataObject\ClassDefinition\Data;
+use Pimcore\Security\SecurityHelper;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class DefaultViewFormatter implements ViewFormatterInterface
@@ -176,7 +177,7 @@ public function getLocale()
      */
     protected function formatSegmentValue(CustomerSegmentInterface $segment)
     {
-        return sprintf('<span class="label label-default">%s</span>', $segment->getName());
+        return sprintf('<span class="label label-default">%s</span>', SecurityHelper::convertHtmlSpecialChars($segment->getName()));
     }
 
     protected function getLanguageFromLocale($locale)

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`		`- "description": null,`
`3`		`- "parentClass": null,`
`4`		`- "useTraits": null,`
	`2`	`+ "description": "",`
	`3`	`+ "parentClass": "",`
	`4`	`+ "useTraits": "",`
`5`	`5`	`"allowInherit": false,`
`6`	`6`	`"allowVariants": false,`
`7`	`7`	`"showVariants": false,`
`@@ -255,4 +255,4 @@`
`255`	`255`	`"creationDate": true`
`256`	`256`	`}`
`257`	`257`	`}`
`258`		`-}`
	`258`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`use CustomerManagementFrameworkBundle\Model\CustomerSegmentInterface;`
`20`	`20`	`use Pimcore\Model\DataObject\ClassDefinition;`
`21`	`21`	`use Pimcore\Model\DataObject\ClassDefinition\Data;`
	`22`	`+use Pimcore\Security\SecurityHelper;`
`22`	`23`	`use Symfony\Contracts\Translation\TranslatorInterface;`
`23`	`24`
`24`	`25`	`class DefaultViewFormatter implements ViewFormatterInterface`
`@@ -176,7 +177,7 @@ public function getLocale()`
`176`	`177`	`*/`
`177`	`178`	`protected function formatSegmentValue(CustomerSegmentInterface $segment)`
`178`	`179`	`{`
`179`		`- return sprintf('<span class="label label-default">%s</span>', $segment->getName());`
	`180`	`+ return sprintf('<span class="label label-default">%s</span>', SecurityHelper::convertHtmlSpecialChars($segment->getName()));`
`180`	`181`	`}`
`181`	`182`
`182`	`183`	`protected function getLanguageFromLocale($locale)`