Merge branch 'refs/heads/11.2' into 11.x

pimcore · Apr 19, 2024 · 4f12ecd · 4f12ecd
2 parents 6ce2662 + 42dc400
commit 4f12ecd
Show file tree

Hide file tree

Showing 143 changed files with 283 additions and 219 deletions.
diff --git a/bundles/CoreBundle/src/Command/DeleteUnusedLocaleDataCommand.php b/bundles/CoreBundle/src/Command/DeleteUnusedLocaleDataCommand.php
@@ -77,7 +77,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             //delete data from object_localized_data_classID tables
             foreach ($result as $res) {
                 $language = $res['language'];
-                if (!in_array($language, $skipLocales) && !in_array($language, $validLanguages)) {
+                if (!in_arrayi($language, $skipLocales) && !in_arrayi($language, $validLanguages)) {
                     $sqlDeleteData = 'Delete FROM object_localized_data_' . $classId  . ' WHERE `language` = ' . $db->quote($language);
                     $printLine = true;
                     if (!$this->isDryRun()) {
@@ -95,7 +95,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 $localizedView = current($existingView);
                 $existingLanguage = str_replace('object_localized_'.$classId.'_', '', $localizedView);
 
-                if (!in_array($existingLanguage, $validLanguages)) {
+                if (!in_arrayi($existingLanguage, $validLanguages)) {
                     $sqlDropView = 'DROP VIEW IF EXISTS object_localized_' . $classId . '_' .$existingLanguage;
                     $printLine = true;
 
@@ -114,7 +114,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 $localizedTable = current($existingTable);
                 $existingLanguage = str_replace('object_localized_query_'.$classId.'_', '', $localizedTable);
 
-                if (!in_array($existingLanguage, $validLanguages)) {
+                if (!in_arrayi($existingLanguage, $validLanguages)) {
                     $sqlDropTable = 'DROP TABLE IF EXISTS object_localized_query_' . $classId . '_' .$existingLanguage;
                     $printLine = true;
 

diff --git a/bundles/StaticRoutesBundle/src/Model/Staticroute/Dao.php b/bundles/StaticRoutesBundle/src/Model/Staticroute/Dao.php
@@ -91,8 +91,8 @@ public function getByName(string $name = null, int $siteId = null): void
 
         $name = $this->model->getName();
 
-        $totalList = new Listing();
-        $totalList = $totalList->load();
+        $listing = new Listing();
+        $totalList = $listing->load();
 
         $data = array_filter($totalList, function (Staticroute $row) use ($name, $siteId) {
             if ($row->getName() == $name) {

diff --git a/bundles/TinymceBundle/README.md b/bundles/TinymceBundle/README.md
@@ -6,6 +6,25 @@
 TinyMCE bundle provides TineMCE as WYSIWYG-editor.
 Similar to Textarea and Input you can use the WYSIWYG editable in the templates to provide rich-text editing.
 
+## Installation
+
+Make sure the bundle is enabled in the `config/bundles.php` file. The following lines should be added:
+
+```php
+use Pimcore\Bundle\TinymceBundle\PimcoreTinymceBundle;
+// ...
+
+return [
+    // ...
+    PimcoreTinymceBundle::class => ['all' => true],
+    // ...
+];
+```
+
+```bash
+bin/console pimcore:bundle:install PimcoreTinymceBundle
+```
+
 ## Configuration
 
 Available configuration options can be found here: [config options](https://www.tiny.cloud/docs/configure/)

diff --git a/bundles/TinymceBundle/package.json b/bundles/TinymceBundle/package.json
@@ -11,6 +11,6 @@
     "build": "encore production --progress"
   },
   "dependencies": {
-    "tinymce": "^6.7.2"
+    "tinymce": "^6.8.3"
   }
 }
diff --git a/bundles/TinymceBundle/public/assets/tinymce.js b/bundles/TinymceBundle/public/assets/tinymce.js
@@ -12,7 +12,6 @@ import 'tinymce/plugins/table';
 import 'tinymce/plugins/wordcount';
 import 'tinymce/plugins/autolink';
 import 'tinymce/plugins/image';
-import 'tinymce/plugins/insertdatetime';
 import 'tinymce/plugins/media';
 import 'tinymce/plugins/help';
 import 'tinymce/plugins/lists';

diff --git a/bundles/TinymceBundle/public/build/tinymce/271.js b/bundles/TinymceBundle/public/build/tinymce/271.js
diff --git a/bundles/TinymceBundle/public/build/tinymce/999.js b/bundles/TinymceBundle/public/build/tinymce/999.js
diff --git a/bundles/TinymceBundle/public/build/tinymce/entrypoints.json b/bundles/TinymceBundle/public/build/tinymce/entrypoints.json
@@ -3,7 +3,7 @@
     "tinymce": {
       "js": [
         "/bundles/pimcoretinymce/build/tinymce/runtime.js",
-        "/bundles/pimcoretinymce/build/tinymce/271.js",
+        "/bundles/pimcoretinymce/build/tinymce/999.js",
         "/bundles/pimcoretinymce/build/tinymce/tinymce.js"
       ]
     }

diff --git a/bundles/TinymceBundle/public/build/tinymce/manifest.json b/bundles/TinymceBundle/public/build/tinymce/manifest.json
@@ -1,15 +1,27 @@
 {
   "TinymceBundle/build/tinymce.js": "/bundles/pimcoretinymce/build/tinymce/tinymce.js",
   "TinymceBundle/build/runtime.js": "/bundles/pimcoretinymce/build/tinymce/runtime.js",
-  "TinymceBundle/build/271.js": "/bundles/pimcoretinymce/build/tinymce/271.js",
+  "TinymceBundle/build/999.js": "/bundles/pimcoretinymce/build/tinymce/999.js",
+  "TinymceBundle/build/skins/ui/tinymce-5/skin.js": "/bundles/pimcoretinymce/build/tinymce/skins/ui/tinymce-5//skin.js",
+  "TinymceBundle/build/skins/ui/tinymce-5-dark/skin.js": "/bundles/pimcoretinymce/build/tinymce/skins/ui/tinymce-5-dark//skin.js",
   "TinymceBundle/build/skins/ui/tinymce-5/skin.css": "/bundles/pimcoretinymce/build/tinymce/skins/ui/tinymce-5//skin.css",
   "TinymceBundle/build/skins/ui/tinymce-5/skin.min.css": "/bundles/pimcoretinymce/build/tinymce/skins/ui/tinymce-5//skin.min.css",
   "TinymceBundle/build/skins/ui/tinymce-5-dark/skin.css": "/bundles/pimcoretinymce/build/tinymce/skins/ui/tinymce-5-dark//skin.css",
   "TinymceBundle/build/skins/ui/tinymce-5-dark/skin.min.css": "/bundles/pimcoretinymce/build/tinymce/skins/ui/tinymce-5-dark//skin.min.css",
+  "TinymceBundle/build/skins/ui/oxide/skin.js": "/bundles/pimcoretinymce/build/tinymce/skins/ui/oxide//skin.js",
+  "TinymceBundle/build/skins/ui/oxide-dark/skin.js": "/bundles/pimcoretinymce/build/tinymce/skins/ui/oxide-dark//skin.js",
   "TinymceBundle/build/skins/ui/oxide/skin.css": "/bundles/pimcoretinymce/build/tinymce/skins/ui/oxide//skin.css",
   "TinymceBundle/build/skins/ui/oxide-dark/skin.css": "/bundles/pimcoretinymce/build/tinymce/skins/ui/oxide-dark//skin.css",
   "TinymceBundle/build/skins/ui/oxide/skin.min.css": "/bundles/pimcoretinymce/build/tinymce/skins/ui/oxide//skin.min.css",
   "TinymceBundle/build/skins/ui/oxide-dark/skin.min.css": "/bundles/pimcoretinymce/build/tinymce/skins/ui/oxide-dark//skin.min.css",
+  "TinymceBundle/build/skins/ui/tinymce-5/content.js": "/bundles/pimcoretinymce/build/tinymce/skins/ui/tinymce-5//content.js",
+  "TinymceBundle/build/skins/ui/oxide/content.js": "/bundles/pimcoretinymce/build/tinymce/skins/ui/oxide//content.js",
+  "TinymceBundle/build/skins/ui/tinymce-5-dark/content.inline.js": "/bundles/pimcoretinymce/build/tinymce/skins/ui/tinymce-5-dark//content.inline.js",
+  "TinymceBundle/build/skins/ui/tinymce-5/content.inline.js": "/bundles/pimcoretinymce/build/tinymce/skins/ui/tinymce-5//content.inline.js",
+  "TinymceBundle/build/skins/ui/oxide/content.inline.js": "/bundles/pimcoretinymce/build/tinymce/skins/ui/oxide//content.inline.js",
+  "TinymceBundle/build/skins/ui/oxide-dark/content.inline.js": "/bundles/pimcoretinymce/build/tinymce/skins/ui/oxide-dark//content.inline.js",
+  "TinymceBundle/build/skins/ui/tinymce-5-dark/content.js": "/bundles/pimcoretinymce/build/tinymce/skins/ui/tinymce-5-dark//content.js",
+  "TinymceBundle/build/skins/ui/oxide-dark/content.js": "/bundles/pimcoretinymce/build/tinymce/skins/ui/oxide-dark//content.js",
   "TinymceBundle/build/skins/ui/oxide/content.css": "/bundles/pimcoretinymce/build/tinymce/skins/ui/oxide//content.css",
   "TinymceBundle/build/skins/ui/tinymce-5/content.css": "/bundles/pimcoretinymce/build/tinymce/skins/ui/tinymce-5//content.css",
   "TinymceBundle/build/skins/ui/oxide/content.min.css": "/bundles/pimcoretinymce/build/tinymce/skins/ui/oxide//content.min.css",
@@ -65,8 +77,14 @@
   "TinymceBundle/build/plugins/help/js/i18n/keynav/zh_TW.js": "/bundles/pimcoretinymce/build/tinymce/plugins/help/js/i18n/keynav//zh_TW.js",
   "TinymceBundle/build/plugins/help/js/i18n/keynav/en.js": "/bundles/pimcoretinymce/build/tinymce/plugins/help/js/i18n/keynav//en.js",
   "TinymceBundle/build/plugins/help/js/i18n/keynav/zh_CN.js": "/bundles/pimcoretinymce/build/tinymce/plugins/help/js/i18n/keynav//zh_CN.js",
+  "TinymceBundle/build/skins/content/document/content.js": "/bundles/pimcoretinymce/build/tinymce/skins/content/document//content.js",
+  "TinymceBundle/build/skins/content/tinymce-5-dark/content.js": "/bundles/pimcoretinymce/build/tinymce/skins/content/tinymce-5-dark//content.js",
+  "TinymceBundle/build/skins/content/dark/content.js": "/bundles/pimcoretinymce/build/tinymce/skins/content/dark//content.js",
+  "TinymceBundle/build/skins/content/writer/content.js": "/bundles/pimcoretinymce/build/tinymce/skins/content/writer//content.js",
   "TinymceBundle/build/skins/content/document/content.css": "/bundles/pimcoretinymce/build/tinymce/skins/content/document//content.css",
   "TinymceBundle/build/skins/content/document/content.min.css": "/bundles/pimcoretinymce/build/tinymce/skins/content/document//content.min.css",
+  "TinymceBundle/build/skins/content/tinymce-5/content.js": "/bundles/pimcoretinymce/build/tinymce/skins/content/tinymce-5//content.js",
+  "TinymceBundle/build/skins/content/default/content.js": "/bundles/pimcoretinymce/build/tinymce/skins/content/default//content.js",
   "TinymceBundle/build/skins/content/tinymce-5-dark/content.css": "/bundles/pimcoretinymce/build/tinymce/skins/content/tinymce-5-dark//content.css",
   "TinymceBundle/build/skins/content/tinymce-5-dark/content.min.css": "/bundles/pimcoretinymce/build/tinymce/skins/content/tinymce-5-dark//content.min.css",
   "TinymceBundle/build/skins/content/dark/content.css": "/bundles/pimcoretinymce/build/tinymce/skins/content/dark//content.css",
@@ -77,6 +95,10 @@
   "TinymceBundle/build/skins/content/default/content.min.css": "/bundles/pimcoretinymce/build/tinymce/skins/content/default//content.min.css",
   "TinymceBundle/build/skins/content/tinymce-5/content.css": "/bundles/pimcoretinymce/build/tinymce/skins/content/tinymce-5//content.css",
   "TinymceBundle/build/skins/content/tinymce-5/content.min.css": "/bundles/pimcoretinymce/build/tinymce/skins/content/tinymce-5//content.min.css",
+  "TinymceBundle/build/skins/ui/tinymce-5-dark/skin.shadowdom.js": "/bundles/pimcoretinymce/build/tinymce/skins/ui/tinymce-5-dark//skin.shadowdom.js",
+  "TinymceBundle/build/skins/ui/tinymce-5/skin.shadowdom.js": "/bundles/pimcoretinymce/build/tinymce/skins/ui/tinymce-5//skin.shadowdom.js",
+  "TinymceBundle/build/skins/ui/oxide/skin.shadowdom.js": "/bundles/pimcoretinymce/build/tinymce/skins/ui/oxide//skin.shadowdom.js",
+  "TinymceBundle/build/skins/ui/oxide-dark/skin.shadowdom.js": "/bundles/pimcoretinymce/build/tinymce/skins/ui/oxide-dark//skin.shadowdom.js",
   "TinymceBundle/build/skins/ui/oxide-dark/skin.shadowdom.css": "/bundles/pimcoretinymce/build/tinymce/skins/ui/oxide-dark//skin.shadowdom.css",
   "TinymceBundle/build/skins/ui/oxide-dark/skin.shadowdom.min.css": "/bundles/pimcoretinymce/build/tinymce/skins/ui/oxide-dark//skin.shadowdom.min.css",
   "TinymceBundle/build/skins/ui/oxide/skin.shadowdom.css": "/bundles/pimcoretinymce/build/tinymce/skins/ui/oxide//skin.shadowdom.css",